modularlized rofi and kitty

hosts/desktop/configuration.nix

@@ -332,6 +332,7 @@ hardware.pulseaudio.extraConfig = ''
     gomatrix
     python3
     pavucontrol
+    bluebubbles
     gnomeExtensions.tray-icons-reloaded
     cider
     xfce.thunar

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

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

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
+  '';
+}

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;
+  };
+}