From 56dfc26a9da7e7755df49d172c388a43abf0dfe3 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 22 Nov 2024 09:14:20 +0000
Subject: [PATCH] Remove kdeconnect

Move udiskie and avizo into separate nix files
---
 system/desktop.nix                        |  1 -
 system/home/avizo.nix                     | 14 ++++++++++++++
 system/home/hyprland.nix                  | 23 ++---------------------
 system/home/scripts/shell/clean-config.sh |  2 +-
 system/home/udiskie.nix                   |  9 +++++++++
 5 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 system/home/avizo.nix
 create mode 100644 system/home/udiskie.nix

diff --git a/system/desktop.nix b/system/desktop.nix
index 8ffff70f..93035aad 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -53,7 +53,6 @@
     noisetorch.enable = true;
     seahorse.enable = true;
     file-roller.enable = true;
-    kdeconnect.enable = true;
     hyprland.enable = true;
     xwayland.enable = true;
   };
diff --git a/system/home/avizo.nix b/system/home/avizo.nix
new file mode 100644
index 00000000..dc964f8f
--- /dev/null
+++ b/system/home/avizo.nix
@@ -0,0 +1,14 @@
+{ config, lib, ... }:
+{
+  services.avizo = {
+    enable = true;
+    settings.default = {
+      image-opacity = lib.mkForce "1.0";
+      border-color =
+        let
+          scheme = config.lib.stylix.scheme;
+        in
+        lib.mkForce "rgba(${scheme.base0E-rgb-r}, ${scheme.base0E-rgb-g}, ${scheme.base0E-rgb-b}, 1.0)";
+    };
+  };
+}
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index e0a359d1..6d851890 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -7,9 +7,11 @@
 }:
 {
   imports = [
+    ./udiskie.nix
     ./waybar.nix
     ./fuzzel.nix
     ./mako.nix
+    ./avizo.nix
   ];
   home.packages = [
     (pkgs.writeShellScriptBin "protonmail-setup-bridge" ''
@@ -22,27 +24,6 @@
     hyprpaper.enable = true;
     kanshi.systemdTarget = "hyprland-session.target";
     gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
-    avizo = {
-      enable = true;
-      settings.default = {
-        image-opacity = lib.mkForce "1.0";
-        border-color =
-          let
-            scheme = config.lib.stylix.scheme;
-          in
-          lib.mkForce "rgba(${scheme.base0E-rgb-r}, ${scheme.base0E-rgb-g}, ${scheme.base0E-rgb-b}, 1.0)";
-      };
-    };
-    kdeconnect = {
-      enable = true;
-      indicator = true;
-    };
-    udiskie = {
-      enable = true;
-      notify = true;
-      automount = true;
-      tray = "never";
-    };
     hypridle = {
       enable = true;
       settings =
diff --git a/system/home/scripts/shell/clean-config.sh b/system/home/scripts/shell/clean-config.sh
index d18f6f9d..de1456ff 100644
--- a/system/home/scripts/shell/clean-config.sh
+++ b/system/home/scripts/shell/clean-config.sh
@@ -1,2 +1,2 @@
 shopt -s extglob
-rm -rf ~/.config/!(dconf|kdeconnect|protonmail|Signal|WebCord)
+rm -rf ~/.config/!(dconf|protonmail|Signal)
diff --git a/system/home/udiskie.nix b/system/home/udiskie.nix
new file mode 100644
index 00000000..73c53fb2
--- /dev/null
+++ b/system/home/udiskie.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  services.udiskie = {
+    enable = true;
+    notify = true;
+    automount = true;
+    tray = "never";
+  };
+}