ci + lint

.github/workflows/quality.yml

@@ -0,0 +1,63 @@
+name: quality
+
+on:
+  pull_request:
+    branches: [main]
+  push:
+    branches: [main]
+
+permissions:
+  contents: read
+
+jobs:
+  changes:
+    runs-on: ubuntu-latest
+    outputs:
+      quality: ${{ steps.filter.outputs.quality }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            quality:
+              - "**/*.nix"
+              - "flake.lock"
+              - "flake.nix"
+              - "ci/**"
+              - "config/**"
+              - "scripts/**"
+              - ".github/workflows/**"
+
+  flake-check:
+    name: Flake Check
+    runs-on: ubuntu-latest
+    needs: changes
+    if: ${{ needs.changes.outputs.quality == 'true' }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - name: Prepare local flake input shims
+        run: |
+          set -euo pipefail
+          # The repo currently depends on a local path flake input for agentcomputer-cli.
+          sudo mkdir -p /Users/rathi/Documents/GitHub/companion/agentcomputer/apps
+          sudo ln -sfn "$GITHUB_WORKSPACE/ci/agentcomputer-cli-stub" /Users/rathi/Documents/GitHub/companion/agentcomputer/apps/cli
+      - run: nix flake check
+
+  nix-format:
+    name: Nix Format Check
+    runs-on: ubuntu-latest
+    needs: changes
+    if: ${{ needs.changes.outputs.quality == 'true' }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - name: Prepare local flake input shims
+        run: |
+          set -euo pipefail
+          sudo mkdir -p /Users/rathi/Documents/GitHub/companion/agentcomputer/apps
+          sudo ln -sfn "$GITHUB_WORKSPACE/ci/agentcomputer-cli-stub" /Users/rathi/Documents/GitHub/companion/agentcomputer/apps/cli
+      - run: nix fmt -- --ci

ci/agentcomputer-cli-stub/flake.nix

@@ -0,0 +1,30 @@
+{
+  description = "CI stub for the local agentcomputer-cli flake input";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
+  outputs =
+    { nixpkgs, ... }:
+    let
+      systems = [
+        "aarch64-darwin"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "x86_64-linux"
+      ];
+      forAllSystems = nixpkgs.lib.genAttrs systems;
+    in
+    {
+      packages = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
+        {
+          default = pkgs.writeShellScriptBin "aicomputer" ''
+            echo "agentcomputer-cli CI stub"
+          '';
+        }
+      );
+    };
+}

home/bat.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.bat = {
     enable = true;
 

home/claude.nix

@@ -2,10 +2,11 @@
   inputs,
   pkgs,
   ...
-}: let
+}:
-  claudePackage =
+let
-    inputs.claudeCode.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  claudePackage = inputs.claudeCode.packages.${pkgs.stdenv.hostPlatform.system}.default;
-in {
+in
+{
   # Keep the managed Claude binary on the same path the live machine was using
   # so the Nix package cleanly replaces the prior manual install.
   home.file.".local/bin/claude".source = "${claudePackage}/bin/claude";

home/codex.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   home.file.".codex/AGENTS.md".source = ../config/codex/AGENTS.md;
   home.file.".codex/config.toml".source = ../config/codex/config.toml;
 }

home/colima.nix

@@ -2,9 +2,11 @@
   config,
   pkgs,
   ...
-}: let
+}:
+let
   defaultProfile = "default";
