From 996ed9e0268af5cfd641ee08f3d53be530079542 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sun, 24 Sep 2023 15:27:13 +0200
Subject: [PATCH] fixup kdeconnect, enable some more settings globally

---
 modules/desktop/default.nix |  2 +-
 modules/desktop/gnome.nix   | 37 +++++++++++++++++--------------------
 modules/desktop/kde.nix     |  1 +
 modules/globalinstalls.nix  |  7 ++++++-
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 66ede1e..7e5f08a 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -41,7 +41,7 @@ in {
     };
 
     programs = {
-      git.package = pkgs.gitFull;
+      kdeconnect.enable = true;
     };
 
     # unblock kde connect / gsconnect
diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix
index 6fef40d..d48c9ba 100644
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -24,26 +24,23 @@ in {
       };
     };
 
-    programs.gpaste.enable = true;
-
-    environment = {
-      systemPackages = with pkgs; [
-        gnomeExtensions.gsconnect
-      ];
-
-      # remove some gnome default apps
-      gnome.excludePackages = with pkgs.gnome; [
-        cheese # photo booth
-        epiphany # web browser
-        evince # document viewer
-        geary # email client
-        seahorse # password manager
-        gnome-clocks
-        gnome-maps
-        gnome-weather
-        gnome-music
-        pkgs.gnome-connections
-      ];
+    programs = {
+      gpaste.enable = true;
+      kdeconnect.package = pkgs.gnomeExtensions.gsconnect;
     };
+
+    # remove some gnome default apps
+    environment.gnome.excludePackages = with pkgs.gnome; [
+      cheese # photo booth
+      epiphany # web browser
+      evince # document viewer
+      geary # email client
+      seahorse # password manager
+      gnome-clocks
+      gnome-maps
+      gnome-weather
+      gnome-music
+      pkgs.gnome-connections
+    ];
   };
 }
diff --git a/modules/desktop/kde.nix b/modules/desktop/kde.nix
index 45c31ee..0c5a713 100644
--- a/modules/desktop/kde.nix
+++ b/modules/desktop/kde.nix
@@ -43,6 +43,7 @@ in {
     programs = {
       dconf.enable = true;
       partition-manager.enable = true;
+      kdeconnect.enable = true;
     };
   };
 }
diff --git a/modules/globalinstalls.nix b/modules/globalinstalls.nix
index 412a50a..aa7681e 100644
--- a/modules/globalinstalls.nix
+++ b/modules/globalinstalls.nix
@@ -10,9 +10,14 @@
     };
 
     programs = {
-      git.enable = true;
       zsh.enable = true;
       htop.enable = true;
+      iotop.enable = true;
+      nano.syntaxHighlight = true;
+      git = {
+        enable = true;
+        package = pkgs.gitFull;
+      };
     };
   };
 }