From 9ed91ad8b6314b314295910e72ddd9c27495bc5b Mon Sep 17 00:00:00 2001
From: lucy <lucykaufmann@protonmail.com>
Date: Tue, 1 Sep 2026 19:04:53 +0200
Subject: [PATCH 1/3] split hm config

---
 flake.nix                   |  2 +-
 modules/home/default.nix    |  7 +++++
 modules/home/gtk.nix        | 24 +++++++++++++++
 modules/home/home.nix       | 19 ++++++++++++
 modules/home/services.nix   | 14 +++++++++
 modules/hosts/base/home.nix | 59 -------------------------------------
 modules/programs/.#niri.nix |  1 +
 7 files changed, 66 insertions(+), 60 deletions(-)
 create mode 100644 modules/home/default.nix
 create mode 100644 modules/home/gtk.nix
 create mode 100644 modules/home/home.nix
 create mode 100644 modules/home/services.nix
 delete mode 100644 modules/hosts/base/home.nix
 create mode 120000 modules/programs/.#niri.nix

diff --git a/flake.nix b/flake.nix
index b139ee8..e891b79 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,7 @@
             ./modules/themeing
             ./modules/programs
           ];
-          home-manager.users.lucy = ./modules/hosts/base/home.nix;
+          home-manager.users.lucy = ./modules/home/default.nix;
         }
       ];
     in
diff --git a/modules/home/default.nix b/modules/home/default.nix
new file mode 100644
index 0000000..3a94fca
--- /dev/null
+++ b/modules/home/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./home.nix
+    ./gtk.nix
+    ./services.nix
+  ];
+}
diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix
new file mode 100644
index 0000000..4158304
--- /dev/null
+++ b/modules/home/gtk.nix
@@ -0,0 +1,24 @@
+{ pkgs, config, inputs, ... }: {
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    theme = {
+      name = "adw-gtk3-dark";
+      package = pkgs.adw-gtk3;
+    };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+    font = {
+      name = config.theming.font;
+      package = config.theming.fontPackage;
+      size = 12;
+    };
+    cursorTheme.name = "macOS";
+    cursorTheme.size = 24;
+    gtk3.extraCss = builtins.readFile (config.scheme inputs.tt-gtk);
+    gtk4.extraCss = builtins.readFile (config.scheme inputs.tt-gtk);
+
+  };
+}
diff --git a/modules/home/home.nix b/modules/home/home.nix
new file mode 100644
index 0000000..463f64c
--- /dev/null
+++ b/modules/home/home.nix
@@ -0,0 +1,19 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = with pkgs; [
+    nixd
+    nixfmt
+    clang
+    kdePackages.qtdeclarative
+  ];
+  home.stateVersion = "26.05";
+  home.pointerCursor = {
+    enable = true;
+    name = "macOS";
+    package = pkgs.apple-cursor;
+    size = 24;
+  };
+}
diff --git a/modules/home/services.nix b/modules/home/services.nix
new file mode 100644
index 0000000..843453a
--- /dev/null
+++ b/modules/home/services.nix
@@ -0,0 +1,14 @@
+{ pkgs, config, ... }: {
+  services.syncthing = {
+    enable = true;
+    settings = {
+      devices = {
+        cyberia = {
+          id = "OOJBAJU-AAIKLHO-BKMMHBU-2NXE75Z-HE64A6V-LET4ZXB-Q2FT2Y4-GZON3AD";
+        };
+      };
+    };
+  };
+  services.polkit-gnome.enable = true; 
+  dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
+}
diff --git a/modules/hosts/base/home.nix b/modules/hosts/base/home.nix
deleted file mode 100644
index dcf777e..0000000
--- a/modules/hosts/base/home.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  inputs,
-  pkgs,
-  config,
-  ...
-}:
-let
-  c = config.scheme.withHashtag;
-in
-{
-  home.packages = with pkgs; [
-    nixd
-    nixfmt
-    clang
-    kdePackages.qtdeclarative
-  ];
-
-  home.stateVersion = "26.05";
-  home.pointerCursor = {
-    enable = true;
-    name = "macOS";
-    package = pkgs.apple-cursor;
-    size = 24;
-  };
-  services.syncthing = {
-    enable = true;
-    settings = {
-      devices = {
-        cyberia = {
-          id = "OOJBAJU-AAIKLHO-BKMMHBU-2NXE75Z-HE64A6V-LET4ZXB-Q2FT2Y4-GZON3AD";
-        };
-      };
-    };
-  };
-  gtk = {
-    enable = true;
-    colorScheme = "dark";
-    theme = {
-      name = "adw-gtk3-dark";
-      package = pkgs.adw-gtk3;
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    font = {
-      name = config.theming.font;
-      package = config.theming.fontPackage;
-      size = 12;
-    };
-    cursorTheme.name = "macOS";
-    cursorTheme.size = 24;
-    gtk3.extraCss = builtins.readFile (config.scheme inputs.tt-gtk);
-    gtk4.extraCss = builtins.readFile (config.scheme inputs.tt-gtk);
-
-  };
-  services.polkit-gnome.enable = true; # polkit
-  dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
-}
diff --git a/modules/programs/.#niri.nix b/modules/programs/.#niri.nix
new file mode 120000
index 0000000..5689a4e
--- /dev/null
+++ b/modules/programs/.#niri.nix
@@ -0,0 +1 @@
+lucy@nerv.4230:1788254438
\ No newline at end of file

From 10552e1d8e609dce9419a5af4b806f85bb2cd642 Mon Sep 17 00:00:00 2001
From: lucy <lucykaufmann@protonmail.com>
Date: Tue, 1 Sep 2026 19:09:34 +0200
Subject: [PATCH 2/3] correct theming name

---
 modules/{themeing => theming}/default.nix | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename modules/{themeing => theming}/default.nix (100%)

diff --git a/modules/themeing/default.nix b/modules/theming/default.nix
similarity index 100%
rename from modules/themeing/default.nix
rename to modules/theming/default.nix

From 527a29600bd3a551d1f1a6c69eed512a1a39685d Mon Sep 17 00:00:00 2001
From: lucy <lucykaufmann@protonmail.com>
Date: Tue, 1 Sep 2026 19:15:18 +0200
Subject: [PATCH 3/3] remove unneded input and disable warning

---
 modules/programs/nixcord.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix
index fc1ff36..8b163c0 100644
--- a/modules/programs/nixcord.nix
+++ b/modules/programs/nixcord.nix
@@ -7,6 +7,7 @@
 {
   imports = [ inputs.nixcord.homeModules.nixcord ];
   programs.nixcord = {
+    discord.silenceNoModClientWarning = true;
     enable = true;
     vesktop.enable = true;
     quickCss = builtins.readFile (config.scheme inputs.tt-discord);