unclutter

hosts/dunamis/configuration.nix

@@ -9,18 +9,15 @@
     self.nixosModules.desktop
     self.nixosModules.system
     ./hardware-conf.nix
-    ./users.nix
     ./programs.nix
     ./stylix.nix
+    ./users.nix
   ];
+
   desktop = {
     niri.enable = true;
     plasma.enable = true;
   };
-  services.logind = {
-    lidSwitch = "ignore";
-    powerKey = "suspend";
-  };
 
   nix.settings.experimental-features = ["nix-command" "flakes"];
   system.stateVersion = "unstable";
@@ -28,13 +25,14 @@
   time.timeZone = "Europe/Kyiv";
   locale.ukrainian.enable = true;
 
-  networking.hostName = "dunamis";
-  networking.networkmanager.enable = true;
-
-  # required for syncthing
-  networking.firewall = {
-    allowedTCPPorts = [22000];
-    allowedUDPPorts = [21027 22000];
+  networking = {
+    networkmanager.enable = true;
+    hostName = "dunamis";
+    # required for syncthing
+    firewall = {
+      allowedTCPPorts = [22000];
+      allowedUDPPorts = [21027 22000];
+    };
   };
 
   boot = {

hosts/dunamis/hardware-conf.nix

@@ -11,21 +11,24 @@
 
   wireless.bluetooth.enable = true;
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = [
-    "i915"
-  ];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
-  boot.initrd.systemd.enable = true;
-  hardware.graphics = {
-    enable = true;
-    extraPackages = with pkgs; [
-      vpl-gpu-rt
-    ];
+  services.logind = {
+    lidSwitch = "ignore";
+    powerKey = "suspend";
+  };
+
+  boot = {
+    kernelModules = ["kvm-amd"];
+    extraModulePackages = [];
+    initrd = {
+      luks.devices."luks-fe586da4-b164-4362-bcdf-9c5dd6c69a2b".device = "/dev/disk/by-uuid/fe586da4-b164-4362-bcdf-9c5dd6c69a2b";
+      availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+      kernelModules = [
+        "i915"
+      ];
+      systemd.enable = true;
+    };
   };
 
-  boot.initrd.luks.devices."luks-fe586da4-b164-4362-bcdf-9c5dd6c69a2b".device = "/dev/disk/by-uuid/fe586da4-b164-4362-bcdf-9c5dd6c69a2b";
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/79ce18b8-3a9e-4cd0-be62-60972686f44a";
@@ -51,6 +54,13 @@
 
   swapDevices = [];
 
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vpl-gpu-rt
+    ];
+  };
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

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

@@ -5,12 +5,11 @@
     ./programs.nix
     ./flatpak.nix
   ];
+  desktop.niri.enable = true;
   home = {
     stateVersion = "25.05";
     sessionPath = [
       "$HOME/.local/bin"
     ];
   };
-  desktop.niri.enable = true;
-  # stylix.image = "${config.xdg.userDirs.pictures}/wallpapers/wallhaven-2evrxy.png";
 }