add restruct

hosts/common/cnix-pkgs.nix

@@ -0,0 +1,36 @@
+{ pkgs, ... }:
+{
+  environment = {
+    systemPackages = [
+      # Dev
+      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
+      pkgs.nixpkgs-fmt
+
+      # Util
+      pkgs.python312Packages.pip
+      pkgs.tmux
+      pkgs.tmuxifier
+    ];
+  };
+}

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/common/fonts.nix

@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+{
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    liberation_ttf
+    fira-code-symbols
+    font-awesome
+    jetbrains-mono
+    (nerdfonts.override {
+      fonts = [
+        "JetBrainsMono"
+        "FiraCode"
+        "Iosevka"
+        "3270"
+        "DroidSansMono"
+      ];
+    })
+  ];
+}