Add codecompanion.nvim

• Updated input 'home-manager':
    'github:nix-community/home-manager/36e38ca0d9afe4c55405fdf22179a5212243eecc?narHash=sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM%2BLA3jK6g%3D' (2026-02-25)
  → 'github:nix-community/home-manager/9b9142b5fe214c2adabe86257c33e022372b7c96?narHash=sha256-TL3%2BckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g%3D' (2026-02-28)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/2fc6539b481e1d2569f25f8799236694180c0993?narHash=sha256-0MAd%2B0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU%3D' (2026-02-23)
  → 'github:NixOS/nixpkgs/dd9b079222d43e1943b6ebd802f04fd959dc8e61?narHash=sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE%3D' (2026-02-27)
• Updated input 'vpngate':
    'github:davegallant/vpngate/e2a3d5ab73ad8a0f052556c0f9d4be2c51058917?narHash=sha256-cKtETtnZvBGV3Jn8/KczzselLepwH%2Bt3vJg24O7wn9c%3D' (2026-02-21)
  → 'github:davegallant/vpngate/184ea2acf2ade5dff27bad958233c6d88c761f5c?narHash=sha256-BWyEll/XLzC8HATyf2EJzWIKT8aJcjtAb2dokfIPInM%3D' (2026-02-28)

.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

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

common-packages.nix

@@ -1,89 +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.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
-
-    # networking
-    arp-scan
-    dnsutils
-    iperf
-    nmap
-    openssl
-    openvpn
-    tcpdump
-
-    # nix
-    nix-tree
-    nixfmt-rfc-style
-    nixpkgs-review
-    nvd
-
-    # python
-    virtualenv
-
-    # media
-    yt-dlp
-  ];
-}

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767634391,
+        "lastModified": 1772129556,
-        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
+        "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": 1771910357,
-        "narHash": "sha256-ns+2FDFS2BUbT1CshCF0hLYyYR2BiTOQqCMHDoGFXUo=",
-        "rev": "b0833008a670c5d1ad2d1afbd711c1bf101f5296",
-        "revCount": 405,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.16.3/019c8e19-e7a4-7fe4-ad79-b4b5feefd24a/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A"
-      }
-    },
-    "determinate-nixd-aarch64-darwin": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-NK3YCWCmz9WYQtXTg5/VYNo+KrV/7P5rBYqVhkzWEv8=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/macOS"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/macOS"
-      }
-    },
-    "determinate-nixd-aarch64-linux": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-RtiD/ualuvKSZH04G5KpBd2D4tcr5pv//cU+CGnByKs=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/aarch64-linux"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/aarch64-linux"
-      }
-    },
-    "determinate-nixd-x86_64-linux": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-XDzjUdfsnWtANfAzd8GpLkuch1+3rHDGD2uKN93Fw6M=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/x86_64-linux"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/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,7 +42,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
@@ -190,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": 1771744638,
+        "lastModified": 1772302941,
-        "narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=",
+        "narHash": "sha256-TL3+ckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0",
+        "rev": "9b9142b5fe214c2adabe86257c33e022372b7c96",
         "type": "github"
       },
       "original": {
@@ -263,54 +143,19 @@
         "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": 1771906938,
-        "narHash": "sha256-yMI4VhuahG1027I+x/xy0F5FUM7ntwB/hDouCmpwEb8=",
-        "rev": "628d55ca372a6d9eb071804b589aaa8a6974807d",
-        "revCount": 24688,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.16.3/019c8e13-4542-7edc-9244-38a597d18258/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761597516,
+        "lastModified": 1771903837,
-        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
+        "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=",
-        "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=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
         "type": "github"
       }
     },
