From 5a9bd5a3055dc5958c3c56adc2688ee2f5013878 Mon Sep 17 00:00:00 2001 From: Joshua Elmasri Date: Fri, 26 Sep 2025 12:24:07 -0500 Subject: [PATCH] modularlized rofi and kitty --- hosts/desktop/configuration.nix | 1 + hosts/desktop/home.nix | 49 +-------------------------------- hosts/mac-laptop/home.nix | 48 +------------------------------- modules/kitty/default.nix | 14 ++++++++++ modules/rofi/default.nix | 36 ++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 95 deletions(-) create mode 100644 modules/kitty/default.nix create mode 100644 modules/rofi/default.nix diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index c81a212..aec7ef8 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -332,6 +332,7 @@ hardware.pulseaudio.extraConfig = '' gomatrix python3 pavucontrol + bluebubbles gnomeExtensions.tray-icons-reloaded cider xfce.thunar diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index d3f925e..a20c61b 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -6,7 +6,7 @@ home.username = "joshuaelm"; home.homeDirectory = "/home/joshuaelm"; - imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_desktop.nix ../../modules/ashell/default.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ]; + imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_desktop.nix ../../modules/ashell/default.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ../../modules/rofi ../../modules/kitty ]; home.packages = [ @@ -22,10 +22,8 @@ programs.hyprlock.enable = true; programs.starship.enable = true; programs.starship.enableFishIntegration = true; - programs.kitty.enable = true; programs.cava.enable = true; programs.btop.enable = true; - programs.rofi.enable = true; services.hyprpaper.enable = true; wayland.windowManager.hyprland.enable = true; home.shell.enableFishIntegration = true; @@ -34,51 +32,6 @@ services.mpd-mpris.enable = true; - - programs.rofi.extraConfig = { - show-icons = true; - drun-display-format = "{icon} {name}"; - hide-scrollbar = true; - sidebar-mode = true; - dpi = 110; - font = "FreeSans Regular 12"; - icon-theme = "Gruvbox-Plus-Dark"; - }; - programs.rofi.theme = { - window.height = 600; - window.width = 600; - window.border-radius = 10; - - element = { - padding = 5; - border-radius = 10; - }; - inputbar.padding = 14; - listview = { - padding = 8; - border-radius = "0 0 10 10"; - border = "2 2 2 2"; - dynamic = false; - }; - "element-text element-icon" = { - size = 40; - margin = "0 10 0 0"; - }; - mainbox.children = "inputbar, message, listview"; - mainbox.spacing = 0; - }; - - programs.kitty.extraConfig = '' - font_family Fira Code Nerd Font - bold_font auto - italic_font auto - bold_italic_font auto - confirm_os_window_close 0 - cursor_shape beam - cursor_trail 3 - ''; - - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/hosts/mac-laptop/home.nix b/hosts/mac-laptop/home.nix index eb60f86..ba921cc 100644 --- a/hosts/mac-laptop/home.nix +++ b/hosts/mac-laptop/home.nix @@ -6,7 +6,7 @@ home.username = "joshuaelm"; home.homeDirectory = "/home/joshuaelm"; - imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ]; + imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ../../modules/rofi ../../modules/kitty ]; home.packages = [ @@ -18,10 +18,8 @@ ]; programs.hyprlock.enable = true; - programs.kitty.enable = true; programs.cava.enable = true; programs.btop.enable = true; - programs.rofi.enable = true; services.hyprpaper.enable = true; wayland.windowManager.hyprland.enable = true; @@ -39,50 +37,6 @@ services.mpd-mpris.enable = true; - programs.rofi.extraConfig = { - show-icons = true; - drun-display-format = "{icon} {name}"; - hide-scrollbar = true; - sidebar-mode = true; - dpi = 110; - font = "FreeSans Regular 12"; - icon-theme = "Gruvbox-Plus-Dark"; - }; - programs.rofi.theme = { - window.height = 600; - window.width = 600; - window.border-radius = 10; - - element = { - padding = 5; - border-radius = 10; - }; - inputbar.padding = 14; - listview = { - padding = 8; - border-radius = "0 0 10 10"; - border = "2 2 2 2"; - dynamic = false; - }; - "element-text element-icon" = { - size = 40; - margin = "0 10 0 0"; - }; - mainbox.children = "inputbar, message, listview"; - mainbox.spacing = 0; - }; - - programs.kitty.extraConfig = '' - font_family Fira Code Nerd Font - bold_font auto - italic_font auto - bold_italic_font auto - confirm_os_window_close 0 - cursor_shape beam - cursor_trail 3 - ''; - - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/modules/kitty/default.nix b/modules/kitty/default.nix new file mode 100644 index 0000000..61d8e95 --- /dev/null +++ b/modules/kitty/default.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +{ + programs.kitty.enable = true; + programs.kitty.extraConfig = '' + font_family Fira Code Nerd Font + bold_font auto + italic_font auto + bold_italic_font auto + confirm_os_window_close 0 + cursor_shape beam + cursor_trail 3 + ''; +} diff --git a/modules/rofi/default.nix b/modules/rofi/default.nix new file mode 100644 index 0000000..985352d --- /dev/null +++ b/modules/rofi/default.nix @@ -0,0 +1,36 @@ +{pkgs, ... }: +{ + programs.rofi.enable = true; + programs.rofi.extraConfig = { + show-icons = true; + drun-display-format = "{icon} {name}"; + hide-scrollbar = true; + sidebar-mode = true; + dpi = 110; + font = "FreeSans Regular 12"; + icon-theme = "Gruvbox-Plus-Dark"; + }; + programs.rofi.theme = { + window.height = 600; + window.width = 600; + window.border-radius = 10; + + element = { + padding = 5; + border-radius = 10; + }; + inputbar.padding = 14; + listview = { + padding = 8; + border-radius = "0 0 10 10"; + border = "2 2 2 2"; + dynamic = false; + }; + "element-text element-icon" = { + size = 40; + margin = "0 10 0 0"; + }; + mainbox.children = "inputbar, message, listview"; + mainbox.spacing = 0; + }; +}