diff --git a/nix/modules/nixos/default.nix b/nix/modules/nixos/default.nix index 86974cc..f3c5b02 100644 --- a/nix/modules/nixos/default.nix +++ b/nix/modules/nixos/default.nix @@ -5,7 +5,6 @@ ./features/gaming.nix ./features/homelab ./fonts.nix - ./rofi.nix ./rsnapshot.nix ./xbanish.nix ]; diff --git a/nix/modules/nixos/rofi.nix b/nix/modules/nixos/rofi.nix deleted file mode 100644 index e7da11e..0000000 --- a/nix/modules/nixos/rofi.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, username, ... }: - -{ - environment.systemPackages = with pkgs; [ - rofi - rofi-power-menu - ]; - - home-manager.users.${username}.programs.rofi = { - enable = true; - cycle = true; - theme = "Arc-Dark"; - - extraConfig = { - modi = "run,drun,emoji,calc"; - }; - - plugins = with pkgs; [ - rofi-bluetooth - rofi-calc - rofi-emoji - rofi-pulse-select - ]; - }; -} diff --git a/patches/dwm/add-custom-commands-and-keys.patch b/patches/dwm/add-custom-commands-and-keys.patch index 99dbe70..bc79941 100644 --- a/patches/dwm/add-custom-commands-and-keys.patch +++ b/patches/dwm/add-custom-commands-and-keys.patch @@ -1,24 +1,19 @@ diff --git a/config.def.h b/config.def.h -index 9efa774..eb69e91 100644 +index 9efa774..e029834 100644 --- a/config.def.h +++ b/config.def.h -@@ -60,9 +60,14 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() +@@ -60,6 +60,10 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "st", NULL }; +/* custom commands */ +static const char *firefox[] = { "firefox", NULL }; -+static const char *rofi[] = { "rofi", "-show", "drun", NULL }; +static const char *thunar[] = { "thunar", NULL }; + static const Key keys[] = { /* modifier key function argument */ -- { MODKEY, XK_p, spawn, {.v = dmenucmd } }, -+ { MODKEY, XK_p, spawn, {.v = rofi } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, -@@ -95,6 +100,8 @@ static const Key keys[] = { + { MODKEY, XK_p, spawn, {.v = dmenucmd } }, +@@ -95,6 +99,8 @@ static const Key keys[] = { TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) { MODKEY|ShiftMask, XK_q, quit, {0} },