Add codecompanion.nvim

force X11 with zeditor to avoid shift+v capture
Cleanup zed-editor config
2026-03-03 20:46:36 +00:00 · 2026-03-01 22:26:40 -05:00 · 2026-03-01 21:32:49 -05:00 · 2026-03-01 20:59:35 -05:00 · 2026-02-28 23:38:11 -05:00 · 2026-02-28 18:28:16 -05:00
13 changed files with 438 additions and 577 deletions
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -16,10 +16,8 @@ jobs:
    steps:
    - uses: actions/checkout@v6
    - uses: cachix/install-nix-action@v31
-      with:
-        nix_path: nixpkgs=channel:nixos-unstable
    - uses: cachix/cachix-action@v16
      with:
        name: davegallant
        authToken: '${{ secrets.CACHIX_API_KEY }}'
-    - run: nix-build | cachix push davegallant
+    - run: nix build .#nixosConfigurations.hephaestus.config.system.build.toplevel --json | jq -r '.[].outputs | to_entries[].value' | cachix push davegallant
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ The configuration is very specific to my own machines and setup, but it may be a
 ## Prerequisites

 - [NixOS](nixos.org) (Linux)
- [Determinate Nix](https://determinate.systems/nix-installer) (macOS)
 - [just](https://github.com/casey/just)

 ## Build
--- a/common-packages.nix
+++ b/common-packages.nix
@@ -1,95 +0,0 @@
-{
-  pkgs,
-  unstable,
-  ...
-}:
-{
-  environment.systemPackages = with pkgs; [
-    # essentials
-    curl
-    gnumake
-    gnupg
-    jq
-    unzip
-    xclip
-    xdg-utils
-    zip
-
-    # modern cli
-    atuin
-    bat
-    cd-fzf
-    doggo
-    eza
-    fd
-    github-cli
-    hadolint
-    lazygit
-    macchina
-    ncdu
-    progress
-    ripgrep
-    shellcheck
-    shfmt
-    viddy
-    yq-go
-
-    # containers
-    unstable.argocd
-    unstable.k9s
-    unstable.krew
-    unstable.kubecolor
-    unstable.kubectl
-    unstable.kubectx
-    unstable.kubernetes-helm
-    unstable.stern
-
-    # cloud
-    awscli2
-    google-cloud-sdk
-    terraform
-
-    # lsp
-    nodePackages.bash-language-server
-    nodePackages.eslint
-    nodePackages.yaml-language-server
-    terraform-ls
-
-    # monitoring
-    btop
-
-    # golang
-    gofumpt
-    golangci-lint
-    gopls
-
-    # rust
-    rustup
-
-    # js
-    nodejs
-    nodePackages.prettier
-    nodePackages.yarn
-
-    # networking
-    arp-scan
-    dnsutils
-    iperf
-    nmap
-    openssl
-    openvpn
-    tcpdump
-
-    # nix
-    nix-tree
-    nixfmt-rfc-style
-    nixpkgs-review
-    nvd
-
-    # python
-    virtualenv
-
-    # media
-    yt-dlp
-  ];
-}
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1767634391,
-        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
+        "lastModified": 1772129556,
+        "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
+        "rev": "ebec37af18215214173c98cf6356d0aca24a2585",
        "type": "github"
      },
      "original": {
@@ -21,101 +21,7 @@
        "type": "github"
      }
    },
-    "determinate": {
-      "inputs": {
-        "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
-        "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux",
-        "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux",
-        "nix": "nix",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1768964099,
-        "narHash": "sha256-sV1OJYyktJRl7I3HxeBvWTWXjqm2uCTS3gS1p+DLn7c=",
-        "rev": "a5469e9aa3870941320cb92d899b66e141c5a3cd",
-        "revCount": 394,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.2/019bde7d-0725-73ef-9705-498c50ef6e00/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A"
-      }
-    },
-    "determinate-nixd-aarch64-darwin": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-zK2dgNHh/p92rk5jN+Y1LOMn0HEdTsS+7XXwb2g52oM=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/macOS"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/macOS"
-      }
-    },
-    "determinate-nixd-aarch64-linux": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-ckvZP0zFcbzLXWYOJUqYXkKBt0b2IZcQEr7YjEVtwOI=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/aarch64-linux"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/aarch64-linux"
-      }
-    },
-    "determinate-nixd-x86_64-linux": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-8dLtm8FJrpyBmrNpspJj30/6I5HGEfjjXuFqURcZ8pk=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/x86_64-linux"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/x86_64-linux"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "determinate",
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1748821116,
-        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
-        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
-        "revCount": 377,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
-      }
-    },
-    "flake-parts_2": {
      "inputs": {
        "nixpkgs-lib": [
          "nixvim",
@@ -136,6 +42,24 @@
        "type": "github"
      }
    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
@@ -172,42 +96,16 @@
        "type": "github"
      }
    },
