refactor: centralize host and user metadata

2026-04-21 12:12:43 +02:00
parent 5cfd4d01c8
commit 6332c96d3e
33 changed files with 805 additions and 479 deletions
@@ -5,83 +5,45 @@
 }:
 let
  nixosModules = config.flake.modules.nixos;
-  homeModules = config.flake.modules.homeManager;
+  metaLib = config.meta.lib;
 in
 {
-  flake.modules.nixos.polaris =
-    {
-      config,
-      pkgs,
-      ...
-    }:
-    {
-      _module.args.hostType = "desktop";
+  flake.modules.nixos.polaris = metaLib.mkHost {
+    name = "polaris";
+    kind = "workstation";

-      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
-        niri
-        clipboard
-        localApps
-        qbittorrentClient
-        vicinae
-        xdg
-        theme
-        noctalia
-      ];
-
-      home-manager.users.kiri.programs.niri.settings.outputs = {
-        "LG Electronics LG ULTRAGEAR 103NTYT8R290" = {
-          "focus-at-startup" = true;
-          position = {
-            x = 0;
-            y = 0;
-          };
-        };
-
-        "LG Electronics LG ULTRAGEAR 103NTJJ8R332" = {
-          position = {
-            x = 2560;
-            y = 0;
-          };
-        };
+    displays = {
+      "LG Electronics LG ULTRAGEAR 103NTYT8R290" = {
+        primary = true;
+        x = 0;
+        y = 0;
      };

-      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
-      '';
+      "LG Electronics LG ULTRAGEAR 103NTJJ8R332" = {
+        x = 2560;
+        y = 0;
+      };
    };
+
+    users = {
+      inherit (metaLib.users)
+        ergon
+        kiri
+        ;
+    };
+
+    imports = [
+      nixosModules."workstation-base"
+      nixosModules.steam
+      nixosModules."user-kiri"
+      nixosModules."user-ergon"
+      ./_hardware.nix
+    ]
+    ++ (with inputs.nixos-hardware.nixosModules; [
+      common-pc
+      common-pc-ssd
+      common-cpu-amd
+      common-gpu-amd
+    ]);
+  };
 }