From b51a77befa3bd9e232b929b11748929faedff5ef Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Sun, 31 Mar 2024 09:27:11 -0400
Subject: [PATCH] Udiskie, KDE Connect, and Config Cleanup

- Move shell and font configs out of configuration.nix
  and into separate files
- Add udiskie to dwm
- Add kdeconnect for phone connection
---
 profiles/personal/configuration.nix |  9 ---------
 system/gui/dwm.nix                  |  3 +++
 system/gui/fonts.nix                |  2 ++
 system/utilities/default.nix        |  1 +
 system/utilities/user-shell.nix     |  7 +++++++
 user/utilities/default.nix          |  1 +
 user/utilities/phone.nix            | 10 ++++++++++
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 system/utilities/user-shell.nix
 create mode 100644 user/utilities/phone.nix

diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix
index c3b4dd6..5df44b3 100644
--- a/profiles/personal/configuration.nix
+++ b/profiles/personal/configuration.nix
@@ -64,15 +64,6 @@
     uid = 1000;
   };
 
-  # environment.systemPackages = with pkgs; [
-  # ];
-
-  environment.shells = with pkgs; [ zsh ];
-  users.defaultUserShell = pkgs.zsh;
-  programs.zsh.enable = true;
-
-  fonts.fontDir.enable = true;
-
   # xdg.portal = {
   #   enable = true;
   #   extraPortals = [
diff --git a/system/gui/dwm.nix b/system/gui/dwm.nix
index 0e97e13..4187d44 100644
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -66,6 +66,9 @@
     # Notification Daemon
     deadd-notification-center
 
+    # Automounter
+    udiskie
+
     # Polybar with DWM Module
     (polybar.overrideAttrs (finalAttrs: previousAttrs: {
       pname = previousAttrs.pname + "-dwm-module";
diff --git a/system/gui/fonts.nix b/system/gui/fonts.nix
index 8e70c42..39c2014 100644
--- a/system/gui/fonts.nix
+++ b/system/gui/fonts.nix
@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
+  fonts.fontDir.enable = true;
+
   fonts.packages = with pkgs; [
     corefonts
     ubuntu_font_family
diff --git a/system/utilities/default.nix b/system/utilities/default.nix
index 287b849..6824588 100644
--- a/system/utilities/default.nix
+++ b/system/utilities/default.nix
@@ -7,5 +7,6 @@
     ./miscellaneous.nix
     ./gaming.nix
     ./backups.nix
+    ./user-shell.nix
   ];
 }
diff --git a/system/utilities/user-shell.nix b/system/utilities/user-shell.nix
new file mode 100644
index 0000000..d4fc79f
--- /dev/null
+++ b/system/utilities/user-shell.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.shells = with pkgs; [ zsh ];
+  users.defaultUserShell = pkgs.zsh;
+  programs.zsh.enable = true;
+}
diff --git a/user/utilities/default.nix b/user/utilities/default.nix
index 8cfac5a..961b3b8 100644
--- a/user/utilities/default.nix
+++ b/user/utilities/default.nix
@@ -9,5 +9,6 @@
     ./passwords.nix
     ./xdg.nix
     ./screenshot.nix
+    ./phone.nix
   ];
 }
diff --git a/user/utilities/phone.nix b/user/utilities/phone.nix
new file mode 100644
index 0000000..b0108f2
--- /dev/null
+++ b/user/utilities/phone.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, systemSettings, ... }:
+
+{
+  programs.kdeconnect = {
+    enable = true;
+    package = (if systemSettings.desktop == "gnome"
+               then pkgs.gnomeExtensions.gsconnect
+               else pkgs.libsForQt5.kdeconnect-kde);
+  };
+}