refactor: modules

remove bloat

home/modules/dev/default.nix

@@ -1,46 +1,8 @@
 {
-  lib,
-  pkgs,
-  ...
-}: {
   imports = [
     ./devops.nix
     ./go.nix
+    ./packages.nix
     ./python.nix
   ];
-
-  home = {
-    packages = lib.attrValues {
-      # Dev Tools
-      inherit
-        (pkgs)
-        bun
-        ccls
-        clang
-        clang-tools
-        cmake
-        grex
-        java-language-server
-        just
-        lldb
-        nodejs
-        shellcheck
-        shfmt
-        typescript
-        uncrustify
-        ;
-
-      inherit
-        (pkgs.nodePackages)
-        jsonlint
-        pnpm
-        prettier
-        typescript-language-server
-        vls
-        vscode-langservers-extracted
-        yaml-language-server
-        yarn
-        ;
-    };
-  };
 }

home/modules/dev/packages.nix

@@ -0,0 +1,38 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  home.packages = lib.attrValues {
+    # Dev Tools
+    inherit
+      (pkgs)
+      bun
+      ccls
+      clang
+      clang-tools
+      cmake
+      grex
+      java-language-server
+      just
+      lldb
+      nodejs
+      shellcheck
+      shfmt
+      typescript
+      uncrustify
+      ;
+
+    inherit
+      (pkgs.nodePackages)
+      jsonlint
+      pnpm
+      prettier
+      typescript-language-server
+      vls
+      vscode-langservers-extracted
+      yaml-language-server
+      yarn
+      ;
+  };
+}

hosts/yuki/configuration.nix

@@ -71,12 +71,6 @@
       lidSwitchExternalPower = "lock";
     };
 
-    psd = {
-      enable = true;
-      resyncTimer = "10m";
-    };
-
-    power-profiles-daemon.enable = true;
     thermald.enable = true;
 
     upower = {

modules/programs/dconf.nix

@@ -0,0 +1,5 @@
+{
+  programs.dconf = {
+    enable = true;
+  };
+}

modules/programs/default.nix

@@ -1,16 +1,11 @@
 {
   imports = [
     ./bash.nix
+    ./dconf.nix
     ./home-manager.nix
     ./npm.nix
     ./thunar.nix
     ./java.nix
     ./zsh.nix
   ];
-
-  programs = {
-    dconf.enable = true;
-    kdeconnect.enable = true;
-    xfconf.enable = true;
-  };
 }

modules/services/dbus.nix

@@ -0,0 +1,22 @@
+{pkgs, ...}: {
+  services = {
+    dbus = {
+      enable = true;
+      implementation = "broker";
+
+      packages = with pkgs; [
+        gcr
+        gnome.gnome-settings-daemon
+      ];
+    };
+
+    gvfs.enable = true;
+
+    psd = {
+      enable = true;
+      resyncTimer = "10m";
+    };
+
+    power-profiles-daemon.enable = true;
+  };
+}

modules/services/default.nix

@@ -1,26 +1,11 @@
-{pkgs, ...}: {
+{
   imports = [
+    ./dbus.nix
     ./gnome-keyring.nix
     ./location.nix
     ./networking.nix
     ./openssh.nix
     ./pipewire.nix
     ./postgresql.nix
   ];
-
-  services = {
-    accounts-daemon.enable = true;
-    devmon.enable = true;
-    gvfs.enable = true;
-    udisks2.enable = true;
-    tumbler.enable = true;
-
-    dbus = {
-      enable = true;
-      implementation = "broker";
-      packages = with pkgs; [dconf gcr udisks2];
-    };
-
-    udev.packages = with pkgs; [gnome-settings-daemon android-udev-rules];
-  };
 }