refactor: move from den based to flake-parts based

modules/hosts/orion/_disk.nix

@@ -0,0 +1,51 @@
+{ inputs, lib, ... }:
+{
+  imports = [ inputs.disko.nixosModules.disko ];
+
+  disko.devices = {
+    disk.disk1 = {
+      device = lib.mkDefault "/dev/sda";
+      type = "disk";
+      content = {
+        type = "gpt";
+        partitions = {
+          boot = {
+            name = "boot";
+            size = "1M";
+            type = "EF02";
+          };
+          esp = {
+            name = "ESP";
+            size = "500M";
+            type = "EF00";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+            };
+          };
+          root = {
+            name = "root";
+            size = "100%";
+            content = {
+              type = "lvm_pv";
+              vg = "pool";
+            };
+          };
+        };
+      };
+    };
+    lvm_vg.pool = {
+      type = "lvm_vg";
+      lvs.root = {
+        size = "100%FREE";
+        content = {
+          type = "filesystem";
+          format = "ext4";
+          mountpoint = "/";
+          mountOptions = [ "defaults" ];
+        };
+      };
+    };
+  };
+}

modules/hosts/orion/_hardware.nix

@@ -0,0 +1,22 @@
+{ lib, modulesPath, ... }:
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "uhci_hcd"
+    "virtio_pci"
+    "virtio_scsi"
+    "sd_mod"
+    "sr_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

modules/hosts/orion/default.nix

@@ -1,43 +1,70 @@
-{ den, lib, lux, ... }:
+{
+  inputs,
+  config,
+  ...
+}:
 let
-  lingerForUsers = den.lib.perHost (
-    { host, ... }:
-    {
-      nixos.users.users = lib.mapAttrs (_: _: {
-        linger = true;
-      }) host.users;
-    }
-  );
+  nixosModules = config.flake.modules.nixos;
 in
 {
-  den.aspects.orion = {
-    includes = (with lux.services._; [
-      caddy
-      openssh
-      vaultwarden
-      radicale
-      actual
-      gitea
-    ]) ++ [ lingerForUsers ];
-
-    nixos =
-      { pkgs, ... }:
-      {
-        environment.systemPackages = [
-          pkgs.kitty
-        ];
-
-        networking = {
-          firewall.enable = true;
-          firewall.allowPing = false;
-          nftables.enable = true;
-        };
-
-        # Use ssh authorization for sudo instead of password
-        security.pam = {
-          sshAgentAuth.enable = true;
-          services.sudo.sshAgentAuth = true;
-        };
+  flake.modules.nixos.orion =
+    { pkgs, ... }:
+    let
+      host = {
+        isServer = true;
       };
-  };
+    in
+    {
+      _module.args.host = host;
+
+      imports = [
+        inputs.home-manager.nixosModules.home-manager
+        nixosModules.sopsHost
+        nixosModules.caddy
+        nixosModules.openssh
+        nixosModules.vaultwarden
+        nixosModules.radicale
+        nixosModules.actual
+        nixosModules.gitea
+        nixosModules.kiri
+        ./_hardware.nix
+        ./_disk.nix
+      ];
+
+      system.stateVersion = "24.05";
+
+      home-manager = {
+        useGlobalPkgs = true;
+        backupFileExtension = "bak";
+        extraSpecialArgs = { inherit inputs; };
+      };
+
+      networking.hostName = "orion";
+
+      security.sudo.extraConfig = ''
+        Defaults env_keep+=SSH_AUTH_SOCK
+      '';
+
+      users.users.kiri = {
+        linger = true;
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAU2LydkXRTtNFY7oyX8JQURwXLVhB71DeK8XzrXeFX1 openpgp:0xA490D93A"
+        ];
+      };
+
+      environment.systemPackages = [
+        pkgs.kitty
+      ];
+
+      networking = {
+        firewall.enable = true;
+        firewall.allowPing = false;
+        nftables.enable = true;
+      };
+
+      security.pam = {
+        sshAgentAuth.enable = true;
+        services.sudo.sshAgentAuth = true;
+      };
+    };
 }

