diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index 7b80362..f7020c9 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -5,7 +5,7 @@ catppuccin.homeManagerModules.catppuccin ../common/programs/default.nix ../common/programs/desktop.nix - ../common/programs/hyprland.nix + ../common/programs/hyprland ../common/programs/eww ../common/programs/kitty.nix ../common/features/colorscheme.nix diff --git a/home/common/programs/desktop.nix b/home/common/programs/desktop.nix index 5645fa8..cc5d078 100644 --- a/home/common/programs/desktop.nix +++ b/home/common/programs/desktop.nix @@ -23,6 +23,4 @@ pkgs.bun ]; - - imports = [ ./rofi.nix ]; } diff --git a/home/common/programs/hyprland.nix b/home/common/programs/hyprland/default.nix similarity index 93% rename from home/common/programs/hyprland.nix rename to home/common/programs/hyprland/default.nix index 81bb1a4..5db64bc 100644 --- a/home/common/programs/hyprland.nix +++ b/home/common/programs/hyprland/default.nix @@ -1,10 +1,13 @@ -{ config, pkgs, ... }: { +{ config, pkgs, ... }: let + rofiLaunchers = import ../../../pkgs/rofi-launchers/package.nix {}; +in { home.sessionVariables = { HYPRCURSOR_THEME = "Phinger Cursors"; HYPRCURSOR_SIZE = 32; ELECTRON_OZONE_PLATFORM_HINT = "auto"; XCURSOR_SIZE = 32; }; + home.packages = with pkgs; [rofi (callPackage ../../../pkgs/rofi-launchers/package.nix {})]; wayland.windowManager.hyprland = { enable = true; @@ -78,7 +81,7 @@ "$mod SHIFT, f, fullscreen, 1" # rofi -"$mod, space, exec, ~/.config/rofi-launchers/type-2/launcher.sh" +"$mod, space, exec, launcher_t2" # move focus with mod + arrows "$mod, h, movefocus, l" diff --git a/home/common/programs/hyprland/rofi.nix b/home/common/programs/hyprland/rofi.nix new file mode 100644 index 0000000..9644b9f --- /dev/null +++ b/home/common/programs/hyprland/rofi.nix @@ -0,0 +1,3 @@ +{pkgs,...}:{ + home.packages = with pkgs; [rofi (callPackage ../../../../pkgs/rofi-launchers/package.nix {})]; + } diff --git a/home/common/programs/rofi.nix b/home/common/programs/rofi.nix deleted file mode 100644 index 015b8bd..0000000 --- a/home/common/programs/rofi.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [rofi (callPackage ../../../pkgs/rofi-launchers/package.nix {})]; - - xdg.configFile."rofi-launchers".source = pkgs.fetchFromGitHub { - owner = "adi1090x"; - repo = "rofi"; - rev = "dce10e9"; - sha256 = "sha256-ZSosFsi/M5Gqb9gsUqS7hu89uOu9078Dus4Y+WCphZc="; - }; -} diff --git a/pkgs/rofi-launchers/package.nix b/pkgs/rofi-launchers/package.nix index 99512a1..6046d7d 100644 --- a/pkgs/rofi-launchers/package.nix +++ b/pkgs/rofi-launchers/package.nix @@ -6,8 +6,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "adi1090x"; repo = "rofi"; - rev = "master"; - hash = "sha256-IPtn0bDIUmSwm24YowURgNrs907RrcfrRM9TdhE2c0I="; + rev = "dce10e9"; + hash = "sha256-ZSosFsi/M5Gqb9gsUqS7hu89uOu9078Dus4Y+WCphZc="; }; buildInputs = [ rofi ];