-    "git-hooks-nix": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": [
-          "determinate",
-          "nix"
-        ],
-        "nixpkgs": [
-          "determinate",
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747372754,
-        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
-        "revCount": 1026,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941"
-      }
-    },
    "home-manager": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1768949235,
-        "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
+        "lastModified": 1772302941,
+        "narHash": "sha256-TL3+ckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
+        "rev": "9b9142b5fe214c2adabe86257c33e022372b7c96",
        "type": "github"
      },
      "original": {
@@ -245,96 +143,44 @@
        "type": "github"
      }
    },
-    "nix": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "git-hooks-nix": "git-hooks-nix",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-23-11": "nixpkgs-23-11",
-        "nixpkgs-regression": "nixpkgs-regression"
-      },
-      "locked": {
-        "lastModified": 1768960381,
-        "narHash": "sha256-32oMe1y+kwvIJNiJsIvozTuSmDxcwST06i+0ak+L4AU=",
-        "rev": "45ce621408cb8c9a724193d5fe858eb839662db8",
-        "revCount": 24453,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.2/019bde75-b4ee-74b2-a812-28dc2ee83d58/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1761597516,
-        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
-        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
-        "revCount": 811874,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505"
-      }
-    },
-    "nixpkgs-23-11": {
-      "locked": {
-        "lastModified": 1717159533,
-        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
+        "lastModified": 1771903837,
+        "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
-        "type": "github"
-      }
-    },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1769258933,
-        "narHash": "sha256-IadKC39b5Deb4j6bEFEBGwv9sgcFNlLzjImOpyGs9dw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2aacce898087dc1bc02fade2d7c224c39f0ffc62",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs-regression": {
+    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "lastModified": 1769909678,
+        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "72716169fe93074c333e8d0173151350670b824c",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
        "type": "github"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1769018530,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "lastModified": 1772198003,
+        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
        "type": "github"
      },
      "original": {
@@ -346,57 +192,27 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1768783163,
-        "narHash": "sha256-tLj4KcRDLakrlpvboTJDKsrp6z2XLwyQ4Zmo+w8KsY4=",
-        "rev": "bde09022887110deb780067364a0818e89258968",
-        "revCount": 930106,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.930106%2Brev-bde09022887110deb780067364a0818e89258968/019bd9ed-5f0b-7074-afb0-8bb5e13a7598/source.tar.gz"
+        "lastModified": 1772047000,
+        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
+        "type": "github"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1"
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1767799921,
-        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
+        "lastModified": 1770843696,
+        "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1769089682,
-        "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1763934636,
-        "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
+        "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16",
        "type": "github"
      },
      "original": {
@@ -406,9 +222,25 @@
        "type": "github"
      }
    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1771008912,
+        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixvim": {
      "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
        "nixpkgs": [
          "nixpkgs"
        ],
