refactor(hosts): simplify configuration imports across hosts

modules/hm/desktop/hyprland.nix

@@ -1,6 +1,6 @@
 {
   flake.modules.homeManager.desktop =
-    { pkgs, ... }:
+    { config, pkgs, ... }:
     {
       wayland.windowManager.hyprland = {
         enable = true;
@@ -10,6 +10,15 @@
         systemd.variables = [ "--all" ];
       };
 
+      # TODO: Hyprland 0.55 switched to Lua-based configuration.
+      # Until the Home Manager module is updated, we symlink our config instead.
+      home.file = {
+        ".config/hypr/config".source =
+          config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/Projects/hypr/config";
+        ".config/hypr/hyprland.lua".source =
+          config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/Projects/hypr/hyprland.lua";
+      };
+
       home.packages = with pkgs; [
         ags
         awww

modules/hm/desktop/mango.nix

@@ -1,21 +1,41 @@
 { inputs, ... }:
 {
   flake.modules.homeManager.desktop =
-    { pkgs, ... }:
+    {
+      config,
+      pkgs,
+      lib,
+      ...
+    }:
+    with lib;
+    let
+      cfg = config.tnix.desktop.mangowm;
+    in
     {
       imports = [
         inputs.mango.hmModules.mango
       ];
 
+      options.tnix.desktop.mangowm = {
+        enable = mkEnableOption "Enable MangoWM";
+
+        monitorRule = mkOption {
+          type = with types; listOf str;
+          default = [ ];
+        };
+
+        tagRule = mkOption {
+          type = with types; listOf str;
+          default = [ ];
+        };
+      };
+
+      config = mkIf cfg.enable {
         wayland.windowManager.mango = {
           enable = true;
           settings = {
             # Monitors
-          monitorrule = [
+            monitorrule = cfg.monitorRule;
-            "name:DP-2, width:1440, height:2560, refresh:144, x:0, y:0, vrr:0, rr:1"
-            "name:DP-3, width:2560, height:1440, refresh:144, x:1440, y:0, vrr:0"
-            "name:DP-1, width:1080, height:1920, refresh:144, x:4000, y:0, vrr:0, rr:3"
-          ];
 
             focus_cross_monitor = 1;
             exchange_cross_monitor = 1;
@@ -68,25 +88,7 @@
             overviewgappo = 15;
 
             # layouts
-          tagrule = [
+            tagrule = cfg.tagRule;
-            "id:1, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-            "id:2, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-            "id:3, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-            "id:4, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-            "id:5, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-
-            "id:1, layout_name:tile, monitor_name:DP-3, no_hide:1"
-            "id:2, layout_name:tile, monitor_name:DP-3, no_hide:1"
-            "id:3, layout_name:tile, monitor_name:DP-3, no_hide:1"
-            "id:4, layout_name:tile, monitor_name:DP-3, no_hide:1"
-            "id:5, layout_name:tile, monitor_name:DP-3, no_hide:1"
-
-            "id:1, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-            "id:2, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-            "id:3, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-            "id:4, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-            "id:5, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-          ];
 
             # Keybindings
             mousebind = [
@@ -250,4 +252,5 @@
           dgop
         ];
       };
+    };
 }

modules/hm/desktop/mpv.nix

@@ -0,0 +1,24 @@
+{
+  flake.modules.homeManager.desktop =
+    { pkgs, ... }:
+    {
+      programs.mpv = {
+        enable = true;
+
+        scripts = (
+          with pkgs.mpvScripts;
+          [
+            modernz
+            thumbfast
+            mpris
+            mpv-image-viewer.image-positioning
+          ]
+        );
+
+        config = {
+          osc = "no";
+          border = "no";
+        };
+      };
+    };
+}

modules/hm/desktop/vicinae.nix

@@ -54,11 +54,6 @@
           imports = [ "/run/secrets/vicinae.json" ];
 
           providers = {
-            "@samlinville/store.raycast.tailscale" = {
-              "preferences" = {
-                "tailscalePath" = "${pkgs.tailscale}/bin/tailscale";
-              };
-            };
             "@sovereign/vicinae-extension-awww-switcher-0" = {
               "preferences" = {
                 "transitionDuration" = "1";

modules/hosts/alpha/config.nix

@@ -4,21 +4,14 @@
     {
       hostName,
       userName,
-      modulesPath,
       ...
     }:
     {
-      imports =
+      imports = with config.flake.modules.nixos; [
-        with config.flake.modules.nixos;
-        [
         boot
-          hardware
         networking
         virtualisation
         services
-        ]
-        ++ [
-          (modulesPath + "/profiles/qemu-guest.nix")
       ];
 
       tnix = {

modules/hosts/alpha/default.nix

@@ -14,7 +14,14 @@ in
 {
   flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
     inherit system;
-    specialArgs = { inherit hostName userName userEmail; };
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
     modules = [
       config.flake.modules.nixos.core
       config.flake.modules.nixos.${hostName}

modules/hosts/alpha/hardware.nix

@@ -0,0 +1,17 @@
+{
+  flake.modules.nixos.alpha =
+    {
+      lib,
+      modulesPath,
+      system,
+      ...
+    }:
+    {
+      imports = [
+        (modulesPath + "/profiles/qemu-guest.nix")
+      ];
+
+      networking.useDHCP = lib.mkDefault true;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+    };
+}

modules/hosts/arcturus/config.nix

@@ -2,7 +2,6 @@
 {
   flake.modules.nixos.arcturus =
     {
-      pkgs,
       hostName,
       userName,
       ...
@@ -10,7 +9,6 @@
     {
       imports = with config.flake.modules.nixos; [
         boot
-        hardware
         networking
         virtualisation
         services
@@ -109,10 +107,6 @@
         firewall.enable = false;
       };
 
-      environment.systemPackages = with pkgs; [
-        nvtopPackages.full
-      ];
-
       system.stateVersion = "26.05";
     };
 }

modules/hosts/arcturus/default.nix

@@ -14,7 +14,14 @@ in
 {
   flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
     inherit system;
-    specialArgs = { inherit hostName userName userEmail; };
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
     modules = [
       config.flake.modules.nixos.core
       config.flake.modules.nixos.${hostName}

modules/hosts/arcturus/hardware.nix

@@ -1,11 +1,17 @@
+{ config, ... }:
 {
   flake.modules.nixos.arcturus =
     {
-      config,
       lib,
+      pkgs,
+      system,
       ...
-    }:
+    }@innerArgs:
     {
+      imports = with config.flake.modules.nixos; [
+        hardware
+      ];
+
       boot.initrd.availableKernelModules = [
         "nvme"
         "xhci_pci"
@@ -18,15 +24,13 @@
       boot.kernelModules = [ "kvm-amd" ];
       boot.extraModulePackages = [ ];
 
-      # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+      hardware.cpu.amd.updateMicrocode = lib.mkDefault innerArgs.config.hardware.enableRedistributableFirmware;
-      # (the default) this is the recommended approach. When using systemd-networkd it's
-      # still possible to use this option, but it's recommended to use it in conjunction
-      # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-      networking.useDHCP = lib.mkDefault true;
-      # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-      # networking.interfaces.wlp10s0f3u2i2.useDHCP = lib.mkDefault true;
 
-      nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+      networking.useDHCP = lib.mkDefault true;
-      hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+
+      environment.systemPackages = with pkgs; [
+        nvtopPackages.amd
+      ];
     };
 }

modules/hosts/canopus/config.nix

@@ -10,7 +10,6 @@
     {
       imports = with config.flake.modules.nixos; [
         boot
-        hardware
         networking
         desktop
         gaming
@@ -120,20 +119,7 @@
         firewall.enable = false;
       };
 
-      # --- Hardware / GPU ---
-      # hardware = {
-      #   nvidia = {
-      #     modesetting.enable = true;
-      #     open = false;
-      #     nvidiaSettings = true;
-      #   };
-      # };
-      # boot.kernelParams = [ "nvidia-drm.modeset=1" ];
-      # nixpkgs.config.cudaSupport = true;
-      # services.xserver.videoDrivers = [ "nvidia" ];
-
       environment.systemPackages = with pkgs; [
-        nvtopPackages.full
         davinci-resolve
         telegram-desktop
       ];

modules/hosts/canopus/default.nix

@@ -14,7 +14,14 @@ in
 {
   flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
     inherit system;
-    specialArgs = { inherit hostName userName userEmail; };
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
     modules = [
       config.flake.modules.nixos.core
       config.flake.modules.nixos.${hostName}

modules/hosts/canopus/hardware.nix

@@ -1,11 +1,16 @@
+{ config, ... }:
 {
   flake.modules.nixos.canopus =
     {
-      config,
       lib,
+      system,
       ...
-    }:
+    }@innerArgs:
     {
+      imports = with config.flake.modules.nixos; [
+        hardware
+      ];
+
       boot.initrd.availableKernelModules = [
         "nvme"
         "xhci_pci"
@@ -18,15 +23,9 @@
       boot.kernelModules = [ "kvm-amd" ];
       boot.extraModulePackages = [ ];
 
-      # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+      hardware.cpu.amd.updateMicrocode = lib.mkDefault innerArgs.config.hardware.enableRedistributableFirmware;
-      # (the default) this is the recommended approach. When using systemd-networkd it's
-      # still possible to use this option, but it's recommended to use it in conjunction
-      # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-      networking.useDHCP = lib.mkDefault true;
-      # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-      # networking.interfaces.wlp10s0f3u2i2.useDHCP = lib.mkDefault true;
 
-      nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+      networking.useDHCP = lib.mkDefault true;
-      hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+      nixpkgs.hostPlatform = lib.mkDefault system;
     };
 }

modules/hosts/canopus/home.nix

@@ -5,7 +5,25 @@
       desktop
     ];
 
-    tnix.services.lan-mouse = {
+    tnix = {
+      desktop = {
+        mangowm = {
+          enable = true;
+          monitorRule = [
+            "name:eDP-1, width:2560, height:1440, refresh:165, x:0, y:0, vrr:1"
+          ];
+
+          tagRule = [
+            "id:1, layout_name:tile"
+            "id:2, layout_name:tile"
+            "id:3, layout_name:tile"
+            "id:4, layout_name:tile"
+            "id:5, layout_name:scroller"
+          ];
+        };
+      };
+
+      services.lan-mouse = {
         enable = true;
         settings = {
           authorized_fingerprints = {
@@ -14,6 +32,7 @@
           };
         };
       };
+    };
 
     home.stateVersion = "26.05";
   };

modules/hosts/sirius/config.nix

@@ -10,7 +10,6 @@
     {
       imports = with config.flake.modules.nixos; [
         boot
-        hardware
         networking
         desktop
         gaming
@@ -121,20 +120,7 @@
         firewall.enable = false;
       };
 
-      # --- Hardware / GPU ---
-      hardware = {
-        nvidia = {
-          modesetting.enable = true;
-          open = false;
-          nvidiaSettings = true;
-        };
-      };
-      boot.kernelParams = [ "nvidia-drm.modeset=1" ];
-      nixpkgs.config.cudaSupport = true;
-      services.xserver.videoDrivers = [ "nvidia" ];
-
       environment.systemPackages = with pkgs; [
-        nvtopPackages.full
         davinci-resolve
         telegram-desktop
       ];

modules/hosts/sirius/default.nix

@@ -14,7 +14,14 @@ in
 {
   flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
     inherit system;
-    specialArgs = { inherit hostName userName userEmail; };
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
     modules = [
       config.flake.modules.nixos.core
       config.flake.modules.nixos.${hostName}

modules/hosts/sirius/hardware.nix

@@ -1,11 +1,18 @@
+{ config, ... }:
 {
   flake.modules.nixos.sirius =
     {
-      config,
       lib,
+      pkgs,
+      system,
       ...
-    }:
+    }@innerArgs:
     {
+      imports = with config.flake.modules.nixos; [
+        hardware
+      ];
+
+      boot.kernelParams = [ "nvidia-drm.modeset=1" ];
       boot.initrd.availableKernelModules = [
         "nvme"
         "xhci_pci"
@@ -18,15 +25,23 @@
       boot.kernelModules = [ "kvm-amd" ];
       boot.extraModulePackages = [ ];
 
-      # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+      hardware = {
-      # (the default) this is the recommended approach. When using systemd-networkd it's
+        nvidia = {
-      # still possible to use this option, but it's recommended to use it in conjunction
+          modesetting.enable = true;
-      # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+          open = false;
-      networking.useDHCP = lib.mkDefault true;
+          nvidiaSettings = true;
-      # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+        };
-      # networking.interfaces.wlp10s0f3u2i2.useDHCP = lib.mkDefault true;
 
-      nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+        cpu.amd.updateMicrocode = lib.mkDefault innerArgs.config.hardware.enableRedistributableFirmware;
-      hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+      };
+      services.xserver.videoDrivers = [ "nvidia" ];
+
+      networking.useDHCP = lib.mkDefault true;
+      nixpkgs.config.cudaSupport = true;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+
+      environment.systemPackages = with pkgs; [
+        nvtopPackages.full
+      ];
     };
 }

modules/hosts/sirius/home.nix

@@ -5,7 +5,39 @@
       desktop
     ];
 
-    tnix.services.lan-mouse = {
+    tnix = {
+      desktop = {
+        mangowm = {
+          enable = true;
+          monitorRule = [
+            "name:DP-2, width:1440, height:2560, refresh:144, x:0, y:0, vrr:0, rr:1"
+            "name:DP-3, width:2560, height:1440, refresh:144, x:1440, y:0, vrr:0"
+            "name:DP-1, width:1080, height:1920, refresh:144, x:4000, y:0, vrr:0, rr:3"
+          ];
+
+          tagRule = [
+            "id:1, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+            "id:2, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+            "id:3, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+            "id:4, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+            "id:5, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+
+            "id:1, layout_name:tile, monitor_name:DP-3, no_hide:1"
+            "id:2, layout_name:tile, monitor_name:DP-3, no_hide:1"
+            "id:3, layout_name:tile, monitor_name:DP-3, no_hide:1"
+            "id:4, layout_name:tile, monitor_name:DP-3, no_hide:1"
+            "id:5, layout_name:tile, monitor_name:DP-3, no_hide:1"
+
+            "id:1, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+            "id:2, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+            "id:3, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+            "id:4, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+            "id:5, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+          ];
+        };
+      };
+
+      services.lan-mouse = {
         enable = true;
         settings = {
           clients = [
@@ -18,6 +50,7 @@
           ];
         };
       };
+    };
 
     home.stateVersion = "26.05";
   };

modules/hosts/vps/config.nix

@@ -3,21 +3,14 @@
   flake.modules.nixos.vps =
     {
       hostName,
-      modulesPath,
       ...
     }:
     {
-      imports =
+      imports = with config.flake.modules.nixos; [
-        with config.flake.modules.nixos;
-        [
         boot
-          hardware
         networking
         virtualisation
         services
-        ]
-        ++ [
-          (modulesPath + "/profiles/qemu-guest.nix")
       ];
 
       tnix = {

modules/hosts/vps/default.nix

@@ -14,7 +14,14 @@ in
 {
   flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
     inherit system;
-    specialArgs = { inherit hostName userName userEmail; };
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
     modules = [
       config.flake.modules.nixos.core
       config.flake.modules.nixos.${hostName}

modules/hosts/vps/hardware.nix

@@ -0,0 +1,17 @@
+{
+  flake.modules.nixos.vps =
+    {
+      lib,
+      modulesPath,
+      system,
+      ...
+    }:
+    {
+      imports = [
+        (modulesPath + "/profiles/qemu-guest.nix")
+      ];
+
+      networking.useDHCP = lib.mkDefault true;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+    };
+}