modules/_home/niri.nix

@@ -1,27 +1,4 @@
-{ config, pkgs, ... }:
-let
-  wallpaper = "${config.home.homeDirectory}/repos/nixos/wallpapers/astronaut.png";
-in {
-  services.swayidle = {
-    enable = true;
-    timeouts = [
-      {
-        timeout = 300;
-        command = "${pkgs.swaylock}/bin/swaylock -f -i ${wallpaper}";
-      }
-      {
-        timeout = 600;
-        command = "${pkgs.niri}/bin/niri msg action power-off-monitors";
-      }
-    ];
-    events = [
-      {
-        event = "before-sleep";
-        command = "${pkgs.swaylock}/bin/swaylock -f -i ${wallpaper}";
-      }
-    ];
-  };
-
+{ config, pkgs, ... }: {
   home.sessionVariables = {
     XDG_CURRENT_DESKTOP                 = "niri";
     XDG_SESSION_DESKTOP                 = "niri";
@@ -64,16 +41,6 @@ in {
     '';
   };
 
-  home.file.".local/bin/swww-init" = {
-    executable = true;
-    text = ''
-      #!/usr/bin/env bash
-      swww-daemon &
-      sleep 0.5
-      swww img "${wallpaper}" --transition-type none
-    '';
-  };
-
   xdg.configFile."quickshell".source =
     config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/repos/nixos/quickshell";
 
@@ -108,7 +75,6 @@ in {
     prefer-no-csd
 
     spawn-at-startup "quickshell"
-    spawn-at-startup "bash" "-c" "$HOME/.local/bin/swww-init"
 
     screenshot-path "${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%d %H-%M-%S.png"
 
@@ -144,7 +110,7 @@ in {
 
       // System
       Mod+Shift+E { quit; }
-      Mod+L       { spawn "swaylock" "-i" "${wallpaper}"; }
+      Mod+L       { spawn "swaylock"; }
 
       // Volume
       XF86AudioRaiseVolume { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%+"; }

modules/dev.nix

@@ -4,10 +4,7 @@ let
 in {
   den.aspects.dev.nixos = { pkgs, ... }:
   let
-    pkgs-unstable = import inputs.nixpkgs-unstable {
-      system = pkgs.system;
-      config.allowUnfree = true;
-    };
+    pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
   in {
     environment.systemPackages = with pkgs-unstable; [
       # CLI utilities
@@ -18,7 +15,6 @@ in {
       ripgrep
       chafa
       forgejo-cli
-      awscli2
 
       tracy
 
@@ -26,7 +22,7 @@ in {
       docker-compose
 
       # IDE
-      jetbrains.idea
+      jetbrains.idea-oss
 
       # Neovim
       vimPlugins.blink-cmp
@@ -60,27 +56,11 @@ in {
       maven
     ];
 
-    environment.variables = {
-      JAVA_HOME = "${pkgs-unstable.openjdk8}";
+    programs.java = {
+      enable = true;
+      package = pkgs-unstable.openjdk17;
     };
 
-    systemd.tmpfiles.rules = [
-      "d /var/lib/payara41 0755 ${username} users -"
-    ];
-
-    system.activationScripts.payaraJava = ''
-      asenv=/var/lib/payara41/glassfish/config/asenv.conf
-      if [ -f "$asenv" ]; then
-        ${pkgs.gnused}/bin/sed -i '/^AS_JAVA=/d' "$asenv"
-        echo 'AS_JAVA="${pkgs-unstable.openjdk8}"' >> "$asenv"
-      fi
-
-      domain_xml=/var/lib/payara41/glassfish/domains/domain1/config/domain.xml
-      if [ -f "$domain_xml" ]; then
-        ${pkgs.gnused}/bin/sed -i 's|java-home="[^"]*"|java-home="${pkgs-unstable.openjdk8}/lib/openjdk"|' "$domain_xml"
-      fi
-    '';
-
     virtualisation.docker.enable = true;
     users.users.${username}.extraGroups = [ "docker" ];
   };