From fb4c57710b37d4c4c7053f209ec2b24090064dc0 Mon Sep 17 00:00:00 2001
From: Frantisek Bohacek <rutherther@proton.me>
Date: Sun, 24 Mar 2024 20:36:44 +0100
Subject: [PATCH] feat: all services that should not start on Gnome do not
 start now

---
 hosts/configuration.nix      |  6 ------
 hosts/home.nix               | 15 ++++++++-------
 hosts/laptop-phobos/home.nix | 16 ++++++++++++++++
 modules/services/dunst.nix   |  1 +
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index bb485cd..52fab3e 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -36,12 +36,6 @@
 
   networking.networkmanager.enable = true;
 
-  programs.nm-applet.enable = true;
-  systemd.user.services.nm-applet = lib.mkIf config.programs.nm-applet.enable {
-    wantedBy = lib.mkForce [ "qtile-services.target" ];
-    partOf = lib.mkForce [ "qtile-services.target" ];
-  };
-
   programs.command-not-found.enable = false;
 
   security.sudo.wheelNeedsPassword = true;
diff --git a/hosts/home.nix b/hosts/home.nix
index c6cabef..5294d52 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -178,19 +178,20 @@
 
   gtk = {                                     # Theming
     enable = true;
-    # theme = {
-    #   name = "Graphite-orange-Dark";
-    #   package = pkgs.graphite-gtk-theme.override {
-    #     themeVariants = ["orange"];
-    #     colorVariants = ["dark"];
-    #   };
-    # };
+    theme = {
+      name = "Graphite-orange-Dark";
+      package = pkgs.graphite-gtk-theme.override {
+        themeVariants = ["orange"];
+        colorVariants = ["dark"];
+      };
+    };
     iconTheme = {
       name = "Tela-circle-dark";
       package = pkgs.tela-circle-icon-theme;
     };
     font = {
       name = "FiraCode Nerd Font Mono Medium";
+      size = 10;
     };                                        # Cursor is declared under home.pointerCursor
   };
 
diff --git a/hosts/laptop-phobos/home.nix b/hosts/laptop-phobos/home.nix
index c6e7011..a00c03b 100644
--- a/hosts/laptop-phobos/home.nix
+++ b/hosts/laptop-phobos/home.nix
@@ -31,6 +31,22 @@
     ];
   };
 
+  systemd.user.services.cbatticon = lib.mkIf config.services.cbatticon.enable {
+    Unit = {
+      After = lib.mkForce [];
+      PartOf = lib.mkForce [ "qtile-services.target" ];
+    };
+    Install.WantedBy = lib.mkForce [ "qtile-services.target" ];
+  };
+
+  systemd.user.services.network-manager-applet = lib.mkIf config.services.network-manager-applet.enable {
+    Unit = {
+      After = lib.mkForce [];
+      PartOf = lib.mkForce [ "qtile-services.target" ];
+    };
+    Install.WantedBy = lib.mkForce [ "qtile-services.target" ];
+  };
+
   services = {                            # Applets
     network-manager-applet.enable = true; # Network
     cbatticon = {
diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index 629ec51..ebf8de9 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -13,6 +13,7 @@ in
   systemd.user.services.dunst = lib.mkIf config.services.dunst.enable {
     Unit = {
       PartOf = lib.mkForce [ "qtile-services.target" ];
+      After = lib.mkForce [];
     };
     Install = {
       WantedBy = lib.mkForce [ "qtile-services.target" ];
-- 
2.48.1