add restruct

hosts/cnix/default.nix

@@ -30,7 +30,6 @@ in
 
   imports = [
     inputs.home-manager.nixosModules.home-manager
-    ../pkgs/fonts.nix
     ../common
     ../extra/steam
     ../extra/nix-ld

hosts/common/cnix-pkgs.nix

@@ -3,7 +3,6 @@
   environment = {
     systemPackages = [
       # Dev
-      pkgs.git
       pkgs.pyright
       pkgs.python3
       pkgs.gcc
@@ -26,26 +25,12 @@
       pkgs.clang
       pkgs.clang-tools
       pkgs.alejandra
+      pkgs.nixpkgs-fmt
 
       # Util
-      pkgs.stow
-      pkgs.gnumake
-      pkgs.wget
-      pkgs.curl
-      pkgs.ripgrep
-      pkgs.python312Packages.oauth2
-      pkgs.python312Packages.httplib2
       pkgs.python312Packages.pip
-      pkgs.killall
-      pkgs.tree-sitter
-      pkgs.lazygit
       pkgs.tmux
       pkgs.tmuxifier
-      pkgs.unzip
-      pkgs.p7zip
-      pkgs.unrar
-      pkgs.xdg-utils
-      pkgs.xdg-user-dirs
     ];
   };
 }

hosts/common/default.nix

@@ -11,6 +11,8 @@
     ./adb.nix
     ./neovim.nix
     ./zsh.nix
+    ./cnix-pkgs.nix
+    ./fonts.nix
   ];
   home-manager = {
     # useGlobalPkgs = true;
@@ -34,39 +36,14 @@
     systemPackages = [
       # Dev
       pkgs.git
-      pkgs.pyright
-      pkgs.python3
-      pkgs.gcc
-      pkgs.go
-      pkgs.nodePackages_latest.npm
-      pkgs.nodePackages_latest.nodejs
-      pkgs.nodePackages.prettier
-      pkgs.nodePackages.prettier-plugin-toml
-      pkgs.lua-language-server
-      pkgs.stylua
-      pkgs.prettierd
-      pkgs.cargo
-      pkgs.hyprlang
-      pkgs.nixd
-      pkgs.nil
-      pkgs.black
-      pkgs.python312Packages.jedi-language-server
-      pkgs.isort
-      pkgs.bacon
-      pkgs.clang
-      pkgs.clang-tools
-      pkgs.alejandra
 
       # Util
       pkgs.stow
-      pkgs.gnumake
       pkgs.wget
       pkgs.curl
       pkgs.ripgrep
       pkgs.python312Packages.oauth2
       pkgs.python312Packages.httplib2
-      pkgs.python312Packages.pip
-      pkgs.python312Packages.dbus-python
       pkgs.killall
       pkgs.tree-sitter
       pkgs.lazygit
@@ -77,6 +54,7 @@
       pkgs.unrar
       pkgs.xdg-utils
       pkgs.xdg-user-dirs
+      pkgs.udiskie
     ];
   };
 }

hosts/services/cnix.nix

@@ -1,6 +1,10 @@
 { pkgs, ... }:
 {
   services = {
+    dbus.packages = with pkgs; [
+      gcr
+      gnome.gnome-settings-daemon
+    ];
     udisks2.enable = true;
     gvfs.enable = true;
     blueman.enable = true;