aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/desktop/i3/keybindings.nix9
-rw-r--r--modules/scripts/default.nix8
2 files changed, 9 insertions, 8 deletions
diff --git a/modules/desktop/i3/keybindings.nix b/modules/desktop/i3/keybindings.nix
index 9a16d4b..e0497f0 100644
--- a/modules/desktop/i3/keybindings.nix
+++ b/modules/desktop/i3/keybindings.nix
@@ -12,13 +12,14 @@ in
# --- General Applications ---
"${mod}+r" =
lib.mkIf (config.programs.fzf.enable && config.programs.kitty.enable)
- "exec ${lib.getExe pkgs.kitty} --class application-launcher -e ${lib.getExe config.scripts.fzf-launcher.package}";
- "${mod}+t" = lib.mkIf config.programs.kitty.enable "exec ${lib.getExe pkgs.kitty}";
+ "exec ${lib.getExe config.programs.kitty.package} --class application-launcher -e ${lib.getExe config.scripts.fzf-launcher.package}";
+ "${mod}+t" =
+ lib.mkIf config.programs.kitty.enable "exec ${lib.getExe config.programs.kitty.package}";
"${mod}+f" =
lib.mkIf (config.programs.kitty.enable && config.programs.lf.enable)
- "exec ${lib.getExe pkgs.kitty} --title 'File Manager' --class file-explorer -e ${lib.getExe config.programs.lf.package}";
+ "exec ${lib.getExe config.programs.kitty.package} --title 'File Manager' --class file-explorer -e ${lib.getExe config.programs.lf.package}";
"${mod}+s" =
- lib.mkIf config.programs.kitty.enable "exec ${lib.getExe pkgs.kitty} --title 'Keybindings' --class keybindings-viewer -e ${lib.getExe config.scripts.i3-keybindings.package}";
+ lib.mkIf config.programs.kitty.enable "exec ${lib.getExe config.programs.kitty.package} --title 'Keybindings' --class keybindings-viewer -e ${lib.getExe config.scripts.i3-keybindings.package}";
"${mod}+q" = "kill";
# --- Media / Hardware Keys ---
diff --git a/modules/scripts/default.nix b/modules/scripts/default.nix
index 6a78c31..dedda8f 100644
--- a/modules/scripts/default.nix
+++ b/modules/scripts/default.nix
@@ -149,15 +149,15 @@ let
system-monitor = {
path = ./system-monitor.sh;
env = {
- BTM = lib.getExe pkgs.bottom;
+ BTM = lib.getExe config.programs.bottom.package;
NVTOP = lib.getExe pkgs.nvtopPackages.full;
- TMUX = lib.getExe pkgs.tmux;
+ TMUX = lib.getExe config.programs.tmux.package;
KITTY = lib.getExe config.programs.kitty.package;
};
deps = [
- pkgs.bottom
+ config.programs.bottom.package
pkgs.nvtopPackages.full
- pkgs.tmux
+ config.programs.tmux.package
config.programs.kitty.package
];
conditions = [