diff --git a/modules/i3/default.nix b/modules/i3/default.nix index f1ca4b7..3032928 100644 --- a/modules/i3/default.nix +++ b/modules/i3/default.nix @@ -8,6 +8,7 @@ in with theme.colors; { home.packages = with pkgs; [ playerctl # pactl comes with PulseAudio xclip # Copying screenshots to clipboard + wmctrl # For rofi power menu ]; # Screenshots @@ -69,7 +70,10 @@ in with theme.colors; { "${mod}+Return" = "exec kitty"; "${mod}+Shift+e" = "exec i3-msg exit"; # bypass default session exit confirmation menu "${mod}+space" = "exec i3-msg open"; # Open blank space - "Mod1+Q" = "exec /etc/profiles/per-user/elnu/bin/rofi-power"; + "Mod1+Q" = let rofi-power = pkgs.substituteAll { + src = ./power.sh; + isExecutable = true; + }; in "exec ${rofi-power}"; # Audio controls "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10%"; diff --git a/modules/rofi/power.sh b/modules/i3/power.sh similarity index 100% rename from modules/rofi/power.sh rename to modules/i3/power.sh diff --git a/modules/rofi/default.nix b/modules/rofi/default.nix index 527740e..7a52c43 100644 --- a/modules/rofi/default.nix +++ b/modules/rofi/default.nix @@ -4,10 +4,6 @@ let _theme = import ../theme; theme = _theme.theme; # Theme name in { - home.packages = with pkgs; [ - (pkgs.callPackage ./power.nix { }) - wmctrl # TODO: add as dependency of rofi-power - ]; programs.rofi = { enable = true; inherit theme; diff --git a/modules/rofi/power.nix b/modules/rofi/power.nix deleted file mode 100644 index 2f4ff50..0000000 --- a/modules/rofi/power.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, substituteAll }: - -substituteAll { - name = "rofi-power"; - src = ./power.sh; - - dir = "bin"; - isExecutable = true; -}