chore: switch marr over to hjem

flake.lock

@@ -186,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740334274,
-        "narHash": "sha256-7WePvSVCZFoq10tf0LF6MsYbS/JPl/eQjE6zsfz5RpE=",
+        "lastModified": 1740423947,
+        "narHash": "sha256-TLUC9rkFZBvKSnNtrdkHY0NsnKmW6XYRIdje6Yt2b3w=",
         "owner": "nydragon",
         "repo": "hjem-rum",
-        "rev": "20b1173bc9fee5ef26a11578934f01992b84e5a2",
+        "rev": "de016de0f8e602529f88c0dbd840e4091b566f3f",
         "type": "github"
       },
       "original": {

home/hyprland/default.nix

@@ -7,6 +7,7 @@
 }:
 let
   inherit (lib) mapAttrsToList mkIf hasAttr;
+  inherit (lib.my) getExe;
 in
 mkIf osConfig.programs.hyprland.enable {
   home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
@@ -148,13 +149,13 @@ mkIf osConfig.programs.hyprland.enable {
       bindm = [ "$mod,mouse:272,movewindow" ];
 
       bind = [
-        "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
-        "$mod, E, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.filemanager}"
-        "$mod, Return, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.terminal}"
+        "$mod, D, exec, ${getExe osConfig.modules.system.roles.desktop.runner.package}"
+        "$mod, E, exec, ${getExe osConfig.modules.system.roles.desktop.filemanager}"
+        "$mod, Return, exec, ${getExe osConfig.modules.system.roles.desktop.terminal}"
         "$mod SHIFT, Q, killactive,"
         "$mod, V, togglefloating"
         "$mod SHIFT, P, exec, ${config.programs.rofi.package}/bin/rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
-        "$mod, P, exec, ${pkgs.cliphist}/bin/cliphist wipe & ${pkgs.hyprlock}/bin/hyprlock"
+        "$mod, P, exec, ${getExe pkgs.cliphist} wipe & ${getExe pkgs.hyprlock}"
         "$mod SHIFT, C, exec, hyprctl reload"
         "$mod SHIFT, space, togglefloating"
         "$mod, left, movefocus, l"

hosts/default.nix

@@ -18,6 +18,8 @@ in
       extraModules = [
         inputs.disko.nixosModules.disko
         inputs.agenix.nixosModules.default
+        inputs.hjem.nixosModules.default
+        inputs.hjem-rum.nixosModules.default
       ];
     })
 

hosts/marr/default.nix

@@ -9,6 +9,7 @@
     ./hardware-configuration.nix
     ./home.nix
     ./ny.nix
+    ../../users/ny
   ];
 
   time.timeZone = "Europe/Paris";

users/ny/default.nix

@@ -1,9 +1,13 @@
+{ lib, ... }:
 {
   hjem = {
     users.ny = {
       enable = true;
       imports = [ ./programs ];
     };
+    specialArgs = {
+      libmy = lib.my;
+    };
     clobberByDefault = true;
   };
 }

users/ny/programs/fuzzel.nix

@@ -1,4 +1,4 @@
-{ lib, osConfig, ... }:
+{ libmy, osConfig, ... }:
 let
   inherit (osConfig.modules.system.roles) desktop;
 in
@@ -12,7 +12,7 @@ in
         font = "Hack:weight=bold";
         line-height = 30;
         fields = "name,generic,comment";
-        terminal = lib.my.getExe desktop.terminal;
+        terminal = libmy.getExe desktop.terminal;
         prompt = ''"❯   "'';
         layer = "overlay";
       };