@@ -456,13 +288,12 @@
    "root": {
      "inputs": {
        "darwin": "darwin",
-        "determinate": "determinate",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_4",
-        "nixpkgs-master": "nixpkgs-master",
+        "nixpkgs": "nixpkgs_2",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
-        "vpngate": "vpngate"
+        "vpngate": "vpngate",
+        "weathr": "weathr"
      }
    },
    "systems": {
@@ -513,14 +344,14 @@
    "vpngate": {
      "inputs": {
        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1768683718,
-        "narHash": "sha256-c1Pua1krdRog8AjctVsIv2SjcqGI/YBQjh35Mao+pUQ=",
+        "lastModified": 1772279709,
+        "narHash": "sha256-BWyEll/XLzC8HATyf2EJzWIKT8aJcjtAb2dokfIPInM=",
        "owner": "davegallant",
        "repo": "vpngate",
-        "rev": "9e9992e643e44896a6c7f8070e968f0d85e4cea4",
+        "rev": "184ea2acf2ade5dff27bad958233c6d88c761f5c",
        "type": "github"
      },
      "original": {
@@ -528,6 +359,25 @@
        "repo": "vpngate",
        "type": "github"
      }
+    },
+    "weathr": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1772212496,
+        "narHash": "sha256-n/fjjbfBtzmd7QV7jInnb+k5tC3g8sXzoI2rka8scwI=",
+        "owner": "Veirt",
+        "repo": "weathr",
+        "rev": "56aa86fe83cb42f96f497087bd19c8e073f7ee1e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Veirt",
+        "repo": "weathr",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,7 @@
  description = "nixos and macos configurations";

  inputs = {
-    determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
    darwin = {
      url = "github:lnl7/nix-darwin/nix-darwin-25.11";
@@ -16,66 +14,91 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    vpngate.url = "github:davegallant/vpngate";
+    weathr.url = "github:Veirt/weathr";
  };

  outputs =
    {
-      self,
      darwin,
-      determinate,
      home-manager,
      nixpkgs,
      nixpkgs-unstable,
-      nixpkgs-master,
      vpngate,
+      weathr,
      ...
    }@inputs:
    let
-      supportedSystems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
+      mkUnstable =
+        system:
+        import nixpkgs-unstable {
+          inherit system;
+          config.allowUnfree = true;
+        };

-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+      mkSharedModules =
+        {
+          username,
+          system,
+          hmModule,
+          extraModules ? [ ],
+        }:
+        let
+          unstable = mkUnstable system;
+        in
+        [
+          ./packages.nix
+          hmModule
+          (
+            { ... }:
+            {
+              config = {
+                nixpkgs.config.allowUnfree = true;
+                nixpkgs.overlays = [ (import ./overlays) ];
+                home-manager = {
+                  useGlobalPkgs = true;
+                  useUserPackages = true;
+                  users.${username}.imports = [
+                    ./home.nix
+                    inputs.nixvim.homeModules.nixvim
+                    weathr.homeModules.weathr
+                  ];
+                  extraSpecialArgs = { inherit unstable; };
+                };
+              };
+            }
+          )
+        ]
+        ++ extraModules;
    in
    {
      nixosConfigurations =
        let
-          unstable = import nixpkgs-unstable {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-          };
-          master = import nixpkgs-master {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-          };
+          system = "x86_64-linux";
+          unstable = mkUnstable system;
        in
        {
          hephaestus = nixpkgs.lib.nixosSystem {
            specialArgs = {
-              inherit unstable;
-              inherit master;
-              inherit vpngate;
-              inherit inputs;
+              inherit
+                unstable
+                vpngate
+                inputs
+                ;
            };
-            modules = [
-              ./hosts/hephaestus.nix
-              ./common-packages.nix
-              home-manager.nixosModules.home-manager
-              (
-                { ... }:
-                {
-                  config = {
-                    nix = {
+            modules = mkSharedModules {
+              username = "dave";
+              inherit system;
+              hmModule = home-manager.nixosModules.home-manager;
+              extraModules = [
+                ./hosts/hephaestus.nix
+                (
+                  { ... }:
+                  {
+                    config.nix = {
                      settings = {
                        auto-optimise-store = true;
-                        sandbox = false;
                        substituters = [ "https://davegallant.cachix.org" ];
-                        trusted-users = [
-                          "root"
-                        ];
+                        trusted-users = [ "root" ];
                        trusted-public-keys = [
                          "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
                        ];
@@ -89,73 +112,32 @@
                        options = "--delete-older-than 14d";
                      };
                    };
-
-                    nixpkgs.overlays = [ (import ./overlays) ];
-
-                    home-manager = {
-                      useGlobalPkgs = true;
-                      useUserPackages = true;
-                      users.dave.imports = [
-                        ./home.nix
-                        inputs.nixvim.homeModules.nixvim
-                      ];
-                      extraSpecialArgs = {
-                        inherit unstable;
-                        inherit master;
-                      };
-                    };
-                  };
-                }
-              )
-            ];
+                  }
+                )
+              ];
+            };
          };
        };

      darwinConfigurations =
        let
          system = "aarch64-darwin";
-          unstable = import nixpkgs-unstable {
-            config.allowUnfree = true;
-            inherit system;
-          };
-          master = import nixpkgs-master {
-            config.allowUnfree = true;
-            inherit system;
-          };
+          unstable = mkUnstable system;
        in
        {
          zelus = darwin.lib.darwinSystem {
            inherit system;
            specialArgs = {
-              inherit unstable;
-              inherit master;
+              inherit unstable inputs;
+            };
+            modules = mkSharedModules {
+              username = "dave.gallant";
+              inherit system;
+              hmModule = home-manager.darwinModules.home-manager;
+              extraModules = [
+                ./hosts/zelus.nix
+              ];
            };
-
-            modules = [
-              home-manager.darwinModules.home-manager
-              ./hosts/zelus.nix
-              ./common-packages.nix
-              (
-                { ... }:
-                {
-                  config = {
-                    nixpkgs.overlays = [ (import ./overlays) ];
-                    home-manager = {
-                      useGlobalPkgs = true;
-                      useUserPackages = true;
-                      users."dave.gallant".imports = [
-                        ./home.nix
-                        inputs.nixvim.homeModules.nixvim
-                      ];
-                      extraSpecialArgs = {
-                        inherit unstable;
-                        inherit master;
-                      };
-                    };
-                  };
-                }
-              )
-            ];
          };
        };
    };
--- a/home.nix
+++ b/home.nix
@@ -21,8 +21,6 @@ in
    };
  };

-  services.lorri.enable = stdenv.isLinux;
-
  fonts.fontconfig.enable = true;

  programs = {
@@ -116,32 +114,33 @@ in
      enable = true;

      interactiveShellInit = ''
-          set fish_greeting
+        set fish_greeting

-          bind \cw backward-kill-word
+        bind \cw backward-kill-word

-          set -x DOCKER_CLI_HINTS false
-          set -x DOCKER_DEFAULT_PLATFORM linux/amd64
-          set -x EDITOR vim
-          set -x NNN_FIFO "$XDG_RUNTIME_DIR/nnn.fifo"
-          set -x PAGER less
-          set -x TERM xterm-256color
+        set -x DOCKER_CLI_HINTS false
+        set -x DOCKER_DEFAULT_PLATFORM linux/amd64
+        set -x EDITOR vim
+        set -x NNN_FIFO "$XDG_RUNTIME_DIR/nnn.fifo"
+        set -x PAGER less
+        ${lib.optionalString pkgs.stdenv.isLinux "set -x SSH_AUTH_SOCK /home/dave/.bitwarden-ssh-agent.sock"}
+        set -x TERM xterm-256color

-          set -x PATH $PATH \
-            ~/.cargo/bin \
-            ~/.local/bin \
-            ~/.npm-packages/bin \
-            /opt/homebrew/bin \
-            ~/.krew/bin \
-            ~/bin
+        set -x PATH $PATH \
+          ~/.cargo/bin \
+          ~/.local/bin \
+          ~/.npm-packages/bin \
+          /opt/homebrew/bin \
+          ~/.krew/bin \
+          ~/bin

-          # golang
-          set -x GOPATH ~/go
-          set -x GOBIN $GOPATH/bin
-          set -x PATH $PATH $GOBIN
+        # golang
+        set -x GOPATH ~/go
+        set -x GOBIN $GOPATH/bin
+        set -x PATH $PATH $GOBIN

-          source $HOME/work.fish
-        # '';
+        source $HOME/work.fish
+      '';

      shellInit = ''
        atuin init fish | source
@@ -166,15 +165,19 @@ in
        l = "eza -la --git --group-directories-first";
        m = "make";
        nix-install = "nix-env -iA";
-        t = "cd-fzf";
+        t = "cd $(cd-fzf)";
        tf = "terraform";
        tree = "eza --tree";
        v = "nvim";
+      }
+      // lib.optionalAttrs stdenv.isLinux {
+        zed = "env WAYLAND_DISPLAY='' zeditor"; # BUG: zed captures shift+v and g space on wayland
      };
    };

    go = {
      enable = true;
+      package = unstable.go;
    };

    fzf = {
@@ -262,6 +265,19 @@ in
        cmp-path.enable = true;
        cmp-treesitter.enable = true;
        commentary.enable = true;
+        codecompanion = {
+          enable = true;
+          settings = {
+            interactions = {
+              chat = {
+                adapter = "copilot";
+              };
+              inline = {
+                adapter = "copilot";
+              };
+            };
+          };
+        };
        diffview.enable = true;
        gitblame.enable = true;
        gitsigns.enable = true;
@@ -394,12 +410,18 @@ in
      };
    };