@@ -329,45 +174,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1771969913,
-        "narHash": "sha256-WehtkEpgrJDWmkSN8RRgJGA4HFvxWbwnihY8tJAWJqQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c9c494411139bf640b22c332f7a92b94e8454de2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-regression": {
-      "locked": {
-        "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1771848320,
+        "lastModified": 1772198003,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
         "type": "github"
       },
       "original": {
@@ -379,51 +192,21 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1771177547,
+        "lastModified": 1772047000,
-        "narHash": "sha256-trTtk3WTOHz7hSw89xIIvahkgoFJYQ0G43IlqprFoMA=",
+        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
-        "rev": "ac055f38c798b0d87695240c7b761b82fc7e5bc2",
+        "owner": "NixOS",
-        "revCount": 946843,
+        "repo": "nixpkgs",
-        "type": "tarball",
+        "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.946843%2Brev-ac055f38c798b0d87695240c7b761b82fc7e5bc2/019c6a25-fd20-733f-936e-6487e2957fe4/source.tar.gz"
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "NixOS",
-        "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1"
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1771574726,
-        "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1771903837,
-        "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
       "locked": {
         "lastModified": 1770843696,
         "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
@@ -439,7 +222,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1771008912,
         "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
@@ -457,7 +240,7 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -505,10 +288,8 @@
     "root": {
       "inputs": {
         "darwin": "darwin",
-        "determinate": "determinate",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "vpngate": "vpngate",
@@ -563,14 +344,14 @@
     "vpngate": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1771695802,
+        "lastModified": 1772279709,
-        "narHash": "sha256-cKtETtnZvBGV3Jn8/KczzselLepwH+t3vJg24O7wn9c=",
+        "narHash": "sha256-BWyEll/XLzC8HATyf2EJzWIKT8aJcjtAb2dokfIPInM=",
         "owner": "davegallant",
         "repo": "vpngate",
-        "rev": "e2a3d5ab73ad8a0f052556c0f9d4be2c51058917",
+        "rev": "184ea2acf2ade5dff27bad958233c6d88c761f5c",
         "type": "github"
       },
       "original": {
@@ -581,15 +362,15 @@
     },
     "weathr": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1771953414,
+        "lastModified": 1772212496,
-        "narHash": "sha256-PXr/5eKV/oPvjsas5AIkRS88gFnFskr6+eXWdeR8Yo8=",
+        "narHash": "sha256-n/fjjbfBtzmd7QV7jInnb+k5tC3g8sXzoI2rka8scwI=",
         "owner": "Veirt",
         "repo": "weathr",
-        "rev": "7e3d7cd909fa61c36a6cf99ea84980199c3a9f63",
+        "rev": "56aa86fe83cb42f96f497087bd19c8e073f7ee1e",
         "type": "github"
       },
       "original": {

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";
@@ -25,59 +23,82 @@
       home-manager,
       nixpkgs,
       nixpkgs-unstable,
-      nixpkgs-master,
       vpngate,
       weathr,
       ...
     }@inputs:
     let
-      supportedSystems = [
+      mkUnstable =
-        "x86_64-linux"
+        system:
-        "aarch64-linux"
+        import nixpkgs-unstable {
-        "x86_64-darwin"
+          inherit system;
-        "aarch64-darwin"
+          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";
-            system = "x86_64-linux";
+          unstable = mkUnstable system;
-            config.allowUnfree = true;
-          };
-          master = import nixpkgs-master {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-          };
         in
         {
           hephaestus = nixpkgs.lib.nixosSystem {
             specialArgs = {
               inherit
                 unstable
-                master
                 vpngate
                 inputs
                 ;
             };
-            modules = [
+            modules = mkSharedModules {
-              ./hosts/hephaestus.nix
+              username = "dave";
-              ./common-packages.nix
+              inherit system;
-              home-manager.nixosModules.home-manager
+              hmModule = home-manager.nixosModules.home-manager;
-              (
+              extraModules = [
-                { ... }:
+                ./hosts/hephaestus.nix
-                {
+                (
-                  config = {
+                  { ... }:
-                    nix = {
+                  {
+                    config.nix = {
                       settings = {
                         auto-optimise-store = true;
-                        sandbox = false;
                         substituters = [ "https://davegallant.cachix.org" ];
-                        trusted-users = [
+                        trusted-users = [ "root" ];
-                          "root"
-                        ];
                         trusted-public-keys = [
                           "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
                         ];
@@ -91,68 +112,32 @@
                         options = "--delete-older-than 14d";
                       };
                     };
-
+                  }
-                    nixpkgs.config.allowUnfree = true;
+                )
-                    nixpkgs.overlays = [ (import ./overlays) ];
+              ];
-
+            };
-                    home-manager = {
-                      useGlobalPkgs = true;
-                      useUserPackages = true;
-                      users.dave.imports = [
-                        ./home.nix
-                        inputs.nixvim.homeModules.nixvim
-                        weathr.homeModules.weathr
-                      ];
-                      extraSpecialArgs = { inherit unstable master; };
-                    };
-                  };
-                }
-              )
-            ];
           };
         };
 
       darwinConfigurations =
         let
           system = "aarch64-darwin";
-          unstable = import nixpkgs-unstable {
+          unstable = mkUnstable system;
-            config.allowUnfree = true;
-            inherit system;
-          };
-          master = import nixpkgs-master {
-            config.allowUnfree = true;
-            inherit system;
-          };
         in
         {
           zelus = darwin.lib.darwinSystem {
             inherit system;
-            specialArgs = { inherit unstable master; };
+            specialArgs = {
-
+              inherit unstable inputs;
-            modules = [
+            };
-              home-manager.darwinModules.home-manager
+            modules = mkSharedModules {
-              ./hosts/zelus.nix
+              username = "dave.gallant";
-              ./common-packages.nix
+              inherit system;
-              (
+              hmModule = home-manager.darwinModules.home-manager;
-                { ... }:
+              extraModules = [
-                {
+                ./hosts/zelus.nix
-                  config = {
+              ];
-                    nixpkgs.config.allowUnfree = true;
+            };
-                    nixpkgs.overlays = [ (import ./overlays) ];
-                    home-manager = {
-                      useGlobalPkgs = true;
-                      useUserPackages = true;
-                      users."dave.gallant".imports = [
-                        ./home.nix
-                        inputs.nixvim.homeModules.nixvim
-                        weathr.homeModules.weathr
-                      ];
-                      extraSpecialArgs = { inherit unstable master; };
-                    };
-                  };
-                }
-              )
-            ];
           };
         };
     };

home.nix

@@ -21,8 +21,6 @@ in
     };
   };
 
-  services.lorri.enable = stdenv.isLinux;
-
   fonts.fontconfig.enable = true;
 
   programs = {
@@ -116,33 +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_CLI_HINTS false
-          set -x DOCKER_DEFAULT_PLATFORM linux/amd64
+        set -x DOCKER_DEFAULT_PLATFORM linux/amd64
-          set -x EDITOR vim
+        set -x EDITOR vim
-          set -x NNN_FIFO "$XDG_RUNTIME_DIR/nnn.fifo"
+        set -x NNN_FIFO "$XDG_RUNTIME_DIR/nnn.fifo"
-          set -x PAGER less
+        set -x PAGER less
-          ${lib.optionalString pkgs.stdenv.isLinux "set -x SSH_AUTH_SOCK /home/dave/.bitwarden-ssh-agent.sock"}
+        ${lib.optionalString pkgs.stdenv.isLinux "set -x SSH_AUTH_SOCK /home/dave/.bitwarden-ssh-agent.sock"}
-          set -x TERM xterm-256color
+        set -x TERM xterm-256color
 
-          set -x PATH $PATH \
+        set -x PATH $PATH \
-            ~/.cargo/bin \
+          ~/.cargo/bin \
-            ~/.local/bin \
+          ~/.local/bin \
-            ~/.npm-packages/bin \
+          ~/.npm-packages/bin \
-            /opt/homebrew/bin \
+          /opt/homebrew/bin \
-            ~/.krew/bin \
+          ~/.krew/bin \
-            ~/bin
+          ~/bin
 
-          # golang
+        # golang
-          set -x GOPATH ~/go
+        set -x GOPATH ~/go
-          set -x GOBIN $GOPATH/bin
+        set -x GOBIN $GOPATH/bin
-          set -x PATH $PATH $GOBIN
+        set -x PATH $PATH $GOBIN
 
-          source $HOME/work.fish
+        source $HOME/work.fish
-        # '';
+      '';
 
       shellInit = ''
         atuin init fish | source
@@ -173,7 +171,7 @@ in
         v = "nvim";
       }
       // lib.optionalAttrs stdenv.isLinux {
-        zed = "zeditor";
+        zed = "env WAYLAND_DISPLAY='' zeditor"; # BUG: zed captures shift+v and g space on wayland
       };
     };
 
