From 97e8a62ecefd72846a70149bc2e9fae3786726fb Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 11 Apr 2024 22:47:28 +0100
Subject: [PATCH] home-manager: move anything not hyprland-specific into
 desktop.nix

---
 home/desktop.nix          | 63 ++++++++++++++++++++++++++++++++++++++
 home/hyprland/default.nix | 64 +--------------------------------------
 home/rofi/default.nix     |  2 ++
 3 files changed, 66 insertions(+), 63 deletions(-)
 create mode 100644 home/desktop.nix

diff --git a/home/desktop.nix b/home/desktop.nix
new file mode 100644
index 00000000..9ed056bb
--- /dev/null
+++ b/home/desktop.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  config,
+  pkgs,
+  catppuccinVariant ? "Mocha",
+  ...
+}: {
+  imports = [
+    ./default.nix
+    ./email/default.nix
+    ./password-store/default.nix
+    ./waybar/default.nix
+    ./rofi/default.nix
+    ./swaylock/default.nix
+    ./swaync/default.nix
+    ./avizo/default.nix
+    ./alacritty/default.nix
+    ./emacs/default.nix
+    ./obs/default.nix
+    ./cava/default.nix
+  ];
+  programs.rofi.terminal = "${config.programs.alacritty.package}/bin/alacritty";
+  services = {
+    gpg-agent.pinentryFlavor = "gtk2";
+    avizo.enable = true;
+    syncthing.enable = true;
+    udiskie = {
+      enable = true;
+      notify = true;
+      automount = true;
+      tray = "never";
+    };
+  };
+  gtk = with lib.strings; let
+    accent = "Lavender";
+    size = "Standard";
+  in {
+    enable = true;
+    iconTheme = {
+      package = pkgs.catppuccin-papirus-folders.override {
+        accent = toLower accent;
+        flavor = toLower catppuccinVariant;
+      };
+      name = "Papirus-Dark";
+    };
+    cursorTheme = let
+      variant = "${lib.strings.toLower catppuccinVariant}Dark";
+    in {
+      package = pkgs.catppuccin-cursors.${variant};
+      name = "Catppuccin-${catppuccinVariant}-Dark-Cursors";
+      size = 32;
+    };
+    theme = {
+      package = with lib.strings;
+        pkgs.catppuccin-gtk.override {
+          accents = [(toLower accent)];
+          size = toLower size;
+          variant = toLower catppuccinVariant;
+        };
+      name = "Catppuccin-${catppuccinVariant}-${size}-${accent}-Dark";
+    };
+  };
+}
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index b92223af..9ce2c356 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -5,23 +5,9 @@
   fonts,
   scheme,
   accentColour ? "base07",
-  catppuccinVariant ? "Mocha",
   ...
 }: {
-  imports = [
-    ../default.nix
-    ../email/default.nix
-    ../password-store/default.nix
-    ../waybar/default.nix
-    ../rofi/default.nix
-    ../swaylock/default.nix
-    ../swaync/default.nix
-    ../avizo/default.nix
-    ../alacritty/default.nix
-    ../emacs/default.nix
-    ../obs/default.nix
-    ../cava/default.nix
-  ];
+  imports = [../desktop.nix];
   home.packages = with pkgs; [
     (writeShellScriptBin "protonmail-setup-bridge" ''
       pkill -9 -f protonmail-bridge
@@ -29,54 +15,6 @@
       ${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl dispatch exec "${protonmail-bridge}/bin/protonmail-bridge -n"
     '')
   ];
-  programs = {
-    rofi = with pkgs; {
-      package = rofi-wayland;
-      terminal = "${config.programs.alacritty.package}/bin/alacritty";
-      pass.package = rofi-pass-wayland;
-    };
-    zellij.settings.copy_command = "wl-copy";
-  };
-  services = {
-    gpg-agent.pinentryFlavor = "gtk2";
-    avizo.enable = true;
-    syncthing.enable = true;
-    udiskie = {
-      enable = true;
-      notify = true;
-      automount = true;
-      tray = "never";
-    };
-  };
-  gtk = with lib.strings; let
-    accent = "Lavender";
-    size = "Standard";
-  in {
-    enable = true;
-    iconTheme = {
-      package = pkgs.catppuccin-papirus-folders.override {
-        accent = toLower accent;
-        flavor = toLower catppuccinVariant;
-      };
-      name = "Papirus-Dark";
-    };
-    cursorTheme = let
-      variant = "${lib.strings.toLower catppuccinVariant}Dark";
-    in {
-      package = pkgs.catppuccin-cursors.${variant};
-      name = "Catppuccin-${catppuccinVariant}-Dark-Cursors";
-      size = 32;
-    };
-    theme = {
-      package = with lib.strings;
-        pkgs.catppuccin-gtk.override {
-          accents = [(toLower accent)];
-          size = toLower size;
-          variant = toLower catppuccinVariant;
-        };
-      name = "Catppuccin-${catppuccinVariant}-${size}-${accent}-Dark";
-    };
-  };
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index 5c63074a..eb1b73f3 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -8,11 +8,13 @@
 }: {
   programs.rofi = {
     enable = true;
+    package = pkgs.rofi-wayland;
     font = fonts.monospace.name;
     location = "center";
     plugins = with pkgs; [rofi-emoji];
     pass = {
       enable = true;
+      package = pkgs.rofi-wayland;
       extraConfig = ''
         USERNAME_field='login'
       '';