Fix stale documentation in CLAUDE.md

- Remove deleted fonts.nix from directory layout
- Update 'Adding a New Program' section to reflect ponytail cleanup: simple packages go in common.nix, per-file only for programs needing real configuration
- Update Rules section to document common.nix and per-file program patterns

CLAUDE.md

@@ -9,8 +9,7 @@ hosts/
   nikita-nixos/                  # nikita's machine
 home/
   packages-base.nix              # universal packages every host gets (neovim, ripgrep, etc.)
-  programs/                      # one file per installable program
+  programs/                      # installable programs (common.nix for simple packages, per-file for configured programs)
-  fonts.nix                      # font config
   rofi.nix                       # rofi config + packages
   symlinks.nix                   # home-manager symlinks
   tmux.nix                       # tmux config
@@ -21,26 +20,29 @@ system/                          # NixOS system-level modules
 
 ## Adding a New Program
 
-1. Create `home/programs/<name>.nix`:
+**For simple packages (no config):** Add the package to `home/programs/common.nix`'s `home.packages` list.
+
+**For programs that need configuration** (session variables, extra options, dependencies): Create `home/programs/<name>.nix`:
 
 ```nix
 { pkgs, ... }:
 {
-  home.packages = [ pkgs.<package-name> ];
+  # configuration + packages
 }
 ```
 
-The filename is the program name; the package attribute can differ (e.g. `godot.nix` uses `pkgs.godot_4`).
+Then add the import to `hosts/<host>/home.nix`:
-
-2. Add the import to whichever hosts should have it in `hosts/<host>/home.nix`:
 
 ```nix
 ../../home/programs/<name>.nix
 ```
 
+Example: `rustup.nix` needs config (session variables) so it gets its own file. Simple packages like `lazygit` go in `common.nix`.
+
 ## Rules
 
 - `home/packages-base.nix` — shared baseline, imported by every host. Only add truly universal tools here (shell utilities, editors).
-- `home/programs/` — one file per program. Hosts opt in by importing.
+- `home/programs/common.nix` — simple packages that just need to be installed (no extra config).
+- `home/programs/<name>.nix` — programs that need real configuration beyond just `home.packages`. Hosts opt in by importing.
 - `home/<tool>.nix` (tmux, zsh, rofi, etc.) — for programs that need configuration beyond just installing a package. Same opt-in pattern via host imports.
 - `system/` modules are NixOS system-level config (not home-manager). Add them to `hosts/<host>/default.nix`.

config/nvim/lua/config/autocmds.lua

@@ -1,2 +0,0 @@
--- Autocmds are automatically loaded on the VeryLazy event
--- Default autocmds: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua

config/nvim/lua/config/options.lua

@@ -1,2 +0,0 @@
--- Options are automatically loaded before lazy.nvim startup
--- Default options: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua

config/nvim/lua/plugins/tmux-navigator.lua

@@ -2,12 +2,5 @@ return {
   {
     "christoomey/vim-tmux-navigator",
     lazy = false,
-    cmd = {
-      "TmuxNavigateLeft",
-      "TmuxNavigateDown",
-      "TmuxNavigateUp",
-      "TmuxNavigateRight",
-      "TmuxNavigatePrevious",
-    },
   },
 }

config/qtile/config.py

@@ -1,15 +1,12 @@
-from libqtile import bar, extension, hook, layout, qtile, widget
+from libqtile import bar, hook, layout, qtile, widget
-from libqtile.config import Click, Drag, Group, Key, KeyChord, Match, Screen
+from libqtile.config import Click, Drag, Group, Key, Match, Screen
 from libqtile.lazy import lazy
-from libqtile.utils import guess_terminal
 import os
 import subprocess
 
 
 mod = "mod4"
-terminal = guess_terminal()
+terminal = "alacritty" 
-
-myTerm = "alacritty" 
 
 keys = [
     Key([mod], "h", lazy.layout.left(), desc="Move focus to left"),
@@ -221,14 +218,14 @@ def make_top_bar(primary=False):
         widget.CPU(
             foreground = colors[4],
             padding = 8,
-            mouse_callbacks = {'Button1': lambda: qtile.cmd_spawn(myTerm + ' -e btop')},
+            mouse_callbacks = {'Button1': lambda: qtile.cmd_spawn(terminal + ' -e btop')},
             format="CPU: {load_percent}%",
         ),
         make_sep(),
         widget.Memory(
             foreground = colors[8],
             padding = 8,
-            mouse_callbacks = {'Button1': lambda: qtile.cmd_spawn(myTerm + ' -e btop')},
+            mouse_callbacks = {'Button1': lambda: qtile.cmd_spawn(terminal + ' -e btop')},
             format = 'Mem: {MemUsed:.0f}{mm}',
         ),
         make_sep(),

home/fonts.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  fonts.fontconfig.enable = true;
-}

home/programs/alacritty.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.alacritty ];
-}

home/programs/audacity.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.audacity ];
-}

home/programs/blender.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.blender ];
-}

home/programs/blockbench.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.blockbench ];
-}

home/programs/claude-code.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.claude-code ];
-}

home/programs/common.nix

@@ -0,0 +1,31 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    alacritty
+    audacity
+    blender
+    blockbench
+    claude-code
+    fd
+    filezilla
+    fzf
+    gcc
+    godot_4
+    imv
+    jdk21
+    jetbrains-toolbox
+    lazygit
+    lua-language-server
+    mpv
+    nil
+    nixpkgs-fmt
+    nodejs
+    obsidian
+    pkg-config
+    prismlauncher
+    vesktop
+    xclip
+    xwallpaper
+    yt-dlp
+  ];
+}

home/programs/fd.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.fd ];
-}

home/programs/filezilla.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.filezilla ];
-}

home/programs/fzf.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.fzf ];
-}

home/programs/gcc.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.gcc ];
-}

home/programs/godot.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.godot_4 ];
-}

home/programs/imv.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.imv ];
-}

home/programs/jdk.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.jdk21 ];
-}

home/programs/jetbrains-toolbox.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.jetbrains-toolbox ];
-}

home/programs/lazygit.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.lazygit ];
-}

home/programs/lua-language-server.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.lua-language-server ];
-}

home/programs/mpv.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.mpv ];
-}

home/programs/nil.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.nil ];
-}

home/programs/nixpkgs-fmt.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.nixpkgs-fmt ];
-}

home/programs/nodejs.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.nodejs ];
-}

home/programs/obsidian.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.obsidian ];
-}

home/programs/pkg-config.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.pkg-config ];
-}

home/programs/prismlauncher.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.prismlauncher ];
-}

home/programs/vesktop.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.vesktop ];
-}

home/programs/xclip.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.xclip ];
-}

home/programs/xwallpaper.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.xwallpaper ];
-}

home/programs/yt-dlp.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.yt-dlp ];
-}

home/rofi.nix

@@ -10,7 +10,6 @@
       "drun"
       "run"
       "window"
-      "ssh"
     ];
     extraConfig = {
       show-icons = true;

hosts/hivebrain/default.nix

@@ -10,10 +10,8 @@
     ../../system/locale.nix
     ../../system/fonts.nix
     ../../system/nix.nix
-    ../../system/ssh.nix
     ../../system/programs.nix
     ../../system/packages.nix
-    ../../system/docker.nix
 
     # marvin-only
     ../../system/xserver.nix
@@ -26,5 +24,8 @@
   networking.hostName = "hivebrain";
   system.stateVersion = "26.05";
 
+  services.openssh.enable = true;
+  virtualisation.docker.enable = true;
+
   programs.steam.enable = true;
 }

hosts/hivebrain/home.nix

@@ -3,39 +3,13 @@
 {
   imports = [
     ../../home/zsh.nix
-    ../../home/fonts.nix
     ../../home/rofi.nix
     ../../home/yazi.nix
     ../../home/symlinks.nix
     ../../home/tmux.nix
     ../../home/packages-base.nix
-    ../../home/programs/alacritty.nix
+    ../../home/programs/common.nix
-    ../../home/programs/audacity.nix
-    ../../home/programs/blender.nix
-    ../../home/programs/blockbench.nix
-    ../../home/programs/claude-code.nix
-    ../../home/programs/fd.nix
-    ../../home/programs/filezilla.nix
-    ../../home/programs/fzf.nix
-    ../../home/programs/gcc.nix
-    ../../home/programs/godot.nix
-    ../../home/programs/imv.nix
-    ../../home/programs/jetbrains-toolbox.nix
-    ../../home/programs/jdk.nix
-    ../../home/programs/lazygit.nix
-    ../../home/programs/lua-language-server.nix
-    ../../home/programs/mpv.nix
-    ../../home/programs/nil.nix
-    ../../home/programs/nixpkgs-fmt.nix
-    ../../home/programs/nodejs.nix
-    ../../home/programs/obsidian.nix
-    ../../home/programs/pkg-config.nix
-    ../../home/programs/prismlauncher.nix
     ../../home/programs/rustup.nix
-    ../../home/programs/vesktop.nix
-    ../../home/programs/xclip.nix
-    ../../home/programs/xwallpaper.nix
-    ../../home/programs/yt-dlp.nix
   ];
 
   home.username = "marvin";

hosts/nikita-nixos/default.nix

@@ -14,11 +14,12 @@
     ../../system/packages.nix
 
     # nikita-only
-    ../../system/plasma.nix
-    ../../system/display-managers/sddm.nix
     ../../system/users/nikita.nix
   ];
 
   networking.hostName = "nikita-nixos";
   system.stateVersion = "26.05";
+
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
 }

hosts/nikita-nixos/home.nix

@@ -3,11 +3,10 @@
 {
   imports = [
     ../../home/zsh.nix
-    ../../home/fonts.nix
     ../../home/yazi.nix
     ../../home/symlinks.nix
     ../../home/packages-base.nix
-    ../../home/programs/blender.nix
+    ../../home/programs/common.nix
   ];
 
   home.username = "nikita";

system/display-managers/sddm.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.displayManager.sddm.enable = true;
-}

system/docker.nix

@@ -1,6 +0,0 @@
-{ ... }:
-
-{
-    virtualisation.docker.enable = true;
-}
-

system/plasma.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.desktopManager.plasma6.enable = true;
-}

system/ssh.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.openssh.enable = true;
-}