Add packages from 'dots/.bin/setup'

flake.nix

@@ -26,13 +26,8 @@
           system = "x86_64-linux";
           modules = [
             disko.nixosModules.disko
-            ./hosts/vm/configuration.nix
             home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.h = ./hosts/vm/home.nix;
-            }
+            ./hosts/vm/configuration.nix
           ];
         };
       };

hosts/vm/configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   system.stateVersion = "25.05";
@@ -20,18 +20,17 @@
     "flakes"
   ];
 
-
-  disko.devices.disk.main.device = "/dev/vda";
-
-  programs.git.enable = true;
-  programs.firefox.enable = true;
+  disko = {
+    devices.disk.main.device = "/dev/vda";
+  };
 
   nixpkgs.config.allowUnfree = true;
 
-  environment.systemPackages = with pkgs; [
-    neovim
-    kitty
-  ];
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.h = ./home.nix;
+  };
 
   services.spice-vdagentd.enable = true;
   services.openssh = {

hosts/vm/disk.nix

@@ -1,9 +1,3 @@
-# USAGE in your configuration.nix.
-# Update devices to match your hardware.
-# {
-#  imports = [ ./disko-config.nix ];
-#  disko.devices.disk.main.device = "/dev/sda";
-# }
 {
   disko.devices = {
     disk = {

hosts/vm/home.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   home.stateVersion = "25.05";
@@ -6,7 +6,66 @@
   home.username = "h";
   home.homeDirectory = "/home/h";
 
-  home.file.".inputrc".source = ../../dots/.inputrc;
+  programs = {
+    bash = {
+      enable = true;
+      # TODO
+    };
+    firefox.enable = true;
+    git.enable = true;
+    home-manager.enable = true;
+  };
 
-  programs.home-manager.enable = true;
+  home.packages = with pkgs; [
+    bash-completion
+    bash-language-server
+    brightnessctl
+    entr
+    eslint_d
+    feh
+    firefox-devedition
+    fzf
+    git
+    haskell-language-server
+    haskellPackages.pandoc-crossref
+    haskellPackages.hadolint
+    htop
+    iosevka
+    jq
+    keepassxc
+    kitty
+    lua-language-server
+    neovim
+    nmap
+    nodejs_24
+    nodePackages.ts-node
+    nvimpager
+    ormolu
+    pandoc
+    parallel
+    pass
+    pnpm
+    ripgrep
+    sshfs
+    stylelint
+    svelte-language-server
+    tailwindcss-language-server
+    taskwarrior3
+    tldr
+    tmux
+    tmuxp
+    tree
+    tree-sitter
+    typescript-language-server
+    unzip
+    vim-language-server
+    vimPlugins.vim-plug
+    vtsls
+    wget
+    xbanish
+    xclip
+    yaml-language-server
+  ];
+
+  home.file.".inputrc".source = ../../dots/.inputrc;
 }