modules/hosts/orion/disk.nix

@@ -1,63 +0,0 @@
-{ inputs, ... }:
-{
-  den.aspects.orion = {
-    nixos =
-      { lib, ... }:
-      {
-        imports = [ inputs.disko.nixosModules.disko ];
-
-        disko.devices = {
-          disk.disk1 = {
-            device = lib.mkDefault "/dev/sda";
-            type = "disk";
-            content = {
-              type = "gpt";
-              partitions = {
-                boot = {
-                  name = "boot";
-                  size = "1M";
-                  type = "EF02";
-                };
-                esp = {
-                  name = "ESP";
-                  size = "500M";
-                  type = "EF00";
-                  content = {
-                    type = "filesystem";
-                    format = "vfat";
-                    mountpoint = "/boot";
-                  };
-                };
-                root = {
-                  name = "root";
-                  size = "100%";
-                  content = {
-                    type = "lvm_pv";
-                    vg = "pool";
-                  };
-                };
-              };
-            };
-          };
-          lvm_vg = {
-            pool = {
-              type = "lvm_vg";
-              lvs = {
-                root = {
-                  size = "100%FREE";
-                  content = {
-                    type = "filesystem";
-                    format = "ext4";
-                    mountpoint = "/";
-                    mountOptions = [
-                      "defaults"
-                    ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-  };
-}

modules/hosts/orion/hardware.nix

@@ -1,38 +0,0 @@
-# Do not modify this file!  It was generated by 'nixos-generate-config'
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/system.nix instead.
-{ ... }:
-{
-  den.aspects.orion = {
-    nixos =
-      {
-        config,
-        lib,
-        pkgs,
-        modulesPath,
-        ...
-      }:
-
-      {
-        imports = [
-          (modulesPath + "/profiles/qemu-guest.nix")
-        ];
-
-        boot.initrd.availableKernelModules = [
-          "ata_piix"
-          "uhci_hcd"
-          "virtio_pci"
-          "virtio_scsi"
-          "sd_mod"
-          "sr_mod"
-        ];
-        boot.initrd.kernelModules = [ ];
-        boot.kernelModules = [ ];
-        boot.extraModulePackages = [ ];
-
-        networking.useDHCP = lib.mkDefault true;
-
-        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-      };
-  };
-}

modules/hosts/polaris/_hardware.nix

@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/bda7f8b9-2b3d-4190-8518-baa50490227e";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/26FE-CA37";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/hosts/polaris/default.nix

@@ -1,72 +1,94 @@
-{ inputs, lux, ... }:
 {
-  den.aspects.polaris = {
-    includes = [ lux.bundles._.local-session ];
+  inputs,
+  config,
+  ...
+}:
+let
+  nixosModules = config.flake.modules.nixos;
+  homeModules = config.flake.modules.homeManager;
+in
+{
+  flake.modules.nixos.polaris =
+    {
+      config,
+      pkgs,
+      ...
+    }:
+    let
+      host = {
+        isServer = false;
+      };
+    in
+    {
+      _module.args.host = host;
 
-    provides.kiri = {
-      includes = with lux; [
-        bundles._.local-session-user
+      imports = [
+        nixosModules.desktopBase
+        nixosModules.steam
+        nixosModules.kiri
+        nixosModules.ergon
+        ./_hardware.nix
+      ]
+      ++ (with inputs.nixos-hardware.nixosModules; [
+        common-pc
+        common-pc-ssd
+        common-cpu-amd
+        common-gpu-amd
+      ]);
+
+      system.stateVersion = "24.05";
+
+      networking.hostName = "polaris";
+
+      home-manager.users.kiri.imports = with homeModules; [
+        nix
         bitwarden
         email
         pim
         mpv
-        sops-password
-        steam
+        niri
+        clipboard
+        localApps
+        qbittorrentClient
+        vicinae
+        xdg
+        theme
+        noctalia
       ];
-    };
 
-    provides.ergon = {
-      includes = with lux; [
-        sops-password
-      ];
-    };
-
-    nixos =
-      {
-        config,
-        pkgs,
-        ...
-      }:
-      {
-        imports = with inputs.nixos-hardware.nixosModules; [
-          common-pc
-          common-pc-ssd
-          common-cpu-amd
-          common-gpu-amd
-        ];
-
-        services.hardware.openrgb.enable = true;
-
-        boot = {
-          loader = {
-            efi.canTouchEfiVariables = true;
-            systemd-boot = {
-              enable = true;
-              consoleMode = "auto";
-              configurationLimit = 5;
-
-              # Convert boot entry to a more readable name.
-              extraInstallCommands = ''
-                ENTRIES="${config.boot.loader.efi.efiSysMountPoint}/loader/entries"
-                PROFILES="/nix/var/nix/profiles"
-
-                for file in "$ENTRIES"/nixos-generation-*.conf; do
-                  generation=$(${pkgs.coreutils}/bin/basename "$file" | ${pkgs.gnugrep}/bin/grep -o -E '[0-9]+')
-                  timestamp=$(${pkgs.coreutils}/bin/stat -c %y "$PROFILES/system-$generation-link" 2>/dev/null | ${pkgs.coreutils}/bin/cut -d. -f1)
-
-                  if [ -z "$timestamp" ]; then
-                    timestamp="Unknown Date"
-                  fi
-
-                  ${pkgs.gnused}/bin/sed -i "s/^version .*/version Generation $generation - $timestamp/" "$file"
-                done
-              '';
-            };
+      home-manager.users.kiri.programs.niri.settings.outputs = {
+        "LG Electronics LG ULTRAGEAR 103NTYT8R290" = {
+          "focus-at-startup" = true;
+          position = {
+            x = 0;
+            y = 0;
           };
+        };
 
-          tmp.cleanOnBoot = true;
-          kernelPackages = pkgs.linuxPackages_latest;
+        "LG Electronics LG ULTRAGEAR 103NTJJ8R332" = {
+          position = {
+            x = 2560;
+            y = 0;
+          };
         };
       };
-  };
+
+      services.hardware.openrgb.enable = true;
+
+      boot.loader.systemd-boot.extraInstallCommands = ''
+        ENTRIES="${config.boot.loader.efi.efiSysMountPoint}/loader/entries"
+        PROFILES="/nix/var/nix/profiles"
+
+        for file in "$ENTRIES"/nixos-generation-*.conf; do
+          generation=$(${pkgs.coreutils}/bin/basename "$file" | ${pkgs.gnugrep}/bin/grep -o -E '[0-9]+')
+          timestamp=$(${pkgs.coreutils}/bin/stat -c %y "$PROFILES/system-$generation-link" 2>/dev/null | ${pkgs.coreutils}/bin/cut -d. -f1)
+
+          if [ -z "$timestamp" ]; then
+            timestamp="Unknown Date"
+          fi
+
+          ${pkgs.gnused}/bin/sed -i "s/^version .*/version Generation $generation - $timestamp/" "$file"
+        done
+      '';
+    };
 }

modules/hosts/polaris/hardware.nix

@@ -1,50 +0,0 @@
-{
-  den.aspects.polaris = {
-    nixos =
-      {
-        config,
-        lib,
-        modulesPath,
-        ...
-      }:
-
-      {
-        imports = [
-          (modulesPath + "/installer/scan/not-detected.nix")
-        ];
-
-        boot.initrd.availableKernelModules = [
-          "nvme"
-          "xhci_pci"
-          "ahci"
-          "usbhid"
-          "usb_storage"
-          "sd_mod"
-        ];
-        boot.initrd.kernelModules = [ ];
-        boot.kernelModules = [ "kvm-amd" ];
-        boot.extraModulePackages = [ ];
-
-        fileSystems."/" = {
-          device = "/dev/disk/by-uuid/bda7f8b9-2b3d-4190-8518-baa50490227e";
-          fsType = "ext4";
-        };
-
-        fileSystems."/boot" = {
-          device = "/dev/disk/by-uuid/26FE-CA37";
-          fsType = "vfat";
-          options = [
-            "fmask=0077"
-            "dmask=0077"
-          ];
-        };
-
-        swapDevices = [ ];
-
-        networking.useDHCP = lib.mkDefault true;
-
-        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-        hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-      };
-  };
-}

modules/hosts/zenith/_hardware.nix

@@ -0,0 +1,36 @@
+{ lib, modulesPath, ... }:
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/6d8f6f33-c9d9-4e90-b496-d5b3ef5e9aeb";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/8797-B47E";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

modules/hosts/zenith/default.nix

@@ -1,48 +1,68 @@
-{ inputs, lux, ... }:
 {
-  den.aspects.zenith = {
-    includes = [ lux.bundles._.local-session ];
+  inputs,
+  config,
+  ...
+}:
+let
+  nixosModules = config.flake.modules.nixos;
+  homeModules = config.flake.modules.homeManager;
+in
+{
+  flake.modules.nixos.zenith =
+    { ... }:
+    let
+      host = {
+        isServer = false;
+      };
+    in
+    {
+      _module.args.host = host;
 
-    provides.kiri = {
-      includes = with lux; [
-        bundles._.local-session-user
+      imports = [
+        nixosModules.desktopBase
+        nixosModules.kiri
+        nixosModules.ergon
+        ./_hardware.nix
+        inputs.nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7-amdgpu
+      ];
+
+      system.stateVersion = "24.05";
+
+      networking.hostName = "zenith";
+
+      home-manager.users.kiri.imports = with homeModules; [
+        nix
         bitwarden
         email
         pim
         mpv
-        sops-password
+        niri
+        clipboard
+        localApps
+        qbittorrentClient
+        vicinae
+        xdg
+        theme
+        noctalia
       ];
-    };
 
-    provides.ergon = {
-      includes = with lux; [
-        sops-password
-      ];
-    };
-
-    nixos =
-      { pkgs, ... }:
-      {
-        imports = [
-          inputs.nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7-amdgpu
-        ];
-
-        boot = {
-          loader = {
-            efi.canTouchEfiVariables = true;
-            systemd-boot = {
-              enable = true;
-              consoleMode = "auto";
-              configurationLimit = 5;
-            };
+      home-manager.users.kiri.programs.niri.settings.outputs = {
+        "California Institute of Technology 0x1410 Unknown" = {
+          "focus-at-startup" = true;
+          position = {
+            x = 0;
+            y = 0;
+          };
+          scale = 1.5;
+          mode = {
+            width = 3072;
+            height = 1920;
+            refresh = 120.002;
           };
-
-          tmp.cleanOnBoot = true;
-          kernelPackages = pkgs.linuxPackages_latest;
         };
-
-        hardware.enableRedistributableFirmware = true;
-        services.fwupd.enable = true;
       };
-  };
+
+      hardware.enableRedistributableFirmware = true;
+      services.fwupd.enable = true;
+    };
 }

modules/hosts/zenith/hardware.nix

@@ -1,46 +0,0 @@
-{
-  den.aspects.zenith = {
-    nixos =
-      {
-        lib,
-        modulesPath,
-        ...
-      }:
-
-      {
-        imports = [
-          (modulesPath + "/installer/scan/not-detected.nix")
-        ];
-
-        boot.initrd.availableKernelModules = [
-          "nvme"
-          "xhci_pci"
-          "usb_storage"
-          "sd_mod"
-        ];
-        boot.initrd.kernelModules = [ ];
-        boot.kernelModules = [ "kvm-amd" ];
-        boot.extraModulePackages = [ ];
-
-        fileSystems."/" = {
-          device = "/dev/disk/by-uuid/6d8f6f33-c9d9-4e90-b496-d5b3ef5e9aeb";
-          fsType = "ext4";
-        };
-
-        fileSystems."/boot" = {
-          device = "/dev/disk/by-uuid/8797-B47E";
-          fsType = "vfat";
-          options = [
-            "fmask=0077"
-            "dmask=0077"
-          ];
-        };
-
-        swapDevices = [ ];
-
-        networking.useDHCP = lib.mkDefault true;
-
-        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-      };
-  };
-}