From 95dad0d41917e301acfc4945a80d3023edbfad1b Mon Sep 17 00:00:00 2001 From: "Casper V. Kristensen" Date: Tue, 7 Nov 2023 00:34:26 +0100 Subject: [PATCH] wofi -> rofi --- modules/desktop/clipman.nix | 2 +- modules/desktop/default.nix | 2 +- modules/desktop/rofi.nix | 22 ++++++++++++++++++++++ modules/desktop/sway.nix | 5 +++-- modules/desktop/wofi.nix | 18 ------------------ 5 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 modules/desktop/rofi.nix delete mode 100644 modules/desktop/wofi.nix diff --git a/modules/desktop/clipman.nix b/modules/desktop/clipman.nix index bd66931..e094156 100644 --- a/modules/desktop/clipman.nix +++ b/modules/desktop/clipman.nix @@ -2,7 +2,7 @@ # Clipboard manager. It can help persist clipboard contents after closing an # application - which otherwise isn't supported in Wayland - but that breaks # rich content copying in general. Therefore, we only use it for clipboard - # history with wofi as a frontend. + # history with rofi as a frontend. # https://github.com/yory8/clipman home-manager.users.caspervk = { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index ef128eb..9c3f33d 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -10,6 +10,6 @@ ./ssh.nix ./sway.nix ./virtd.nix - ./wofi.nix + ./rofi.nix ]; } diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix new file mode 100644 index 0000000..fe593d0 --- /dev/null +++ b/modules/desktop/rofi.nix @@ -0,0 +1,22 @@ +{ home-manager, pkgs, ... }: { + # A window switcher, application launcher and dmenu replacement. Used to open + # programs, view the clipboard history, and select emojis. + # https://github.com/davatorium/rofi + # https://github.com/lbonn/rofi (wayland fork) + # https://wiki.archlinux.org/title/rofi + + home-manager.users.caspervk = { + programs.rofi = { + enable = true; + package = pkgs.rofi-wayland; + theme = "android_notification"; + extraConfig = { + modes = "drun,emoji"; + show-icons = true; + }; + plugins = with pkgs; [ + rofi-emoji + ]; + }; + }; +} diff --git a/modules/desktop/sway.nix b/modules/desktop/sway.nix index 85745b9..6c48b23 100644 --- a/modules/desktop/sway.nix +++ b/modules/desktop/sway.nix @@ -32,8 +32,9 @@ modifier = "Mod4"; # super keybindings = lib.mkOptionDefault { # Menu - "Mod4+backspace" = "exec wofi"; - "Mod4+p" = "exec clipman pick -t wofi"; + "Mod4+backspace" = "exec rofi -show drun"; + "Mod4+p" = "exec clipman pick -t rofi"; + "Mod4+o" = "exec rofi -show emoji"; # Lock "Mod4+Escape" = "exec loginctl lock-session"; diff --git a/modules/desktop/wofi.nix b/modules/desktop/wofi.nix deleted file mode 100644 index 8e01455..0000000 --- a/modules/desktop/wofi.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ home-manager, ... }: { - # Rofi-inspired menu program for Wayland. - # Used to open programs and view the clipman clipboard history. - # https://hg.sr.ht/~scoopta/wofi - - home-manager.users.caspervk = { - programs.wofi = { - enable = true; - settings = { - show = "drun"; - allow_images = true; # show icons - gtk_dark = true; - insensitive = true; - prompt = ""; # hides 'drun' text from the search bar - }; - }; - }; -}