hosts/eldrid/users/user/home-configuration.nix: home-manager state follows system

modules/home/desktop/niri/default.nix: change evince to papers
modules/nixos/system/wireless/wifi.nix: simplify

Signed-off-by: unexplrd <unexplrd@linerds.us>

hosts/dunamis/users/user/flatpak.nix

@@ -19,6 +19,7 @@
       # misc
       "app.zen_browser.zen"
       "net.mullvad.MullvadBrowser"
+      "io.github.ungoogled_software.ungoogled_chromium"
       "com.obsproject.Studio"
       "com.bitwarden.desktop"
       "com.github.tchx84.Flatseal"

hosts/eldrid/boot.nix

@@ -0,0 +1,35 @@
+{
+  pkgs,
+  config,
+  inputs,
+  ...
+}: {
+  imports = with inputs; [
+    lanzaboote.nixosModules.lanzaboote
+  ];
+  boot = {
+    # kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages_cachyos;
+    plymouth.enable = true;
+    loader.efi.canTouchEfiVariables = true;
+    loader.systemd-boot = {
+      enable = !config.boot.lanzaboote.enable;
+      consoleMode = "auto";
+    };
+    initrd = {
+      availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" "xe" "i915"];
+      kernelModules = [];
+    };
+    kernelModules = ["kvm-intel"];
+    extraModulePackages = [];
+    lanzaboote = {
+      enable = true;
+      pkiBundle = "/var/lib/sbctl";
+    };
+  };
+  console = {
+    earlySetup = true;
+    packages = [pkgs.terminus_font];
+    font = "${pkgs.terminus_font}/share/consolefonts/ter-c18n.psf.gz";
+  };
+}

hosts/eldrid/configuration.nix

@@ -1,111 +1,45 @@
-# device-specific setup
+{inputs, ...}: {
-{
-  pkgs,
-  config,
-  inputs,
-  ...
-}: {
   imports = with inputs; [
-    chaotic.nixosModules.default
-    lanzaboote.nixosModules.lanzaboote
-    lix.nixosModules.default
     self.nixosModules.desktop
     self.nixosModules.system
-    ./hardware.nix
+    ./boot.nix
-    ./programs.nix
-    ./stylix.nix
     ./disko.nix
-    ./users.nix
+    ./hardware.nix
+    ./networking.nix
+    ./nix.nix
+    ./programs.nix
+    ./services.nix
     ./sops.nix
+    ./stylix.nix
+    ./users.nix
   ];
 
-  desktop = {
+  desktop.niri.enable = true;
-    niri.enable = true;
-  };
 
-  nix = {
-    channel.enable = false;
-    daemonCPUSchedPolicy = "idle";
-    settings = {
-      experimental-features = ["nix-command" "flakes"];
-      builders-use-substitutes = true;
-    };
-    distributedBuilds = true;
-    buildMachines = [
-      {
-        hostName = "dunamis";
-        sshUser = "nix-ssh";
-        system = "x86_64-linux";
-        sshKey = config.sops.secrets."ssh-eldrid-user".path;
-        supportedFeatures = ["nixos-test" "big-parallel" "kvm" "benchmark"];
-        publicHostKey = builtins.readFile "${inputs.mysecrets}/ssh/ssh_host_ed25519_dunamis.base64";
-      }
-    ];
-  };
-
-  system.stateVersion = "25.05";
-
-  time.timeZone = "Europe/Kyiv";
   locale.ukrainian.enable = true;
 
-  networking = {
+  opentabletdriver.enable = false;
-    networkmanager.enable = true;
-    hostName = "eldrid";
-    hosts = {
-      "192.168.1.42" = ["dunamis"];
-    };
-  };
 
-  boot = {
+  qmk-vial.enable = true;
-    # kernelPackages = pkgs.linuxPackages_latest;
-    kernelPackages = pkgs.linuxPackages_cachyos;
-    plymouth.enable = true;
-    loader.efi.canTouchEfiVariables = true;
-    loader.systemd-boot = {
-      enable = !config.boot.lanzaboote.enable;
-      consoleMode = "auto";
-    };
-    lanzaboote = {
-      enable = true;
-      pkiBundle = "/var/lib/sbctl";
-    };
-  };
-
-  console = {
-    earlySetup = true;
-    packages = [pkgs.terminus_font];
-    font = "${pkgs.terminus_font}/share/consolefonts/ter-c18n.psf.gz";
-  };
-
-  services = {
-    power-profiles-daemon.enable = true;
-    flatpak.enable = true;
-    fstrim.enable = true;
-    openssh.enable = true;
-    syncthing.openDefaultPorts = true;
-    dnscrypt-proxy2 = {
-      enable = true;
-      settings = {
-        require_dnssec = true;
-        server_names = ["mullvad-doh"];
-        bootstrap_resolvers = ["9.9.9.11:53" "9.9.9.9:53"];
-      };
-    };
-  };
-  services.scx = {
-    enable = true;
-    scheduler = "scx_flash";
-  };
 
   security.basic.enable = true;
 
-  virtual = {
+  system.stateVersion = "25.05";
-    libvirt.enable = true;
-    podman.enable = false;
-  };
 
-  wireless.bluetooth.enableBlueman = true;
+  swapDevices = [
-
+    {
-  opentabletdriver.enable = false;
+      device = "/swap/swapfile";
-  qmk-vial.enable = true;
+      size = 8 * 1024; # eight gigs
+    }
+  ];
+
+  time.timeZone = "Europe/Kyiv";
+
+  virtual.libvirt.enable = true;
+
+  wireless = {
+    wifi.enable = true;
+    bluetooth.enable = true;
+    bluetooth.enableBlueman = true;
+  };
 }

hosts/eldrid/hardware.nix

@@ -21,27 +21,6 @@
     '';
   };
 in {
-  boot = {
-    initrd = {
-      availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" "xe" "i915"];
-      kernelModules = [];
-    };
-    kernelModules = ["kvm-intel"];
-    extraModulePackages = [];
-  };
-
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 8 * 1024; # eight gigs
-    }
-  ];
-
-  wireless = {
-    wifi.enable = true;
-    bluetooth.enable = true;
-  };
-
   hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
