Updates

README.md

@@ -19,7 +19,7 @@ Agent rules, skills, and MCP servers are defined once in `users/shared/programs/
 | --------------- | ----------------------------------------------- |
 | `flake.nix`     | Inputs and `darwinConfigurations` for each host |
 | `modules/`      | System-level configuration and the package set  |
-| `systems/`      | Per-host configuration, keyed by hostname       |
+| `hosts/`        | Per-host configuration, keyed by hostname       |
 | `users/shared/` | Program configuration shared across users       |
 | `users/<name>/` | Per-user overrides                              |
 
@@ -28,29 +28,62 @@ Agent rules, skills, and MCP servers are defined once in `users/shared/programs/
 1. Install Nix using the [Determinate Systems installer](https://install.determinate.systems/):
 
    ```shell
-   just nix-install
+   curl --proto '=https' --tlsv1.2 -sSf -L \
+     https://install.determinate.systems/nix |
+     sh -s -- install
    ```
 
+   Restart the shell after installation.
+
 2. Clone the repository:
 
    ```shell
    git clone https://github.com/khaykingleb/dotfiles.git ~/.config/dotfiles
    cd ~/.config/dotfiles
    ```
 
-3. Apply the configuration for your machine:
+3. Bootstrap the configuration for your machine:
 
    ```shell
-   just nix-apply <hostname>
+   sudo nix run nix-darwin -- switch \
+     --flake .#<hostname> \
+     --show-trace
    ```
 
    where `<hostname>` is one of the systems defined in `flake.nix` (e.g. `macbook-pro-m4`).
 
+4. Start a new shell, then reconcile the asdf-managed tools:
+
+   ```shell
+   ./users/shared/programs/asdf/install.sh
+   ```
+
+5. Install the repository hooks:
+
+   ```shell
+   just pre-commit-init
+   ```
+
+The initial activation installs `nh` and the asdf runtime. Subsequent configuration changes use the Just recipes below.
+
 ## Usage
 
 ```shell
-just                        # list all available commands
-just nix-apply <hostname>   # apply configuration
-just nix-update-flake       # update flake inputs
-just nix-gc                 # garbage collect unused packages
+just                                      # list all available commands
+just nix-apply <hostname>                 # build, diff, and apply a host
+just nix-update-flake                     # update all flake inputs
+just nix-update-flake nixpkgs             # update selected flake inputs
+just nix-clean                            # clean old generations, keeping recent rollbacks
+just asdf-sync                            # reconcile asdf plugins and versions
+just pre-commit-init                      # install pre-commit and commit-msg hooks
+just pre-commit-update                    # update hook revisions
+just pre-commit-run                       # run all hooks
+```
+
+## Uninstall
+
+Remove the Determinate Nix installation explicitly:
+
+```shell
+/nix/nix-installer uninstall
 ```

flake.nix

@@ -35,12 +35,14 @@
     };
 
     # Integrates homebrew with nix-darwin
-    # https://github.com/zhaofengli-wip/nix-homebrew
+    # https://github.com/zhaofengli/nix-homebrew
     nix-homebrew = {
+      # TODO: Return to github:zhaofengli/nix-homebrew after
+      # https://github.com/zhaofengli/nix-homebrew/pull/167 is merged.
       type = "github";
-      owner = "zhaofengli-wip";
+      owner = "zhaofengli";
       repo = "nix-homebrew";
-      inputs.nixpkgs.follows = "nixpkgs";
+      ref = "pull/167/head";
     };
 
     homebrew-bundle = {
@@ -121,7 +123,7 @@
                 autoMigrate = true;
               };
             }
-            ./systems/${name}
+            ./hosts/${name}
           ];
         };
       forAllSystems = nixpkgs.lib.genAttrs systems;

justfile

@@ -2,51 +2,20 @@
 default:
     @just --list --unsorted --list-heading $'Available commands:\n'
 
