diff --git a/flake.lock b/flake.lock index 55e72f7..30aabe5 100644 --- a/flake.lock +++ b/flake.lock @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1738790283, - "narHash": "sha256-SKz3KfmK7iupR+Ef022pQQZccxXlm/2w5HxpSv+PAGE=", + "lastModified": 1740334274, + "narHash": "sha256-7WePvSVCZFoq10tf0LF6MsYbS/JPl/eQjE6zsfz5RpE=", "owner": "nydragon", "repo": "hjem-rum", - "rev": "ac4bf585731b813ad37cb3822ad44b1e3bb16a7e", + "rev": "20b1173bc9fee5ef26a11578934f01992b84e5a2", "type": "github" }, "original": { diff --git a/home/graphical/default.nix b/home/graphical/default.nix index ca50b6f..07d430d 100644 --- a/home/graphical/default.nix +++ b/home/graphical/default.nix @@ -3,7 +3,6 @@ ./firefox ./thunderbird ./vscode - ./fuzzel.nix ./gammastep.nix # default because I need to protect my peepers ./swww.nix ./swayidle.nix diff --git a/users/ny/programs/default.nix b/users/ny/programs/default.nix index 22f5c40..dd95288 100644 --- a/users/ny/programs/default.nix +++ b/users/ny/programs/default.nix @@ -1,6 +1,7 @@ { imports = [ ./foot.nix + ./fuzzel.nix ./keepassxc.nix ]; } diff --git a/home/graphical/fuzzel.nix b/users/ny/programs/fuzzel.nix similarity index 76% rename from home/graphical/fuzzel.nix rename to users/ny/programs/fuzzel.nix index 093635b..e29db68 100644 --- a/home/graphical/fuzzel.nix +++ b/users/ny/programs/fuzzel.nix @@ -1,7 +1,10 @@ { lib, osConfig, ... }: +let + inherit (osConfig.modules.system.roles) desktop; +in { - programs.fuzzel = { - enable = true; + rum.programs.fuzzel = { + enable = desktop.enable; settings = { main = { icon-theme = "Papirus-Dark"; @@ -9,7 +12,7 @@ font = "Hack:weight=bold"; line-height = 30; fields = "name,generic,comment"; - terminal = lib.my.getExe osConfig.modules.system.roles.desktop.terminal; + terminal = lib.my.getExe desktop.terminal; prompt = ''"❯ "''; layer = "overlay"; };