2 files changed, 13 insertions(+), 15 deletions(-)

M lib/default.nix
M modules/hosts/ws/alice/default.nix

@@ 1,7 1,14 @@
-{...}: {
+{inputs, ...}: {
   arta = {
     liljamoPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGAlif3ABIk0YSx++A+sEeRYPNMMZWLcDuoTKhmcCL6K jonni@liljamo.com";
 
     colours = import ./colours.nix;
+
+    importBoth = module: user: [
+      inputs.self.modules.nixos.${module}
+      {
+        home-manager.users.${user}.imports = [inputs.self.modules.homeManager.${module}];
+      }
+    ];
   };
 }

@@ 1,8 1,4 @@
-{
-  inputs,
-  lib,
-  ...
-}: let
+{inputs, ...}: let
   channel = "unstable";
   system = "x86_64-linux";
   hostName = "alice";


@@ 32,16 28,11 @@ in {
 
       ({
         config,
+        lib,
         pkgs,
         ...
       }: let
         user = "skye";
-        importBoth = module: [
-          inputs.self.modules.nixos.${module}
-          {
-            home-manager.users.${user}.imports = [inputs.self.modules.homeManager.${module}];
-          }
-        ];
       in {
         imports = with inputs.self.modules.nixos;
           [


@@ 144,9 135,9 @@ in {
           ]
           ++ [inputs.self.modules.nixos.${user}]
           ++ lib.flatten [
-            (importBoth "hyprland")
-            (importBoth "shell")
-            (importBoth "passmenu")
+            (lib.arta.importBoth "hyprland" user)
+            (lib.arta.importBoth "shell" user)
+            (lib.arta.importBoth "passmenu" user)
           ];
       })
     ];