+    weathr = {
+      enable = true;
+      settings = {
+        hide_hud = true;
+      };
+    };
+
    zed-editor = {
      enable = stdenv.isLinux;
      package = unstable.zed-editor;
      extensions = [
        "ansible"
-        "color-highlight"
        "dockerfile"
        "html"
        "make"
@@ -410,17 +432,14 @@ in
      ];
      userSettings = {
        icon_theme = "Material Icon Theme";
-        features = {
-          edit_prediction_provider = "copilot";
-        };
        vim_mode = true;
        vim = {
          use_system_clipboard = "on_yank";
        };
        autosave = "on_focus_change";
        format_on_save = "off";
-        ui_font_size = lib.mkForce 18;
-        buffer_font_size = lib.mkForce 16;
+        ui_font_size = 18;
+        buffer_font_size = 16;
      };
      userKeymaps = [
        {
@@ -432,6 +451,13 @@ in
            "ctrl-z" = "editor::Undo";
          };
        }
+        {
+          context = "vim_mode == normal";
+          bindings = {
+            "g space" = "editor::OpenExcerpts";
+            "shift-v" = "vim::ToggleVisualLine";
+          };
+        }
      ];
    };

--- a/hosts/hephaestus.nix
+++ b/hosts/hephaestus.nix
@@ -1,13 +1,9 @@
 {
-
  config,
  lib,
-  inputs,
-  master,
  modulesPath,
  pkgs,
  unstable,
-  vpngate,
  ...
 }:
 {
@@ -65,67 +61,6 @@
    };
  };

