refactor and cleanup

modules/_home/default.nix

@@ -8,6 +8,7 @@ in {
     kitty
     claude-code
     mpv
+    obsidian
   ];
 
   # Symlinks in ~/.jdks/ - path scanned by IntelliJ on Linux by default

modules/_home/niri.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  wallpaper = "${config.home.homeDirectory}/repos/nixos/wallpapers/astronaut.png";
+  wallpaper = "${../../wallpapers/astronaut.png}";
 in {
   services.swayidle = {
     enable = true;
@@ -69,7 +69,6 @@ in {
     text = ''
       #!/usr/bin/env bash
       swww-daemon &
-      sleep 0.5
       swww img "${wallpaper}" --transition-type none
     '';
   };

modules/_home/theme.nix

@@ -16,11 +16,6 @@
       name = "Gruvbox-Plus-Dark";
       package = pkgs.gruvbox-plus-icons;
     };
-    cursorTheme = {
-      name = "Bibata-Modern-Ice";
-      package = pkgs.bibata-cursors;
-      size = 24;
-    };
   };
 
   qt = {

modules/core.nix

@@ -23,10 +23,7 @@
       memoryPercent = 300;
     };
 
-    services.xserver = {
-      enable = false;
-      xkb.layout = "en";
-    };
+    services.xserver.enable = false;
 
     environment.systemPackages = with pkgs; [
       curl
@@ -37,7 +34,6 @@
       unrar
       p7zip
       nvd
-      obsidian
     ]; 
 
     networking.networkmanager.enable = true;

modules/den.nix

@@ -26,8 +26,10 @@ in {
     includes = [
       den.provides.hostname
       den.aspects.core
+      den.aspects.services
       den.aspects.wayland
       den.aspects.niri
+      den.aspects.portable
       den.aspects.notebook-specific
       den.aspects.dev
       den.aspects.creative
@@ -42,8 +44,10 @@ in {
     includes = [
       den.provides.hostname
       den.aspects.core
+      den.aspects.services
       den.aspects.wayland
       den.aspects.niri
+      den.aspects.portable
       den.aspects.work-specific
       den.aspects.secrets
       den.aspects.dev
@@ -57,6 +61,7 @@ in {
     includes = [
       den.provides.hostname
       den.aspects.core
+      den.aspects.services
       den.aspects.wayland
       den.aspects.niri
       den.aspects.desktop-specific
@@ -92,7 +97,6 @@ in {
         backupFileExtension  = "backup";
         extraSpecialArgs = { inherit inputs identity; };
       };
-      security.sudo.wheelNeedsPassword = false;
     };
     homeManager = {
       imports = [

modules/desktop.nix

@@ -28,6 +28,8 @@
       };
     };
 
+    security.sudo.wheelNeedsPassword = false;
+
     services.xserver.videoDrivers = [ "nvidia" ];
 
     boot = {

modules/dev.nix

@@ -5,7 +5,7 @@ in {
   den.aspects.dev.nixos = { pkgs, ... }:
   let
     pkgs-unstable = import inputs.nixpkgs-unstable {
-      system = pkgs.system;
+      system = pkgs.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
   in {
@@ -24,6 +24,7 @@ in {
 
       # Infrastructure
       docker-compose
+      jq
 
       # IDE
       jetbrains.idea
@@ -67,23 +68,6 @@ in {
       JAVA_HOME = "${pkgs-unstable.openjdk8}";
     };
 
-    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" ];
   };

modules/notebook.nix

@@ -1,4 +1,4 @@
-{ den, inputs, lib, ... }: {
+{ den, inputs, ... }: {
   den.aspects.notebook-specific.nixos = { pkgs, ... }: {
     imports = [
       ./_hardware/notebook-hardware.nix
@@ -11,24 +11,7 @@
       enable32Bit = true;
     };
 
-    security.sudo.wheelNeedsPassword = lib.mkForce true;
-
-    networking.firewall = {
-      enable          = true;
-      allowedTCPPorts = [];
-      allowedUDPPorts = [];
-    };
-
     services.thermald.enable = true;
-    powerManagement.enable   = true;
-
-    services.tlp = {
-      enable   = true;
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_AC  = "performance";
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-      };
-    };
 
     boot = {
       initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];

modules/portable.nix

@@ -0,0 +1,17 @@
+{ den, lib, ... }: {
+  den.aspects.portable.nixos = {
+    security.sudo.wheelNeedsPassword = lib.mkForce true;
+
+    networking.firewall.enable = true;
+
+    powerManagement.enable = true;
+
+    services.tlp = {
+      enable   = true;
+      settings = {
+        CPU_SCALING_GOVERNOR_ON_AC  = "performance";
+        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      };
+    };
+  };
+}

modules/services.nix

@@ -1,5 +1,5 @@
 { den, ... }: {
-  den.aspects.core.nixos = { pkgs, ... }: {
+  den.aspects.services.nixos = {
     services = {
       libinput.enable = true;
       fstrim.enable = true;

modules/wayland.nix

@@ -8,7 +8,6 @@
 
       # Browser / Electron Wayland backends
       MOZ_ENABLE_WAYLAND           = "1";
-      MOZ_USE_XINPUT2              = "1";
       ELECTRON_OZONE_PLATFORM_HINT = "wayland";
       NIXOS_OZONE_WL               = "1";
 

modules/work.nix

@@ -1,4 +1,4 @@
-{ den, inputs, lib, config, ... }: {
+{ den, inputs, ... }: {
   den.aspects.work-specific.nixos = { pkgs, config, ... }: {
     imports = [
       ./_hardware/work-hardware.nix
@@ -41,24 +41,6 @@
       __GLX_VENDOR_LIBRARY_NAME = "nvidia";
     };
 
-    security.sudo.wheelNeedsPassword = lib.mkForce true;
-
-    networking.firewall = {
-      enable          = true;
-      allowedTCPPorts = [];
-      allowedUDPPorts = [];
-    };
-
-    powerManagement.enable = true;
-
-    services.tlp = {
-      enable   = true;
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_AC  = "performance";
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-      };
-    };
-
     boot = {
       initrd.kernelModules = [ "amdgpu" ];
       kernelModules        = [ "kvm-amd" "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ];