Restructure packages into per-program home/programs/ modules

Replaces the monolithic packages-marvin.nix with one file per program
so hosts can opt in selectively. Adds docker, clamav, steam, and
audio keybindings for hivebrain. Fixes monitor order and switches
volume widget to PulseVolume.

config/qtile/config.py

@@ -60,6 +60,9 @@ keys = [
         lazy.spawn('sh -c "maim -s | xclip -selection clipboard -t image/png -i"'),
         desc="Screenshot"
     ),
+    Key([mod], "F6", lazy.spawn("wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+"), desc="Volume up 5%"),
+    Key([mod], "F5", lazy.spawn("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), desc="Volume down 5%"),
+    Key([mod], "F4", lazy.spawn("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), desc="Mute toggle"),
 ]
 
 # Add key bindings to switch VTs in Wayland.
@@ -229,7 +232,7 @@ def make_top_bar(primary=False):
             format = 'Mem: {MemUsed:.0f}{mm}',
         ),
         make_sep(),
-        widget.Volume(
+        widget.PulseVolume(
             foreground = colors[7],
             padding = 8,
             fmt = 'Vol: {}',
@@ -249,8 +252,8 @@ def make_top_bar(primary=False):
 
 
 screens = [
-    Screen(top = make_top_bar()),
     Screen(top = make_top_bar(primary=True)),
+    Screen(top = make_top_bar()),
 ]
 
 # Drag floating layouts.

home/packages-marvin.nix

@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    alacritty
-    claude-code
-    gcc
-    lua-language-server
-    nil
-    nixpkgs-fmt
-    nodejs
-    obsidian
-    pkg-config
-    rustup
-    steam
-    xwallpaper
-  ];
-}

home/programs/alacritty.nix

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

home/programs/audacity.nix

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

home/programs/blender.nix

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

home/programs/blockbench.nix

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

home/programs/claude-code.nix

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

home/programs/fd.nix

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

home/programs/filezilla.nix

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

home/programs/fzf.nix

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

home/programs/gcc.nix

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

home/programs/godot.nix

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

home/programs/imv.nix

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

home/programs/jdk.nix

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

home/programs/jetbrains-toolbox.nix

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

home/programs/lazygit.nix

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

home/programs/lua-language-server.nix

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

home/programs/mpv.nix

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

home/programs/nil.nix

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

home/programs/nixpkgs-fmt.nix

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

home/programs/nodejs.nix

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

home/programs/obsidian.nix

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

home/programs/pkg-config.nix

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

home/programs/prismlauncher.nix

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

home/programs/rustup.nix

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

home/programs/vesktop.nix

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

home/programs/xclip.nix

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

home/programs/xwallpaper.nix

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

home/programs/yt-dlp.nix

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

home/tmux.nix

@@ -43,6 +43,9 @@
       # Vi copy-mode: v select, y yank to X11 clipboard
       bind-key -T copy-mode-vi v send -X begin-selection
       bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -selection clipboard -i'
+
+      # Default layout on new session: main + right pane (~20%) + bottom pane (~15%)
+      set-hook -g session-created 'split-window -v -l 15% -c "#{pane_current_path}" ; select-pane -t 1 ; split-window -h -l 20% -c "#{pane_current_path}" ; select-pane -t 1'
     '';
   };
 }

hosts/hivebrain/default.nix

@@ -13,14 +13,18 @@
     ../../system/ssh.nix
     ../../system/programs.nix
     ../../system/packages.nix
+    ../../system/docker.nix
 
     # marvin-only
     ../../system/xserver.nix
     ../../system/picom.nix
     ../../system/display-managers/ly.nix
     ../../system/users/marvin.nix
+    ../../system/clam.nix
   ];
 
   networking.hostName = "hivebrain";
   system.stateVersion = "26.05";
+
+  programs.steam.enable = true;
 }

hosts/hivebrain/home.nix

@@ -7,8 +7,35 @@
     ../../home/rofi.nix
     ../../home/yazi.nix
     ../../home/symlinks.nix
+    ../../home/tmux.nix
     ../../home/packages-base.nix
-    ../../home/packages-marvin.nix
+    ../../home/programs/alacritty.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/home.nix

@@ -7,6 +7,7 @@
     ../../home/yazi.nix
     ../../home/symlinks.nix
     ../../home/packages-base.nix
+    ../../home/programs/blender.nix
   ];
 
   home.username = "nikita";

system/clam.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = [
+    pkgs.clamav
+    pkgs.clamtk
+  ];
+
+  services = {
+    clamav.daemon.enable = true;
+    clamav.updater.enable = true;
+  };
+}

system/docker.nix

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

system/networking.nix

@@ -2,4 +2,8 @@
 
 {
   networking.networkmanager.enable = true;
+
+  # Steam LAN game transfer + Remote Play
+  networking.firewall.allowedTCPPorts = [ 27036 27037 27040 ];
+  networking.firewall.allowedUDPPorts = [ 27031 27036 ];
 }

system/programs.nix

@@ -1,7 +1,9 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   programs.firefox.enable = true;
   programs.zsh.enable = true;
   programs.nix-ld.enable = true;
+
+  environment.systemPackages = [ pkgs.ungoogled-chromium ];
 }

system/users/marvin.nix

@@ -3,7 +3,7 @@
 {
   users.users.marvin = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
+    extraGroups = [ "wheel" "docker" ];
     shell = pkgs.zsh;
     packages = with pkgs; [
       tree

system/xserver.nix

@@ -11,16 +11,16 @@
     '';
     xrandrHeads = [
       {
-        output = "HDMI-1";
+        output = "DP-3";
+        primary = true;
         monitorConfig = ''
           Option "Position" "0 0"
         '';
       }
       {
-        output = "DP-1";
+        output = "HDMI-1";
-        primary = true;
         monitorConfig = ''
-          Option "Position" "1920 0"
+          Option "Position" "3440 0"
         '';
       }
     ];