@@ -267,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;
@@ -411,7 +422,6 @@ in
       package = unstable.zed-editor;
       extensions = [
         "ansible"
-        "color-highlight"
         "dockerfile"
         "html"
         "make"
@@ -422,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;
+        ui_font_size = 18;
-        buffer_font_size = lib.mkForce 16;
+        buffer_font_size = 16;
       };
       userKeymaps = [
         {
@@ -444,6 +451,13 @@ in
             "ctrl-z" = "editor::Undo";
           };
         }
+        {
+          context = "vim_mode == normal";
+          bindings = {
+            "g space" = "editor::OpenExcerpts";
+            "shift-v" = "vim::ToggleVisualLine";
+          };
+        }
       ];
     };
 

hosts/hephaestus.nix

@@ -1,11 +1,9 @@
 {
-
   config,
   lib,
   modulesPath,
   pkgs,
   unstable,
-  vpngate,
   ...
 }:
 {
@@ -63,84 +61,6 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    # 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
-    lutris
-    mupen64plus
-    protonup-qt
-    unstable.mcpelauncher-ui-qt
-    unstable.ryubing
-    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
-
-    # development
-    nodePackages.prettier
-    nodePackages.yarn
-    nodejs
-  ];
-
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/7f4f0948-041c-47e9-ab28-53132026f158";
@@ -173,7 +93,6 @@
     noto-fonts
     noto-fonts-cjk-sans
     noto-fonts-color-emoji