-  environment.systemPackages =
-    with pkgs;
-    [
-      bleachbit
-      calibre
-      clamtk
-      cryptsetup
-      dbeaver-bin
-      discord
-      freefilesync
-      gimp-with-plugins
-      google-chrome
-      hardinfo2
-      httpie-desktop
-      heroic
-      iputils
-      kdePackages.bluedevil
-      kdePackages.kcalc
-      kdePackages.kcharselect
-      kdePackages.kclock
-      kdePackages.kcolorchooser
-      kdePackages.ksystemlog
-      kdePackages.partitionmanager
-      kdePackages.sddm-kcm
-      libation
-      lutris
-      mupen64plus
-      nfs-utils
-      onlyoffice-desktopeditors
-      opensnitch-ui
-      pciutils
-      pika-backup
-      pinentry-curses
-      pinta
-      protonup-qt
-      qbittorrent
-      qemu
-      traceroute
-      unrar
-      unstable.beszel
-      unstable.ktailctl
-      unstable.mcpelauncher-ui-qt
-      unstable.obsidian
-      unstable.podman
-      unstable.podman-compose
-      unstable.podman-desktop
-      unstable.ryubing
-      unstable.signal-desktop-bin
-      unstable.tailscale
-      unstable.zoom-us
-      usbutils
-      virt-manager
-      vlc
-      vpngate.packages.x86_64-linux.default
-      wayland-utils
-      whois
-      wine
-      wl-clipboard
-    ];
-
-
  fileSystems = {
    "/" = {
      device = "/dev/disk/by-uuid/7f4f0948-041c-47e9-ab28-53132026f158";
@@ -158,7 +93,6 @@
    noto-fonts
    noto-fonts-cjk-sans
    noto-fonts-color-emoji
-    noto-fonts
  ];

  fonts.fontconfig.defaultFonts = {
@@ -168,12 +102,7 @@
    emoji = [ "Noto Color Emoji" ];
  };

-  nixpkgs = {
-    hostPlatform = "x86_64-linux";
-    config = {
-      allowUnfree = true;
-    };
-  };
+  nixpkgs.hostPlatform = "x86_64-linux";

  networking = {
    iproute2.enable = true;
@@ -223,11 +152,22 @@
    };
  };