-DS_NIX_INSTALLER_VERSION := "v0.32.2"
-
-[group('nix')]
-[doc('Install Nix with Determinate Systems Nix Installer')]
-nix-install:
-    @echo "Installing Nix using Determinate Systems installer ({{ DS_NIX_INSTALLER_VERSION }})."
-    @if command -v nix >/dev/null 2>&1; then \
-        echo "Nix is already installed. Run 'nix --version' to check version."; \
-    else \
-        curl --proto '=https' --tlsv1.2 -sSf -L "https://install.determinate.systems/nix/tag/{{ DS_NIX_INSTALLER_VERSION }}" | sh -s -- install && \
-        echo "Nix installation complete. Please restart your shell."; \
-    fi
-
-[group('nix')]
-[doc('Upgrade Nix')]
-nix-upgrade:
-    @echo "Upgrading Nix."
-    @sudo -i nix upgrade-nix
-
-[group('nix')]
-[doc('Uninstall Nix')]
-nix-uninstall:
-    @echo "Uninstalling Nix."
-    @/nix/nix-installer uninstall
-
 [group('nix')]
 [doc('Apply nix-darwin configuration for a given host')]
 nix-apply host:
-    @echo "Applying nix-darwin configuration for {{ host }}."
-    @sudo nix run nix-darwin -- switch --flake .#{{ host }} --show-trace
-
-[group('nix')]
-[doc('Update the flake.lock file')]
-nix-update-flake:
-    @nix flake update
+    @nh darwin switch . -H {{ host }}
 
 [group('nix')]
-[doc('Collect Nix garbage (remove unused packages)')]
-nix-gc:
-    @nix-collect-garbage
+[doc('Update all or selected flake inputs')]
+nix-update-flake *inputs='':
+    @nix flake update {{ inputs }}
 
 [group('nix')]
-[doc('Delete all non-current Nix generations and collect garbage (removes rollback history)')]
-nix-gc-delete-generations:
-    @sudo nix-collect-garbage -d
+[doc('Clean old Nix generations while preserving recent rollback history')]
+nix-clean:
+    @nh clean all --keep 5 --keep-since 7d
 
 [group('misc')]
 [doc('Initialize pre-commit hooks')]
@@ -66,6 +35,6 @@ pre-commit-run:
     @pre-commit run --all-files
 
 [group('misc')]
-[doc('Install asdf plugins')]
-asdf-install:
-    @./users/shared/scripts/asdf.sh
+[doc('Reconcile asdf plugins and tool versions')]
+asdf-sync:
+    @./users/shared/programs/asdf/install.sh

modules/common/packages.nix

@@ -7,9 +7,6 @@
     neovim
 
     # VCS
-    git
-    diff-so-fancy # git diff formatter
-    gh # github cli
     act # run github actions locally
     dvc # data version control for ML
 

modules/darwin/homebrew.nix

@@ -66,7 +66,8 @@ let
     "1password"
 
     # Productivity
-    "linear-linear"
+    "finicky"
+    "linear"
     "miro"
 
     # Kubernetes

users/gkhaykin/default.nix

@@ -1,8 +1,13 @@
-{ inputs, pkgs, ... }:
+{
+  inputs,
+  pkgs,
+  ...
+}:
 {
   imports = [
     ../shared/programs
     ./onepassword.nix
+    ./programs/finicky.nix
     ./programs/vscode
 
     ../shared/completions.nix

users/gkhaykin/programs/finicky.nix

@@ -0,0 +1,10 @@
+{ lib, pkgs, ... }:
+lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
+  # Home Manager has no default-browser option, so use duti (a macOS
+  # LaunchServices CLI) to register Finicky as the HTTP(S) URL handler.
+  home.packages = [ pkgs.duti ];
+  home.file.".finicky.ts".source = ./finicky.ts;
+  home.activation.setFinickyAsDefaultBrowser = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+    run ${lib.getExe pkgs.duti} -s se.johnste.finicky http
+  '';
+}

users/gkhaykin/programs/finicky.ts

@@ -0,0 +1,21 @@
+// @ts-ignore Finicky provides its type declarations after installation.
+import type { FinickyConfig } from "/Applications/Finicky.app/Contents/Resources/finicky.d.ts";
+
+export default {
+  defaultBrowser: "Google Chrome",
+  handlers: [
+    {
+      match: finicky.matchHostnames([
+        "together.ai",
+        /\.together\.ai$/,
+        "together-ai.okta.com",
+        /\.awsapps\.com$/,
+        /^oidc\..+\.amazonaws\.com$/,
+      ]),
+      browser: {
+        name: "Google Chrome",
+        profile: "Together",
+      },
+    },
+  ],
+} satisfies FinickyConfig;