From faba6c04a3e1e4240bdf705e2c2eb9fe8cddd3c5 Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Thu, 11 Dec 2025 18:33:31 +0200
Subject: [PATCH] feat: move importBoth to lib

---
 lib/default.nix                    |  9 ++++++++-
 modules/hosts/ws/alice/default.nix | 19 +++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 559cdca..cece4c4 100644
--- a/lib/default.nix
+++ b/lib/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}];
+      }
+    ];
   };
 }
diff --git a/modules/hosts/ws/alice/default.nix b/modules/hosts/ws/alice/default.nix
index 6a434ec..a70be5e 100644
--- a/modules/hosts/ws/alice/default.nix
+++ b/modules/hosts/ws/alice/default.nix
@@ -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)
           ];
       })
     ];
-- 
2.44.1