-  services = {
-     mullvad-vpn = {
-       enable = true;
-       package = pkgs.mullvad-vpn;
-     };
+  services.mullvad-vpn = {
+    enable = true;
+    package = pkgs.mullvad-vpn;
+  };
+
+  services.ollama = {
+    package = pkgs.ollama;
+    enable = true;
+    acceleration = "rocm";
+    host = "0.0.0.0";
+    environmentVariables = {
+      HSA_OVERRIDE_GFX_VERSION = "11.0.2";
+    };
+    loadModels = [
+      "qwen2.5-coder:7b"
+    ];
  };

  system = {
@@ -248,14 +188,18 @@

  nix = {
    extraOptions = "experimental-features = nix-command flakes";
-    settings.trusted-users = [ "root" "@wheel" ];
+    settings.trusted-users = [
+      "root"
+      "@wheel"
+    ];
  };

  users.users.dave = {
    isNormalUser = true;
    extraGroups = [
-      "wheel"
+      "docker"
      "libvirtd"
+      "wheel"
    ];
    shell = pkgs.fish;
  };
@@ -295,6 +239,8 @@
    };
  };

+  services.flatpak.enable = true;
+
  services.avahi = {
    enable = true;
    nssmdns4 = true;
@@ -308,6 +254,9 @@
    };
  };

+  security.rtkit.enable = true;
+  services.pipewire.enable = true;
+
  services = {
    desktopManager.plasma6.enable = true;
    displayManager.sddm.enable = true;
@@ -473,7 +422,7 @@
  };

  virtualisation = {
-    podman.enable = true;
+    docker.enable = true;
    libvirtd = {
      enable = true;
      qemu.swtpm.enable = true;
--- a/hosts/zelus.nix
+++ b/hosts/zelus.nix
@@ -1,11 +1,5 @@
 { pkgs, ... }:
 {
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-    };
-  };
-
  networking = {
    hostName = "zelus";
  };
@@ -86,17 +80,17 @@
      "k6"
      "node"
      "oras"
+      "peon-ping"
      "vault"
    ];

    casks = [
-      "claude-code"
      "discord"
      "dbeaver-community"
      "font-fira-code-nerd-font"
      "font-hack-nerd-font"
      "fork"
-      "freelens"
+      "headlamp"
      "iterm2"
      "karabiner-elements"
      "knockknock"
@@ -120,10 +114,7 @@

    taps = [
      "hashicorp/tap"
-      "homebrew/bundle"
-      "homebrew/cask-fonts"
-      "homebrew/cask-versions"
-      "homebrew/services"
+      "PeonPing/tap"
    ];
  };

--- a/2
+++ b/2
@@ -24,7 +24,7 @@ update:
  @./update-flake.sh

 fmt:
-  nixfmt *.nix
+  fd -e nix -x nixfmt

 clean:
  echo 'Cleaning user...'
--- a/overlays/cd-fzf/cd-fzf
+++ b/overlays/cd-fzf/cd-fzf
@@ -13,5 +13,4 @@ if [[ -z $selected ]]; then
    exit 0
 fi

