refactor: scope workstation apps

home/arrakis/default.nix

@@ -5,6 +5,10 @@
   imports = [
     ../common/programs/default.nix
     ../common/programs/desktop
+    ../common/programs/workstation-apps.nix
+    ../common/programs/editors.nix
+    ../common/programs/dev-workstation.nix
+    ../common/programs/ai-gui.nix
     ../common/programs/zen-browser.nix
     ../common/programs/hyprland
     ../common/programs/kitty

home/common/programs/ai-gui.nix

@@ -0,0 +1,29 @@
+{
+  config,
+  pkgs,
+  inputs,
+  lib,
+  ...
+}:
+let
+  claude-desktop = pkgs.callPackage ../../../pkgs/claude-desktop/package.nix {
+    inherit (config.custom.aiApps) deviceScaleFactor;
+  };
+  codex-cli = inputs.codex-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  t3-code = pkgs.callPackage ../../../pkgs/t3-code/package.nix {
+    inherit (config.custom.aiApps) deviceScaleFactor;
+  };
+in
+{
+  imports = [ inputs.codex-desktop-linux.homeManagerModules.default ];
+
+  home.packages = lib.optionals pkgs.stdenv.hostPlatform.isx86_64 [
+    claude-desktop
+    t3-code
+  ];
+
+  programs.codexDesktopLinux = {
+    enable = true;
+    cliPackage = codex-cli;
+  };
+}

home/common/programs/claude/default.nix

@@ -1,16 +1,9 @@
 {
-  config,
   pkgs,
   inputs,
   lib,
   ...
 }:
-let
-  # Official Anthropic Claude desktop app (Linux build, x86_64 only).
-  claude-desktop = pkgs.callPackage ../../../../pkgs/claude-desktop/package.nix {
-    inherit (config.custom.aiApps) deviceScaleFactor;
-  };
-in
 {
   imports = [
     inputs.agent-skills.homeModules.default
@@ -27,23 +20,20 @@ in
   };
 
   config.home = {
-    packages =
-      with pkgs;
-      [
-        inputs.claude-code.packages.${pkgs.stdenv.hostPlatform.system}.default
+    packages = with pkgs; [
+      inputs.claude-code.packages.${pkgs.stdenv.hostPlatform.system}.default
 
-        # sandbox
-        bubblewrap
-        socat
-        libseccomp
+      # sandbox
+      bubblewrap
+      socat
+      libseccomp
 
-        # voice
-        sox
+      # voice
+      sox
 
-        # beads
-        dolt
-      ]
-      ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 claude-desktop;
+      # beads
+      dolt
+    ];
 
     file = {
       ".default-npm-packages".text = ''
@@ -51,11 +41,6 @@ in
         @beads/bd
       '';
 
-
-
-
-
-
       ".claude/statusline.sh" = {
         source = ./statusline.sh;
         executable = true;

home/common/programs/codex.nix

@@ -7,14 +7,5 @@ let
   codex-cli = inputs.codex-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
 in
 {
-  imports = [ inputs.codex-desktop-linux.homeManagerModules.default ];
-
-  # cliPackage only tells the desktop app where to find codex; it does not put
-  # it on PATH, so the cli needs installing separately.
   home.packages = [ codex-cli ];
-
-  programs.codexDesktopLinux = {
-    enable = true;
-    cliPackage = codex-cli;
-  };
 }

home/common/programs/default.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   config,
   ...
 }:
@@ -10,7 +9,6 @@
     ./zsh.nix
     ./nix.nix
     ./neovim
-    ./editors.nix
     ./rust.nix
     ./elixir.nix
     ./nodejs.nix
@@ -34,10 +32,6 @@
     # this with a plain assignment.
     mutableFilesRepoPath = lib.mkDefault "${config.home.homeDirectory}/projects/nixos-config";
 
-    packages = with pkgs; [
-      impala
-    ];
-
     username = lib.mkDefault "naps62";
     homeDirectory = lib.mkDefault "/home/${config.home.username}";
     stateVersion = lib.mkDefault "24.05";

home/common/programs/desktop/default.nix

@@ -4,53 +4,29 @@
   ...
 }:
 {
-  imports = [
-    ./darkman.nix
-    ./spicetify.nix
-  ];
+  imports = [ ./darkman.nix ];
 
   home = {
     packages = with pkgs; [
       # various
       google-chrome
       thunar
-      obsidian
       mpv
-      # screen recording — evaluating these
-      obs-studio
-      kooha # simple Wayland-native screen+audio recorder
-      vokoscreen-ng # GUI recorder with webcam overlay
-      gimp
-      font-manager
       imv
       pavucontrol
       zathura
       libsForQt5.qt5ct
       kdePackages.qt6ct
       nwg-look
-      xournalpp
       jq
       ffmpeg
       unzip
 
-      # remote desktop
-      remmina
-
       # networking
       networkmanagerapplet
       mtr
       dnsutils
 
-      # communication
-      slack
-      ferdium
-      signal-desktop
-      zoom-us
-
-      # dev tools
-      yaak
-      bun
-
       # themes
       tela-icon-theme
     ];

home/common/programs/dev-workstation.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    doctl
+    awscli2
+    terraform
+    bruno
+    coturn
+    usbutils
+    ktlint
+  ];
+}

home/common/programs/dev.nix

@@ -7,7 +7,6 @@
     ./codex.nix
     ./pi.nix
     ./ralph-claude-code.nix
-    ./t3-code.nix
   ];
 
   programs = {
@@ -26,19 +25,12 @@
 
   home.packages = with pkgs; [
     imagemagick
-    doctl
-    awscli2
-    terraform
     inotify-tools
     devenv
-    bruno
     sshfs
-    coturn
     file
-    usbutils
     nmap
     lsof
-    ktlint
     croc
     opencode
     process-compose

home/common/programs/t3-code.nix

@@ -1,16 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  # T3 Code: open-source desktop control plane for coding agents (x86_64 only).
-  # Shares the custom.aiApps.deviceScaleFactor knob (defined in ../claude).
-  t3-code = pkgs.callPackage ../../../pkgs/t3-code/package.nix {
-    inherit (config.custom.aiApps) deviceScaleFactor;
-  };
-in
-{
-  home.packages = lib.optional pkgs.stdenv.hostPlatform.isx86_64 t3-code;
-}

home/common/programs/workstation-apps.nix

@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+{
+  imports = [ ./desktop/spicetify.nix ];
+
+  home.packages = with pkgs; [
+    obsidian
+    obs-studio
+    kooha
+    vokoscreen-ng
+    gimp
+    font-manager
+    xournalpp
+    remmina
+    slack
+    ferdium
+    signal-desktop
+    zoom-us
+    yaak
+    bun
+  ];
+}

home/konishi/default.nix

@@ -5,6 +5,10 @@
   imports = [
     ../common/programs/default.nix
     ../common/programs/desktop
+    ../common/programs/workstation-apps.nix
+    ../common/programs/editors.nix
+    ../common/programs/dev-workstation.nix
+    ../common/programs/ai-gui.nix
     ../common/programs/zen-browser.nix
     ../common/programs/hyprland
     ../common/programs/kitty