restructuring5

hosts/cnix/default.nix

@@ -30,31 +30,16 @@ in
 
   imports = [
     inputs.home-manager.nixosModules.home-manager
-    ../pkgs/cnix.nix
     ../pkgs/fonts.nix
-    ../programs
+    ../common
+    ../extra
     ../services/cnix.nix
     ../hardware/cnix.nix
-    ../generic/cnix.nix
+    ../locale/cnix.nix
     ./hardware-configuration.nix
   ];
 
-  home-manager = {
-    useGlobalPkgs = true;
-    extraSpecialArgs = {
-      inherit inputs outputs;
-    };
-    users = {
-      cnst = import ../../home/cnst/home.nix;
-    };
-  };
-
-  nixpkgs = {
-    overlays = [ ];
-    config = {
-      allowUnfree = true;
-    };
-  };
+  home-manager.users.cnst = import ../../home/cnst/home.nix;
 
   nix =
     let
@@ -82,9 +67,6 @@ in
       nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
     };
 
-  # Add .local/bin to $PATH
-  environment.localBinInPath = true;
-
   # Bootloader
   boot.loader = {
     systemd-boot.enable = true;
@@ -106,10 +88,6 @@ in
     };
   };
 
-  # TODO: Configure your system-wide user settings (groups, etc), add more users as needed.
-  console.useXkbConfig = true;
-  # services
-
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "24.05";
 }

hosts/common/default.nix

@@ -0,0 +1,76 @@
+# This file (and the global directory) holds config that i use on all hosts
+{
+  inputs,
+  outputs,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    ./adb.nix
+    ./hyprland.nix
+    ./neovim.nix
+    ./zsh.nix
+  ];
+  home-manager = {
+    useGlobalPkgs = true;
+    extraSpecialArgs = {
+      inherit inputs outputs;
+    };
+  };
+  nixpkgs = {
+    overlays = [ ];
+    config = {
+      allowUnfree = true;
+    };
+  };
+  environment = {
+    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.killall
+      pkgs.tree-sitter
+      pkgs.lazygit
+      pkgs.tmux
+      pkgs.tmuxifier
+      pkgs.unzip
+      pkgs.p7zip
+      pkgs.unrar
+      pkgs.xdg-utils
+      pkgs.xdg-user-dirs
+    ];
+  };
+}

hosts/locale/cnix.nix

@@ -1,17 +1,4 @@
 {
-  environment = {
-    etc."xdg/user-dirs.defaults".text = ''
-      DESKTOP=desktop
-      DOWNLOAD=documents/downloads
-      TEMPLATES=documents/templates
-      PUBLICSHARE=documents/share
-      DOCUMENTS=documents
-      MUSIC=media/music
-      PICTURES=media/photos
-      VIDEOS=media/video
-    '';
-  };
-
   time.timeZone = "Europe/Stockholm";
 
   i18n = {