-cd "$selected"
-$SHELL
+echo "$selected"
--- a/overlays/cd-fzf/default.nix
+++ b/overlays/cd-fzf/default.nix
@@ -1,19 +1,13 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-}:
-stdenv.mkDerivation rec {
+{ stdenv, lib }:
+stdenv.mkDerivation {
  pname = "cd-fzf";
  version = "0.0.1";
-  executable = ./cd-fzf;
-  phases = [ "unpackPhase" ]; # Remove all other phases
-  unpackPhase = ''
-    mkdir -p $out/bin
-    cp ${executable} $out/bin/cd-fzf
+  src = ./.;
+  installPhase = ''
+    install -Dm755 cd-fzf $out/bin/cd-fzf
  '';
-  meta = with lib; {
-    description = "\n      Fuzzy find change directory";
-    platforms = platforms.unix;
+  meta = {
+    description = "Fuzzy find change directory";
+    platforms = lib.platforms.unix;
  };
 }
--- a/packages.nix
+++ b/packages.nix
@@ -0,0 +1,168 @@
+{
+  pkgs,
+  lib,
+  unstable,
+  vpngate,
+  ...
+}:
+let
+  inherit (pkgs) stdenv;
+in
+{
+  environment.systemPackages =
+    with pkgs;
+    [
+      # essentials
+      curl
+      gnumake
+      gnupg
+      jq
+      unzip
+      zip
+
+      # modern cli
+      atuin
+      bat
+      cd-fzf
+      doggo
+      eza
+      fd
+      github-cli
+      hadolint
+      lazygit
+      macchina
+      ncdu
+      progress
+      ripgrep
+      shellcheck
+      shfmt
+      viddy
+      yq-go
+
+      # containers
+      unstable.k9s
+      unstable.krew
+      unstable.kubecolor
+      unstable.kubectl
+      unstable.kubectx
+      unstable.kubernetes-helm
+      unstable.stern
+
+      # cloud
+      awscli2
+      google-cloud-sdk
+      terraform
+
+      # lsp
+      nodePackages.bash-language-server
+      nodePackages.eslint
+      nodePackages.yaml-language-server
+      terraform-ls
+
+      # monitoring
+      btop
+
+      # golang
+      gofumpt
+      golangci-lint
+      gopls
+
+      # rust
+      rustup
+
+      # nix
+      nix-tree
+      nixfmt-rfc-style
+      nixpkgs-review
+      nvd
+
+      # python
+      virtualenv
+
+      # media
+      yt-dlp
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      xclip
+      xdg-utils
+
+      # networking
+      arp-scan
+      dnsutils
+      iperf
+      nmap
+      openssl
+      openvpn
+      tcpdump
+
+      # desktop apps
+      bitwarden-desktop
+      dbeaver-bin
+      discord
+      feishin
+      freefilesync
+      gimp-with-plugins
+      google-chrome
+      httpie-desktop
+      onlyoffice-desktopeditors
+      pika-backup
+      pinta
+      qbittorrent
+      unstable.obsidian
+      unstable.podman-desktop
+      unstable.signal-desktop-bin
+      unstable.zoom-us
+
+      # gaming
+      heroic
+      ludusavi
+      mupen64plus
+      protonup-qt
+      unstable.ryubing
+      unstable.lutris
+      wine
+
+      # kde
+      kdePackages.bluedevil
+      kdePackages.kcalc
+      kdePackages.kcharselect
+      kdePackages.kclock
+      kdePackages.kcolorchooser
+      kdePackages.ksystemlog
+      kdePackages.partitionmanager
+      kdePackages.sddm-kcm
+
+      # media
+      calibre
+      libation
+      unstable.spotify
+      vlc
+
+      # networking
+      iputils
+      traceroute
+      unstable.ktailctl
+      unstable.tailscale
+      vpngate.packages.x86_64-linux.default
+      whois
+
+      # security
+      bleachbit
+      clamtk
+      cryptsetup
+      opensnitch-ui
+      pinentry-curses
+
+      # system utilities
+      hardinfo2
+      nfs-utils
+      pciutils
+      qemu
+      unrar
+      unstable.beszel
+      usbutils
+      virt-manager
+      wayland-utils
+      wl-clipboard
+    ];
+}
--- a/update-flake.sh
+++ b/update-flake.sh
@@ -3,7 +3,7 @@
 set -euo pipefail

 if ! git diff-index --quiet HEAD --; then
-  git stash push -m "Auto-stash via update-flash.sh on $(date)"
+  git stash push -m "Auto-stash via update-flake.sh on $(date)"
 fi

 git pull