@@ -53,12 +32,12 @@ in {
 
   # intel ax201 wifi card firmware
   hardware.enableRedistributableFirmware = true;
-
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
   # physically broken touchscreen
   services.udev.extraRules = "ACTION==\"add|change\", KERNELS==\"input[0-9]*\", SUBSYSTEMS==\"input\", ATTRS{id/vendor}==\"27c6\", ATTRS{id/product}==\"0e84\", ENV{LIBINPUT_IGNORE_DEVICE}=\"1\"";
+
   services.keyd = {
     enable = true;
     keyboards.internal = {

hosts/eldrid/networking.nix

@@ -0,0 +1,9 @@
+{
+  networking = {
+    networkmanager.enable = true;
+    hostName = "eldrid";
+    hosts = {
+      "192.168.1.42" = ["dunamis"];
+    };
+  };
+}

hosts/eldrid/nix.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  inputs,
+  ...
+}: {
+  imports = with inputs; [
+    lix.nixosModules.default
+  ];
+  nix = {
+    channel.enable = false;
+    daemonCPUSchedPolicy = "idle";
+    settings = {
+      experimental-features = ["nix-command" "flakes"];
+      builders-use-substitutes = true;
+    };
+    distributedBuilds = true;
+    buildMachines = [
+      {
+        hostName = "dunamis";
+        sshUser = "nix-ssh";
+        system = "x86_64-linux";
+        sshKey = config.sops.secrets."ssh-eldrid-user".path;
+        supportedFeatures = ["nixos-test" "big-parallel" "kvm" "benchmark"];
+        publicHostKey = builtins.readFile "${inputs.mysecrets}/ssh/ssh_host_ed25519_dunamis.base64";
+      }
+    ];
+  };
+}

hosts/eldrid/services.nix

@@ -0,0 +1,21 @@
+{
+  services = {
+    flatpak.enable = true;
+    fstrim.enable = true;
+    openssh.enable = true;
+    power-profiles-daemon.enable = true;
+    syncthing.openDefaultPorts = true;
+    dnscrypt-proxy2 = {
+      enable = true;
+      settings = {
+        require_dnssec = true;
+        server_names = ["mullvad-doh"];
+        bootstrap_resolvers = ["9.9.9.11:53" "9.9.9.9:53"];
+      };
+    };
+    scx = {
+      enable = true;
+      scheduler = "scx_flash";
+    };
+  };
+}

hosts/eldrid/sops.nix

@@ -1,8 +1,8 @@
 {inputs, ...}: let
   secretsPath = builtins.toString inputs.mysecrets;
 in {
-  imports = [
+  imports = with inputs; [
-    inputs.sops-nix.nixosModules.sops
+    sops-nix.nixosModules.sops
   ];
 
   sops = {

hosts/eldrid/users/user/home-configuration.nix

@@ -1,4 +1,8 @@
-{inputs, ...}: {
+{
+  inputs,
+  osConfig,
+  ...
+}: {
   imports = with inputs; [
     nix-index-database.hmModules.nix-index
     self.homeModules.desktop
@@ -8,7 +12,7 @@
   ];
   desktop.niri.enable = true;
   home = {
-    stateVersion = "25.05";
+    stateVersion = osConfig.system.stateVersion;
     sessionPath = [
       "$HOME/.local/bin"
     ];

modules/home/desktop/niri/default.nix

@@ -1456,7 +1456,7 @@ in {
       nautilus
       helvum
       loupe
-      evince
+      papers
       junction
       celluloid
       mission-center
@@ -1497,7 +1497,7 @@ in {
           web_browser = ["re.sonny.Junction.desktop"];
           image_viewer = ["org.gnome.Loupe.desktop"];
           video_player = ["io.github.celluloid_player.Celluloid.desktop"];
-          pdf_reader = ["org.gnome.Evince.desktop"];
+          pdf_reader = ["org.gnome.Papers.desktop"];
         in {
           "inode/directory" = file_manager;
           "video/x-matroska" = video_player;

modules/nixos/system/wireless/wifi.nix

@@ -16,12 +16,8 @@ in {
       wireless.iwd = {
         enable = true;
         settings = {
-          General = {
+          General.AddressRandomization = "network";
-            AddressRandomization = "network";
+          Settings.AlwaysRandomizeAddress = true;
-          };
-          Settings = {
-            AlwaysRandomizeAddress = true;
-          };
         };
       };
     };