-in {
+in
+{
   home.packages = with pkgs; [
     docker-buildx
     docker-client

home/common.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     ./bat.nix
     ./eza.nix

home/default.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     ./common.nix
     ./colima.nix

home/eza.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.eza = {
     enable = true;
     enableZshIntegration = true;

home/fzf.nix

@@ -1,6 +1,8 @@
-{config, ...}: let
+{ config, ... }:
+let
   theme = import ../lib/theme.nix { inherit config; };
-in {
+in
+{
   home.sessionVariables = {
     FZF_DEFAULT_OPTS_FILE = theme.paths.fzfCurrentFile;
   };

home/gcloud.nix

@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   xdg.configFile."gcloud/active_config".text = "default\n";
 
   xdg.configFile."gcloud/configurations/config_default".text = lib.generators.toINI { } {

home/gh.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.gh = {
     enable = true;
     gitCredentialHelper.enable = true;

home/ghostty.nix

@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   theme = import ../lib/theme.nix { inherit config; };
   ghosttyConfig = ''
     theme = "cozybox-current"
@@ -52,13 +53,11 @@
     focus-follows-mouse = true
     link-url = true
   '';
-in {
+in
+{
   programs.ghostty = {
     enable = true;
-    package =
+    package = if pkgs.stdenv.isDarwin then pkgs.ghostty-bin else pkgs.ghostty;
-      if pkgs.stdenv.isDarwin
-      then pkgs.ghostty-bin
-      else pkgs.ghostty;
     installBatSyntax = true;
   };
 

home/git.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.git = {
     enable = true;
     lfs.enable = true;

home/k9s.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.k9s = {
     enable = true;
 

home/karabiner.nix

@@ -2,7 +2,8 @@
   config,
   lib,
   ...
-}: {
+}:
+{
   # Karabiner-Elements destroys file-level symlinks (unlink + rewrite), but
   # directory-level symlinks survive.  Point ~/.config/karabiner at the repo
   # directory so changes are tracked in git and Karabiner can write freely.

home/lazygit.nix

@@ -2,11 +2,11 @@
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   xdg.configFile."lazygit/config.yml".source = ../config/lazygit/config.yml;
 
   home.file = lib.mkIf pkgs.stdenv.isDarwin {
-    "Library/Application Support/lazygit/config.yml".source =
+    "Library/Application Support/lazygit/config.yml".source = ../config/lazygit/config.yml;
-      ../config/lazygit/config.yml;
   };
 }

home/migration.nix

@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   # Transitional cleanup for files previously owned by ~/dots. Keeping this
   # separate from steady-state modules makes it obvious what can be deleted
   # once every managed path has been fully handed over to Home Manager.

home/mise.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.mise = {
     enable = true;
     globalConfig = {

home/netty.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     ./common.nix
   ];

home/nvim.nix

@@ -3,19 +3,20 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   nvimConfig = lib.cleanSourceWith {
     src = ../config/nvim;
-    filter = path: type:
+    filter =
-      builtins.baseNameOf path != ".git"
+      path: type: builtins.baseNameOf path != ".git" && builtins.baseNameOf path != "lazy-lock.json";
-      && builtins.baseNameOf path != "lazy-lock.json";
   };
   lazyLockSeed = ../config/nvim/lazy-lock.json;
   lazyLockPath = "${config.xdg.stateHome}/nvim/lazy-lock.json";
   python = pkgs.writeShellScriptBin "python" ''
     exec ${pkgs.python3}/bin/python3 "$@"
   '';
-in {
+in
+{
   # Keep rust-analyzer in the user profile so it shadows rustup's proxy in
   # /run/current-system/sw/bin when Neovim resolves LSP executables.
   home.packages = [ pkgs.rust-analyzer ];

home/rectangle.nix

@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   home.activation.importRectanglePreferences = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
     /usr/bin/defaults import com.knollsoft.Rectangle ${../config/rectangle/Rectangle.plist}
   '';

home/scripts.nix

@@ -3,9 +3,11 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   customScripts = import ../scripts { inherit config lib pkgs; };
-in {
+in
+{
   home.packages = builtins.attrValues customScripts.packages;
 
   home.activation.initializeThemeState = lib.hm.dag.entryAfter [ "writeBoundary" ] ''

home/skills.nix

@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   globalSkills = [
     {
       name = "rams";
@@ -42,7 +43,8 @@
       needs_sync=1
     fi
   '') globalSkills;
-in {
+in
+{
   home.activation.ensureGlobalSkills = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
     state_dir="${config.xdg.stateHome}/skills"
     stamp_file="$state_dir/global-skills-manifest.sha256"
@@ -58,14 +60,16 @@ in {
     ${missingChecks}
 
     if [ "$needs_sync" -eq 1 ]; then
-      export PATH="${lib.makeBinPath [
+      export PATH="${
+        lib.makeBinPath [
           pkgs.nodejs_22
           pkgs.git
           pkgs.coreutils
           pkgs.findutils
           pkgs.gnugrep
           pkgs.gnused
-      ]}:$PATH"
+        ]
+      }:$PATH"
 
       ${installCommands}
 

home/ssh.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false;

home/tmux.nix

@@ -3,9 +3,11 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   theme = import ../lib/theme.nix { inherit config; };
-in {
+in
+{
   programs.tmux = {
     enable = true;
     plugins = with pkgs.tmuxPlugins; [

home/zsh.nix

@@ -3,9 +3,9 @@
   lib,
   pkgs,
   ...
-}: {
+}:
-  home.file.".oh-my-zsh/custom/themes/agnoster.zsh-theme".source =
+{
-    ../config/agnoster.zsh-theme;
+  home.file.".oh-my-zsh/custom/themes/agnoster.zsh-theme".source = ../config/agnoster.zsh-theme;
 
   home.activation.ensureOhMyZshCache = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
     mkdir -p "${config.xdg.cacheHome}/oh-my-zsh"
@@ -22,8 +22,7 @@
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
 
-    shellAliases =
+    shellAliases = {
-      {
       co = "codex --dangerously-bypass-approvals-and-sandbox";
       ca = "cursor-agent";
       cc = "claude";
@@ -43,8 +42,7 @@
       tailscale = "/Applications/Tailscale.app/Contents/MacOS/Tailscale";
     };
 
-    envExtra =
+    envExtra = ''
-      ''
       if [[ -f "$HOME/.cargo/env" ]]; then
         . "$HOME/.cargo/env"
       fi
@@ -88,9 +86,7 @@
 
         export BUN_INSTALL="$HOME/.bun"
         export PNPM_HOME="${
-          if pkgs.stdenv.isDarwin
+          if pkgs.stdenv.isDarwin then "$HOME/Library/pnpm" else "${config.xdg.dataHome}/pnpm"
-          then "$HOME/Library/pnpm"
-          else "${config.xdg.dataHome}/pnpm"
         }"
         bindkey -v
         typeset -U path PATH

hosts/darwin/default.nix

@@ -4,7 +4,8 @@
   username,
   hostname,
   ...
-}: {
+}:
+{
   imports = [
     ../../modules/base.nix
     ../../modules/macos.nix

hosts/netty/configuration.nix

@@ -5,9 +5,11 @@
   username,
   self,
   ...
-}: let
+}:
+let
   packageSets = import ../../lib/package-sets.nix { inherit inputs lib pkgs; };
-in {
+in
+{
   imports = [
     ./hardware-configuration.nix
     ./disk-config.nix
@@ -25,7 +27,11 @@ in {
   networking = {
     hostName = "netty";
     useDHCP = true;
-    firewall.allowedTCPPorts = [22 80 443];
+    firewall.allowedTCPPorts = [
+      22
+      80
+      443
+    ];
   };
 
   services.qemuGuest.enable = true;

hosts/netty/default.nix

@@ -4,9 +4,11 @@
   pkgs,
   username,
   ...
-}: let
+}:
+let
   packageSets = import ../../lib/package-sets.nix { inherit inputs lib pkgs; };
-in {
+in
+{
   imports = [
     ../../home/netty.nix
   ];

hosts/netty/hardware-configuration.nix

@@ -4,7 +4,8 @@
   lib,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
   ];

lib/package-sets.nix

@@ -2,15 +2,12 @@
   inputs,
   lib,
   pkgs,
-}: let
+}:
-  gwsPackage =
+let
-    inputs.googleworkspace-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  gwsPackage = inputs.googleworkspace-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  claudePackage =
+  claudePackage = inputs.claudeCode.packages.${pkgs.stdenv.hostPlatform.system}.default;
-    inputs.claudeCode.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  agentcomputerPackage = inputs.agentcomputer-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  agentcomputerPackage =
+  openspecPackage = inputs.openspec.packages.${pkgs.stdenv.hostPlatform.system}.default;
-    inputs.agentcomputer-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  openspecPackage =
-    inputs.openspec.packages.${pkgs.stdenv.hostPlatform.system}.default;
 
   memex = pkgs.stdenvNoCC.mkDerivation rec {
     pname = "memex";
@@ -76,12 +73,16 @@
     meta = {
       description = "CLI for Git worktree management";
       homepage = "https://worktrunk.dev";
-      license = with lib.licenses; [asl20 mit];
+      license = with lib.licenses; [
+        asl20
+        mit
+      ];
       mainProgram = "wt";
       platforms = lib.platforms.darwin;
     };
   };
-in {
+in
+{
   core = with pkgs; [
     bitwarden-cli
     curl

lib/theme.nix

@@ -1,4 +1,5 @@
-{config, ...}: let
+{ config, ... }:
+let
   defaultMode = "dark";
   sharedPalette = {
     red = "#ea6962";
@@ -93,14 +94,17 @@
     };
   };
 
-  renderGhostty = mode: let
+  renderGhostty =
+    mode:
+    let
       theme = themes.${mode};
-    paletteLines =
+      paletteLines = builtins.concatStringsSep "\n" (
-      builtins.concatStringsSep "\n"
+        builtins.genList (index: "palette = ${toString index}=${builtins.elemAt theme.palette index}") (
-      (builtins.genList
+          builtins.length theme.palette
-        (index: "palette = ${toString index}=${builtins.elemAt theme.palette index}")
+        )
-        (builtins.length theme.palette));
+      );
-  in ''
+    in
+    ''
       background = ${theme.background}
       foreground = ${theme.foreground}
       cursor-color = ${theme.cursorColor}
@@ -110,9 +114,12 @@
       ${paletteLines}
     '';
 
-  renderTmux = mode: let
+  renderTmux =
+    mode:
+    let
       theme = themes.${mode};
-  in ''
+    in
+    ''
       set-option -g @cozybox-mode '${mode}'
       set-option -g @cozybox-accent '${theme.purple}'
       set-option -g status-style bg=${theme.background},fg=${theme.text}
@@ -123,13 +130,24 @@
       set-option -g pane-active-border-style fg=${theme.border}
     '';
 
-  renderFzf = mode: let
+  renderFzf =
+    mode:
+    let
       theme = themes.${mode};
-  in ''
+    in
+    ''
       --color=fg:${theme.text},bg:${theme.background},hl:${theme.blue}
       --color=fg+:${theme.text},bg+:${theme.surface},hl+:${theme.blue}
       --color=info:${theme.green},prompt:${theme.blue},pointer:${theme.text},marker:${theme.green},spinner:${theme.text}
     '';
-in {
+in
-  inherit defaultMode paths renderFzf renderGhostty renderTmux themes;
+{
+  inherit
+    defaultMode
+    paths
+    renderFzf
+    renderGhostty
+    renderTmux
+    themes
+    ;
 }

modules/base.nix

@@ -4,9 +4,11 @@
   pkgs,
   username,
   ...
-}: let
+}:
+let
   packageSets = import ../lib/package-sets.nix { inherit inputs lib pkgs; };
-in {
+in
+{
   nix.enable = true;
 
   nix.settings = {
@@ -22,8 +24,7 @@ in {
     use-xdg-base-directories = true;
   };
 
-  nix.gc =
+  nix.gc = {
-    {
     automatic = true;
     options = "--delete-older-than 14d";
   }

modules/homebrew.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   homebrew = {
     enable = true;
 

modules/macos.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   security.pam.services.sudo_local.touchIdAuth = true;
 
   # Karabiner-Elements is managed via Homebrew cask because nix-darwin's

modules/nixpkgs.nix

@@ -20,9 +20,7 @@ let
     hostname = host.hostname;
   };
 
-  mkHomeManagerModule =
+  mkHomeManagerModule = host: {
-    host:
-    {
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
     home-manager.extraSpecialArgs = mkSpecialArgs host;

modules/packages.nix

@@ -3,9 +3,11 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   packageSets = import ../lib/package-sets.nix { inherit inputs lib pkgs; };
-in {
+in
+{
   environment.systemPackages = packageSets.extras;
   fonts.packages = packageSets.fonts;
 }

scripts/default.nix

@@ -2,7 +2,8 @@
   config,
   lib,
   pkgs,
-}: let
+}:
+let
   theme = import ../lib/theme.nix { inherit config; };
 
   tmuxConfigs = {
@@ -10,7 +11,8 @@
     light = pkgs.writeText "tmux-theme-light.conf" (theme.renderTmux "light");
   };
 
-  mkScript = {
+  mkScript =
+    {
       file,
       name,
       runtimeInputs ? [ ],
@@ -18,11 +20,9 @@
     }:
     pkgs.writeShellApplication {
       inherit name runtimeInputs;
-      text =
+      text = lib.replaceStrings (builtins.attrNames replacements) (builtins.attrValues replacements) (
-        lib.replaceStrings
+        builtins.readFile file
-        (builtins.attrNames replacements)
+      );
-        (builtins.attrValues replacements)
-        (builtins.readFile file);
     };
 
   packages = {
@@ -35,19 +35,34 @@
     ghpr = mkScript {
       name = "ghpr";
       file = ./ghpr.sh;
-      runtimeInputs = with pkgs; [gh git gnugrep gnused coreutils];
+      runtimeInputs = with pkgs; [
+        gh
+        git
+        gnugrep
+        gnused
+        coreutils
+      ];
     };
 
     gpr = mkScript {
       name = "gpr";
       file = ./gpr.sh;
-      runtimeInputs = with pkgs; [gh fzf gnugrep coreutils];
+      runtimeInputs = with pkgs; [
+        gh
+        fzf
+        gnugrep
+        coreutils
+      ];
     };
 
     iosrun = mkScript {
       name = "iosrun";
       file = ./iosrun.sh;
-      runtimeInputs = with pkgs; [findutils gnugrep coreutils];
+      runtimeInputs = with pkgs; [
+        findutils
+        gnugrep
+        coreutils
+      ];
     };
 
     mdview = mkScript {
@@ -64,7 +79,12 @@
     theme = mkScript {
       name = "theme";
       file = ./theme.sh;
-      runtimeInputs = with pkgs; [coreutils findutils neovim tmux];
+      runtimeInputs = with pkgs; [
+        coreutils
+        findutils
+        neovim
+        tmux
+      ];
       replacements = {
         "@DEFAULT_MODE@" = theme.defaultMode;
         "@STATE_DIR@" = theme.paths.stateDir;
@@ -90,6 +110,7 @@
       file = ./wtc.sh;
     };
   };
-in {
+in
+{
   inherit packages theme tmuxConfigs;
 }