-    noto-fonts
   ];
 
   fonts.fontconfig.defaultFonts = {
@@ -320,6 +239,8 @@
     };
   };
 
+  services.flatpak.enable = true;
+
   services.avahi = {
     enable = true;
     nssmdns4 = true;

hosts/zelus.nix

@@ -80,6 +80,7 @@
       "k6"
       "node"
       "oras"
+      "peon-ping"
       "vault"
     ];
 
@@ -113,10 +114,7 @@
 
     taps = [
       "hashicorp/tap"
-      "homebrew/bundle"
+      "PeonPing/tap"
-      "homebrew/cask-fonts"
-      "homebrew/cask-versions"
-      "homebrew/services"
     ];
   };
 

justfile

@@ -24,7 +24,7 @@ update:
   @./update-flake.sh
 
 fmt:
-  nixfmt *.nix
+  fd -e nix -x nixfmt
 
 clean:
   echo 'Cleaning user...'

overlays/cd-fzf/default.nix

@@ -1,19 +1,13 @@
-{
+{ stdenv, lib }:
-  stdenv,
+stdenv.mkDerivation {
-  lib,
-  fetchurl,
-}:
-stdenv.mkDerivation rec {
   pname = "cd-fzf";
   version = "0.0.1";
-  executable = ./cd-fzf;
+  src = ./.;
-  phases = [ "unpackPhase" ]; # Remove all other phases
+  installPhase = ''
-  unpackPhase = ''
+    install -Dm755 cd-fzf $out/bin/cd-fzf
-    mkdir -p $out/bin
-    cp ${executable} $out/bin/cd-fzf
   '';
-  meta = with lib; {
+  meta = {
-    description = "\n      Fuzzy find change directory";
+    description = "Fuzzy find change directory";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

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
+    ];
+}

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