From c3a4fc2bb2bf07c80eeb1be43c380781bf4414b2 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 19 Nov 2024 21:12:53 +0100 Subject: [PATCH] use fuzzel instead of wofi --- hosts/muos/configuration.nix | 7 ++++--- modules/hyprland.nix | 2 -- packages/default.nix | 2 ++ packages/fuzzel-launch.nix | 4 ++++ packages/fuzzel-power.nix | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 packages/fuzzel-launch.nix create mode 100644 packages/fuzzel-power.nix diff --git a/hosts/muos/configuration.nix b/hosts/muos/configuration.nix index 27b0a34..6ba864d 100644 --- a/hosts/muos/configuration.nix +++ b/hosts/muos/configuration.nix @@ -99,15 +99,16 @@ { xdg.configFile = let - wpkgs = inputs.self.packages.${pkgs.system}; + spkgs = inputs.self.packages.${pkgs.system}; in { + # "autostart/spotify.desktop".source = config.lib.file.mkOutOfStoreSymlink ""; "niri/config.kdl".source = pkgs.substituteAll { src = ../../extra/niri.kdl; env = { kitty = "${pkgs.kitty}/bin/kitty"; - launcher = "${wpkgs.wofi-launch}/bin/wofi-launch"; - powermenu = "${wpkgs.wofi-power}/bin/wofi-power"; + launcher = "${spkgs.fuzzel-launch}/bin/fuzzel-launch"; + powermenu = "${spkgs.fuzzel-power}/bin/fuzzel-power"; swaylock = "${pkgs.swaylock}/bin/swaylock"; automapaper = lib.strings.concatMapStringsSep "\n" ( command: diff --git a/modules/hyprland.nix b/modules/hyprland.nix index cca3f0f..49a7c1d 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -163,8 +163,6 @@ in "${pkgs.waybar}/bin/waybar" "${pkgs.dunst}/bin/dunst" "${cfg.package}/bin/hyprctl dispatcher focusmonitor 1" - "${pkgs.keepassxc}/bin/keepassxc" - "${pkgs.spotify}/bin/spotify" ]; general = { gaps_in = "2"; diff --git a/packages/default.nix b/packages/default.nix index b69cb5c..ed761e9 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -24,5 +24,7 @@ forAllSystems ( { wofi-launch = call ./wofi-launch.nix; wofi-power = call ./wofi-power.nix; + fuzzel-launch = call ./fuzzel-launch.nix; + fuzzel-power = call ./fuzzel-power.nix; } ) diff --git a/packages/fuzzel-launch.nix b/packages/fuzzel-launch.nix new file mode 100644 index 0000000..de74e6c --- /dev/null +++ b/packages/fuzzel-launch.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +pkgs.writeShellScriptBin "fuzzel-launch" '' + ${pkgs.fuzzel}/bin/fuzzel +'' diff --git a/packages/fuzzel-power.nix b/packages/fuzzel-power.nix new file mode 100644 index 0000000..8a987a6 --- /dev/null +++ b/packages/fuzzel-power.nix @@ -0,0 +1,33 @@ +{ pkgs, ... }: +pkgs.writeShellScriptBin "fuzzel-power" '' + lock="Lock" + poweroff="Poweroff" + reboot="Reboot" + sleep="Suspend" + logout="Log out" + selected_option=$(echo -e "$lock\n$sleep\n$reboot\n$logout\n$poweroff" | ${pkgs.fuzzel}/bin/fuzzel --dmenu -i -p "Powermenu") + + if [ "$selected_option" == "$lock" ] + then + echo "lock" + swaylock + elif [ "$selected_option" == "$poweroff" ] + then + echo "poweroff" + poweroff + elif [ "$selected_option" == "$reboot" ] + then + echo "reboot" + reboot + elif [ "$selected_option" == "$sleep" ] + then + echo "sleep" + suspend + elif [ "$selected_option" == "$logout" ] + then + echo "logout" + hyprctl dispatch exit + else + echo "No match" + fi +''