Remove chromium

unpacking 'https://flakehub.com/f/DeterminateSystems/determinate/%2A' into the Git cache...
unpacking 'github:nix-community/home-manager/c08430923ed417abc653884328a39e98496cfd0f' into the Git cache...
unpacking 'github:NixOS/nixpkgs/c0fc386a2f5f7027de84c302659f16c93f8da151' into the Git cache...
• Updated input 'darwin':
    'github:lnl7/nix-darwin/688427b1aab9afb478ca07989dc754fa543e03d5?narHash=sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4%3D' (2025-12-07)
  → 'github:lnl7/nix-darwin/08585aacc3d6d6c280a02da195fdbd4b9cf083c2?narHash=sha256-owcSz2ICqTSvhBbhPP%2B1eWzi88e54rRZtfCNE5E/wwg%3D' (2026-01-05)
• Updated input 'home-manager':
    'github:nix-community/home-manager/7a06e8a2f844e128d3b210a000a62716b6040b7f?narHash=sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4%3D' (2026-01-04)
  → 'github:nix-community/home-manager/c08430923ed417abc653884328a39e98496cfd0f?narHash=sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs%2Bdfl6IbSq3r7s%3D' (2026-01-07)
• Updated input 'home-manager/nixpkgs':
    'github:NixOS/nixpkgs/64049ca74d63e971b627b5f3178d95642e61cedd?narHash=sha256-yA/CuWyqm%2BAQo2ivGy6PlYrjZBQm7jfbe461%2B4HF2fo%3D' (2026-01-02)
  → 'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/30a3c519afcf3f99e2c6df3b359aec5692054d92?narHash=sha256-8IQQUorUGiSmFaPnLSo2%2BT%2BrjHtiNWc%2BOAzeHck7N48%3D' (2026-01-03)
  → 'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05)
• Updated input 'nixpkgs-master':
    'github:NixOS/nixpkgs/9d2a9d6abc3ae7d73bdbc6d92b8123f55e84ad86?narHash=sha256-a2bF6Wxxw8XZ4PmIOsqLznV1pCr160fl90psV1tp0qI%3D' (2026-01-05)
  → 'github:NixOS/nixpkgs/c0fc386a2f5f7027de84c302659f16c93f8da151?narHash=sha256-Eu0eZDABynDaCPRr5bce4UpVcmRHioxG8pJTpPPMrWE%3D' (2026-01-07)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/fb7944c166a3b630f177938e478f0378e64ce108?narHash=sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf%2BOkucw%3D' (2026-01-02)
  → 'github:NixOS/nixpkgs/9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5?narHash=sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i%2BbwD6XxMb8A%3D' (2026-01-05)

.envrc

@@ -1,3 +0,0 @@
-if has nix-shell; then
-  use_nix
-fi

.git-crypt/.gitattributes

@@ -1,4 +0,0 @@
-# Do not edit this file.  To specify the files to encrypt, create your own
-# .gitattributes file in the directory where your files are.
-* !filter !diff
-*.gpg binary

.gitattributes

@@ -1 +0,0 @@
-**/.aws/** filter=git-crypt diff=git-crypt

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: daily
-  reviewers:
-  - davegallant
-  assignees:
-  - davegallant

.github/workflows/cachix.yml

@@ -14,11 +14,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v23
+    - uses: actions/checkout@v6
+    - uses: cachix/install-nix-action@v31
       with:
         nix_path: nixpkgs=channel:nixos-unstable
-    - uses: cachix/cachix-action@v12
+    - uses: cachix/cachix-action@v16
       with:
         name: davegallant
         authToken: '${{ secrets.CACHIX_API_KEY }}'

.gitignore

@@ -1,4 +1,3 @@
 .pre-commit-config.yaml
 .vscode
-git-crypt-key
 result

Makefile

@@ -1,30 +0,0 @@
-SHELL := bash
-.SHELLFLAGS := -eu -o pipefail -c
-.DELETE_ON_ERROR:
-MAKEFLAGS += --warn-undefined-variables
-MAKEFLAGS += --no-builtin-rules
-
-HOSTNAME ?= $(shell hostname)
-UNAME_S := $(shell uname -s)
-
-export NIXPKGS_ALLOW_UNFREE := 1
-
-ifeq ($(UNAME_S),Linux)
-	SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' \
-								--impure # Impure because of: https://discourse.nixos.org/t/vscode-remote-wsl-extension-works-on-nixos-without-patching-thanks-to-nix-ld/14615
-endif
-ifeq ($(UNAME_S),Darwin)
-	SWITCH_CMD := exec darwin-rebuild switch --flake .
-endif
-
-switch:
-	$(SWITCH_CMD)
-
-rollback:
-	nixos-rebuild --use-remote-sudo switch --rollback -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix
-
-update:
-	nix flake update
-
-fmt:
-	alejandra .

README.md

@@ -1,18 +1,42 @@
 # nix-config
 
-This repo stores nix to manage my machines running [NixOS](https://nixos.org/), macOS, and Windows (using [NixOS-WSL](https://github.com/nix-community/NixOS-WSL)).
+This repo stores nix configuration to manage my hosts running [NixOS](https://nixos.org/) and macOS.
 
 The configuration is very specific to my own machines and setup, but it may be a useful reference for anyone else learning or experimenting with nix, whether it be on a personal workstation or a server environment.
 
-## Setup
+```console
+❯ macchina
 
-> on macOS: install the latest unstable nix from https://github.com/numtide/nix-unstable-installer (for nix flakes),
-> and nix-darwin: https://github.com/LnL7/nix-darwin
+        a8888b.           Host        -  dave@hephaestus
+       d888888b.          Machine     -  Micro-Star International Co., Ltd MS-7C02 1.0
+       8P"YP"Y88          Kernel      -  6.12.61
+       8|o||o|88          Distro      -  NixOS 25.11 (Xantusia)
+       8'    .88          DE          -  KDE
+       8`._.' Y8.         Packages    -  1 (cargo), 10998 (nix)
+      d/      `8b.        Shell       -  fish
+     dP        Y8b.       Terminal    -  alacritty
+    d8:       ::88b.      Resolution  -  2560x1440, 3840x2160
+   d8"         'Y88b      Uptime      -  26m
+  :8P           :888      CPU         -  AMD Ryzen 7 5700X 8-Core Processor (16)
+   8a.         _a88P      CPU Load    -  8%
+ ._/"Yaa     .| 88P|      Memory      -  10.7 GB / 32.8 GB
+ \    YP"    `|     `.
+ /     \.___.d|    .'
+ `--..__)     `._.'
+```
 
-To run a rebuild:
+## Prerequisites
+
+- [NixOS](nixos.org) (Linux)
+- [Determinate Nix](https://determinate.systems/nix-installer) (macOS)
+- [just](https://github.com/casey/just)
+
+## Build
+
+To run a build/rebuild:
 
 ```sh
-make
+just rebuild
 ```
 
 ## Update
@@ -20,7 +44,7 @@ make
 To update nixpkgs defined in [flake.nix](./flake.nix), run:
 
 ```sh
-make update
+just update
 ```
 
 If there are updates, they should be reflected in [flake.lock](./flake.lock).
@@ -30,13 +54,32 @@ If there are updates, they should be reflected in [flake.lock](./flake.lock).
 To rollback to the previous generation:
 
 ```sh
-make rollback
+just rollback
 ```
 
-## Pre-commit hooks
+## Garbage collection
 
-Pre-commit hooks are automatically activated when [direnv](https://github.com/direnv/direnv) is installed.
+To cleanup previous files, run nix garbage collection:
 
-## Encryption
+```sh
+just clean
+```
 
-Overly sensitive configuration is encrypted with [git-crypt](https://www.agwa.name/projects/git-crypt/).
+## Restoring from a live USB
+
+If the bootloader for some reason breaks (i.e. motherboard firmware upgrade), restore it from a live USB by running the following commands:
+
+```console
+$ sudo cryptsetup luksOpen /dev/nvme0n1p2 crypted-nixos
+Enter passphrase for /dev/nvme0n1p2: ********
+$ sudo mount /dev/vg/root /mnt
+$ sudo mount /dev/nvme0n1p1 /mnt/boot/efi
+$ sudo nixos-enter --root /mnt
+$ hostname <hostname>
+```
+
+Navigate to the nix-config directory and run:
+
+```sh
+just rebuild-boot
+```

common-packages.nix

@@ -0,0 +1,95 @@
+{
+  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
+  ];
+}

default.nix

@@ -1,13 +0,0 @@
-let
-  nix-pre-commit-hooks =
-    import (builtins.fetchTarball
-      "https://github.com/cachix/pre-commit-hooks.nix/tarball/master");
-in {
-  pre-commit-check = nix-pre-commit-hooks.run {
-    src = ./.;
-    hooks = {
-      shellcheck.enable = true;
-      alejandra.enable = true;
-    };
-  };
-}

flake.lock

@@ -7,95 +7,396 @@
         ]
       },
       "locked": {
-        "lastModified": 1698429334,
-        "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=",
+        "lastModified": 1767634391,
+        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7",
+        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
+        "ref": "nix-darwin-25.11",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
-    "home-manager": {
+    "determinate": {
       "inputs": {
-        "nixpkgs": [
+        "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": 1766549083,
+        "narHash": "sha256-G1Hljg7vIBt8n9cxO382YAZWtZU/mYfQcg3icdNG8RQ=",
+        "rev": "ba8999fac986e70f52b4cba15047be7bbb7b6346",
+        "revCount": 318,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.1/019b4e8a-dc22-75db-aef5-a447efbb1a13/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A"
+      }
+    },
+    "determinate-nixd-aarch64-darwin": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-uWDS94cAYprGj+AwuT42nuuDDicRLj1S0JwalZGeBRU=",
+        "type": "file",
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
+      }
+    },
+    "determinate-nixd-aarch64-linux": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-uHBcZCh2/Bj5/88TDihupA336tSQDk7s5lVP66IDAX0=",
+        "type": "file",
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
+      }
+    },
+    "determinate-nixd-x86_64-linux": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-y+l05H6GNv/1WcrMztDYem8VBWqjc9gNg4WjeQ1PQxo=",
+        "type": "file",
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/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": 1695108154,
-        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "07682fff75d41f18327a871088d20af2710d4744",
-        "type": "github"
+        "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": {
-        "owner": "nix-community",
-        "ref": "release-23.05",
-        "repo": "home-manager",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
       }
     },
-    "nix-ld": {
+    "flake-parts_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1698486730,
-        "narHash": "sha256-MP4bGb3JXkmmECssp0B7i0OipUXN7HurAqvfP830NLg=",
-        "owner": "Mic92",
-        "repo": "nix-ld",
-        "rev": "846421112563fb6cf0334d9f124449aada964088",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
         "type": "github"
       },
       "original": {
-        "owner": "Mic92",
-        "repo": "nix-ld",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
         "type": "github"
       }
     },
-    "nixos-hardware": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1698853384,
-        "narHash": "sha256-/FQ2WeCjdjdNo9eGTO7JruGAjO2Ccime8y1OU4/Aesk=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "11d50c5d52472ed40d3cb109daad03c836d2b328",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
+        "owner": "numtide",
+        "repo": "flake-utils",
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "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"
+      },
+      "locked": {
+        "lastModified": 1767780135,
+        "narHash": "sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs+dfl6IbSq3r7s=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c08430923ed417abc653884328a39e98496cfd0f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-25.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1754860581,
+        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.1.1",
+        "repo": "ixx",
+        "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": 1766546676,
+        "narHash": "sha256-GsC52VFF9Gi2pgP/haQyPdQoF5Qe2myk1tsPcuJZI28=",
+        "rev": "51dacdd248e8071cd0243a8245c8c42ac1f33307",
+        "revCount": 24299,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.1/019b4e84-d036-75db-b6c6-6bc2e2035c53/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1686752049,
-        "narHash": "sha256-GtSbXZ6ia/o+f/I5O/5ee8HGmKuwQWZhtyd2u5y5TOk=",
+        "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=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eafbb465a91939b9a47bc05fcef0f948903755c1",
+        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
+        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "type": "github"
+      }
+    },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1767786791,
+        "narHash": "sha256-Eu0eZDABynDaCPRr5bce4UpVcmRHioxG8pJTpPPMrWE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c0fc386a2f5f7027de84c302659f16c93f8da151",
+        "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": 1698890957,
-        "narHash": "sha256-DJ+SppjpPBoJr0Aro9TAcP3sxApCSieY6BYBCoWGUX8=",
+        "lastModified": 1767640445,
+        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c082856b850ec60cda9f0a0db2bc7bd8900d708c",
+        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1766314097,
+        "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
+        "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
+        "revCount": 914780,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.914780%2Brev-306ea70f9eb0fb4e040f8540e2deab32ed7e2055/019b49b8-ed0f-724e-bdaf-5fd90cc1c590/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1767634882,
+        "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1767634882,
+        "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c",
+        "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",
         "type": "github"
       },
       "original": {
@@ -105,30 +406,127 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1698846319,
-        "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857",
+        "lastModified": 1767448089,
+        "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "983751b66f255bbea1adc185364e9e7b73f82358",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
+        "owner": "nix-community",
+        "ref": "nixos-25.11",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "ixx": "ixx",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1761730856,
+        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
         "darwin": "darwin",
+        "determinate": "determinate",
         "home-manager": "home-manager",
-        "nix-ld": "nix-ld",
-        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-master": "nixpkgs-master",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixvim": "nixvim",
+        "vpngate": "vpngate"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "vpngate": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1766183672,
+        "narHash": "sha256-24+gJj4UsxwQmdxSS3Aqo2fl0Ep13sYrTDvcHY24mwA=",
+        "owner": "davegallant",
+        "repo": "vpngate",
+        "rev": "a668484da6b969d29dd2f74d5a4f2323fb48beef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "davegallant",
+        "repo": "vpngate",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -2,21 +2,161 @@
   description = "nixos and macos configurations";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
-    nix-ld.url = "github:Mic92/nix-ld";
-
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
-
+    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";
+      url = "github:lnl7/nix-darwin/nix-darwin-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
+    nixvim = {
+      url = "github:nix-community/nixvim/nixos-25.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    vpngate.url = "github:davegallant/vpngate";
   };
 
-  outputs = {...} @ args: import ./outputs.nix args;
+  outputs =
+    {
+      self,
+      darwin,
+      determinate,
+      home-manager,
+      nixpkgs,
+      nixpkgs-unstable,
+      nixpkgs-master,
+      vpngate,
+      ...
+    }@inputs:
+    let
+      supportedSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+    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;
+          };
+        in
+        {
+          hephaestus = nixpkgs.lib.nixosSystem {
+            specialArgs = {
+              inherit unstable;
+              inherit master;
+              inherit vpngate;
+              inherit inputs;
+            };
+            modules = [
+              ./hosts/hephaestus.nix
+              ./common-packages.nix
+              home-manager.nixosModules.home-manager
+              (
+                { ... }:
+                {
+                  config = {
+                    nix = {
+                      settings = {
+                        auto-optimise-store = true;
+                        sandbox = false;
+                        substituters = [ "https://davegallant.cachix.org" ];
+                        trusted-users = [
+                          "root"
+                        ];
+                        trusted-public-keys = [
+                          "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
+                        ];
+                      };
+                      registry = {
+                        nixpkgs.flake = nixpkgs;
+                      };
+                      gc = {
+                        automatic = true;
+                        dates = "daily";
+                        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;
+          };
+        in
+        {
+          zelus = darwin.lib.darwinSystem {
+            inherit system;
+            specialArgs = {
+              inherit unstable;
+              inherit master;
+            };
+
+            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;
+                      };
+                    };
+                  };
+                }
+              )
+            ];
+          };
+        };
+    };
 }

home.nix

@@ -0,0 +1,447 @@
+{
+  lib,
+  pkgs,
+  unstable,
+  ...
+}:
+let
+  inherit (pkgs) stdenv;
+in
+{
+  home.stateVersion = "25.11";
+
+  home.packages = with pkgs; [ just ];
+
+  services = {
+    gpg-agent = {
+      enable = stdenv.isLinux;
+      defaultCacheTtl = 3600;
+      defaultCacheTtlSsh = 3600;
+      enableSshSupport = true;
+    };
+  };
+
+  services.lorri.enable = stdenv.isLinux;
+
+  fonts.fontconfig.enable = true;
+
+  programs = {
+    home-manager.enable = true;
+
+    direnv.enable = true;
+
+    diff-so-fancy = {
+      enable = true;
+      enableGitIntegration = true;
+    };
+
+    git = {
+      enable = true;
+
+      lfs.enable = true;
+
+      settings = {
+        user.name = "Dave Gallant";
+        user.signingkey = "5A548984C7377E4D";
+        commit.gpgsign = true;
+        tag.gpgsign = true;
+        alias = {
+          aa = "add -A .";
+          br = "branch";
+          c = "commit";
+          cm = "commit -m";
+          ca = "commit --amend";
+          cane = "commit --amend --no-edit";
+          cb = "checkout -b";
+          co = "checkout";
+          cmp = "! git checkout main && git pl";
+          d = "diff";
+          dc = "diff --cached";
+          dcn = "diff --cached --name-only";
+          l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+          ms = "merge --squash";
+          p = "push origin";
+          pf = "push -f";
+          pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)";
+          st = "status";
+          wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
+        };
+        push = {
+          default = "current";
+        };
+        pull = {
+          rebase = true;
+        };
+      };
+
+      includes = [ { path = "~/.gitconfig-work"; } ];
+
+    };
+
+    alacritty = {
+      enable = stdenv.isLinux;
+      settings = {
+        window.padding.x = 10;
+        window.padding.y = 10;
+        scrolling.history = 100000;
+        general.live_config_reload = true;
+        terminal.shell = {
+          program = "fish";
+        };
+        font = {
+          size = lib.mkForce 14.0;
+        };
+        window = {
+          opacity = lib.mkForce 0.9;
+        };
+      };
+    };
+
+    starship = {
+      enable = true;
+      enableFishIntegration = true;
+      settings = {
+        add_newline = false;
+        gcloud = {
+          format = "";
+        };
+        kubernetes = {
+          disabled = false;
+        };
+      };
+    };
+
+    fish = {
+      enable = true;
+
+      interactiveShellInit = ''
+          set fish_greeting
+
+          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 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
+
+          source $HOME/work.fish
+        # '';
+
+      shellInit = ''
+        atuin init fish | source
+        helm completion fish | source
+        kubectl completion fish | source
+      '';
+
+      shellAliases = {
+        ".." = "cd ..";
+        g = "git";
+        gc = "git checkout $(git branch | fzf)";
+        gco = "git checkout $(git branch -r | sed -e 's/^  origin\\///' | fzf)";
+        gho = "gh repo view --web >/dev/null";
+        gr = "cd $(git rev-parse --show-toplevel)";
+        grep = "rg --smart-case";
+        j = "just";
+        k = "kubecolor";
+        kubectl = "kubecolor";
+        kp = "viddy 'kubectl get pods'";
+        kcx = "kubectx";
+        kns = "kubens";
+        l = "eza -la --git --group-directories-first";
+        m = "make";
+        nix-install = "nix-env -iA";
+        t = "cd-fzf";
+        tf = "terraform";
+        tree = "eza --tree";
+        v = "nvim";
+      };
+    };
+
+    go = {
+      enable = true;
+    };
+
+    fzf = {
+      enable = true;
+    };
+
+    nnn = {
+      enable = stdenv.isLinux;
+      package = pkgs.nnn.override ({ withNerdIcons = true; });
+      bookmarks = {
+        d = "~/Downloads";
+        p = "~/src/";
+        c = "~/.config";
+        h = "~";
+      };
+      extraPackages = with pkgs; [
+        bat
+        eza
+        fzf
+        imv
+        mediainfo
+        ffmpegthumbnailer
+      ];
+      plugins = {
+        src = "${pkgs.nnn.src}/plugins";
+        mappings = {
+          p = "preview-tui";
+          o = "fzopen";
+        };
+      };
+    };
+
+    nixvim = {
+      enable = true;
+      viAlias = true;
+      vimAlias = true;
+      keymaps = [
+        {
+          key = "<C-n>";
+          mode = [ "n" ];
+          action = "<cmd>tabnew<cr>";
+          options = {
+            silent = true;
+          };
+        }
+        {
+          key = "<leader>y";
+          mode = [ "v" ];
+          action = ''"+y''; # copy to OS clipboard
+        }
+        {
+          key = "<leader>t";
+          mode = [ "n" ];
+          action = "<cmd>NvimTreeFindFileToggle<CR>";
+        }
+        {
+          key = "gD";
+          mode = [ "n" ];
+          action = "<cmd>lua vim.lsp.buf.declaration()<CR>";
+        }
+        {
+          key = "gd";
+          mode = [ "n" ];
+          action = "<cmd>lua vim.lsp.buf.definition()<CR>";
+        }
+        {
+          key = "gr";
+          mode = [ "n" ];
+          action = "<cmd>lua vim.lsp.buf.references()<CR>";
+        }
+        {
+          key = "<leader>ff";
+          mode = [ "n" ];
+          action = "<cmd>Telescope find_files<CR>";
+        }
+        {
+          key = "<leader>fg";
+          mode = [ "n" ];
+          action = "<cmd>Telescope live_grep<CR>";
+        }
+      ];
+
+      plugins = {
+        auto-save.enable = true;
+        cmp-path.enable = true;
+        cmp-treesitter.enable = true;
+        commentary.enable = true;
+        diffview.enable = true;
+        gitblame.enable = true;
+        gitsigns.enable = true;
+        gitlinker.enable = true;
+        lualine.enable = true;
+        lsp.enable = true;
+        lsp.servers = {
+          bashls.enable = true;
+          dockerls.enable = true;
+          gopls.enable = true;
+          helm_ls.enable = true;
+          jsonls.enable = true;
+          nixd.enable = true;
+          terraformls.enable = true;
+          yamlls.enable = true;
+        };
+        lsp-format = {
+          enable = true;
+          settings = {
+            terraform = { };
+            nix = { };
+            go = { };
+          };
+        };
+        cmp.enable = true;
+        nvim-tree.enable = true;
+        rainbow-delimiters.enable = true;
+        treesitter.enable = true;
+        telescope = {
+          enable = true;
+          settings.defaults = {
+            layout_strategy = "vertical";
+            layout_config = {
+              vertical = {
+                width = 0.9;
+              };
+            };
+          };
+          package = pkgs.vimPlugins.telescope-fzy-native-nvim;
+        };
+        web-devicons.enable = true;
+      };
+      opts = {
+        autoindent = true;
+        backup = false;
+        belloff = "all";
+        completeopt = [
+          "menuone"
+          "noselect"
+        ];
+        cursorline = true;
+        expandtab = true;
+        fillchars = {
+          diff = "∙";
+          eob = " ";
+          vert = "┃";
+        };
+        hlsearch = true;
+        ignorecase = true;
+        incsearch = true;
+        modelines = 5;
+        mouse = "a";
+        number = true;
+        pumblend = 10;
+        scrolloff = 3;
+        shell = "bash";
+        shiftround = false;
+        shiftwidth = 2;
+        showbreak = "↳ ";
+        showcmd = true;
+        sidescroll = 0;
+        sidescrolloff = 3;
+        smartcase = true;
+        smarttab = true;
+        spellcapcheck = "";
+        splitbelow = true;
+        splitright = true;
+        swapfile = false;
+        switchbuf = "usetab";
+        tabstop = 2;
+        termguicolors = true;
+        wildmenu = true;
+      };
+
+      extraConfigLua = ''
+
+        -- https://github.com/orgs/community/discussions/108329
+        vim.cmd([[let g:copilot_filetypes = {'yaml': v:true}]])
+
+        vim.cmd([[let g:copilot_filetypes = {'gitcommit': v:true}]])
+
+        -- Format JSON
+        vim.cmd([[command! JsonFormat execute "::%!jq '.'"]])
+
+        -- Remember line number
+        vim.cmd([[au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif]])
+
+        -- Replace visual selection
+        vim.cmd([[vnoremap <C-r> "hy:%s/<C-r>h//g<left><left>]])
+
+        -- Indent YAML
+        vim.cmd([[au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab]])
+
+        -- Indent Python
+        vim.cmd([[au BufNewFile,BufRead *.py set tabstop=4 softtabstop=4 shiftwidth=4 textwidth=79 expandtab autoindent fileformat=unix]])
+
+        -- Highlight whitespace
+        vim.cmd([[highlight ExtraWhitespace ctermbg=red guibg=red]])
+        vim.cmd([[match ExtraWhitespace /\s\+$/]])
+
+        -- folding
+        vim.api.nvim_exec(
+        	[[
+            set foldmethod=expr
+            set foldlevel=20
+            set nofoldenable
+            set foldexpr=nvim_treesitter#foldexpr()
+        ]],
+        	true
+        )
+      '';
+    };
+
+    zed-editor = {
+      enable = stdenv.isLinux;
+      package = unstable.zed-editor;
+      extensions = [
+        "ansible"
+        "color-highlight"
+        "dockerfile"
+        "html"
+        "make"
+        "material-icon-theme"
+        "nix"
+        "toml"
+        "vue"
+      ];
+      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;
+      };
+      userKeymaps = [
+        {
+          context = "Editor && !menu";
+          bindings = {
+            "ctrl-shift-c" = "editor::Copy";
+            "ctrl-shift-x" = "editor::Cut";
+            "ctrl-shift-v" = "editor::Paste";
+            "ctrl-z" = "editor::Undo";
+          };
+        }
+      ];
+    };
+
+    firefox = {
+      enable = stdenv.isLinux;
+
+      package = pkgs.librewolf;
+
+      profiles = {
+        default = {
+          id = 0;
+          isDefault = true;
+          settings = {
+            "privacy.resistFingerprinting" = false; # breaks timezone
+            "dom.push.connection.enabled" = false;
+            "dom.push.enabled" = false;
+            "geo.enabled" = false;
+            "intl.regional_prefs.use_os_locales" = true;
+            "services.sync.prefs.sync.intl.regional._prefs.use_os_locates" = false;
+          };
+        };
+      };
+    };
+  };
+}

home/default.nix

@@ -1,474 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  hound-nvim = pkgs.vimUtils.buildVimPlugin {
-    name = "hound-nvim";
-    nativeBuildInputs = with pkgs; [lua53Packages.luacheck stylua];
-    src = pkgs.fetchFromGitHub {
-      owner = "davegallant";
-      repo = "hound.nvim";
-      rev = "e85ba4f65ece79fe6332d8a0ccc594a0d367f4ed";
-      sha256 = "sha256-fxPtixVB6dVjrxpJ1oP+eA00JSiKxWuii8pMxVeuyMY=";
-    };
-  };
-  inherit (pkgs) stdenv;
-in {
-  home.stateVersion = "23.05";
-
-  services = {
-    gpg-agent = {
-      enable = stdenv.isLinux;
-      defaultCacheTtl = 3600;
-      defaultCacheTtlSsh = 3600;
-      enableSshSupport = true;
-    };
-  };
-
-  fonts.fontconfig.enable = true;
-
-  gtk = {
-    enable = stdenv.isLinux;
-
-    iconTheme = {
-      name = "Yaru-dark";
-      package = pkgs.yaru-theme;
-    };
-    theme = {
-      name = "Yaru-Theme";
-      package = pkgs.yaru-theme;
-    };
-    cursorTheme = {
-      name = "Yaru";
-      package = pkgs.yaru-theme;
-    };
-    gtk3.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=0
-      '';
-    };
-    gtk4.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=0
-      '';
-    };
-  };
-
-  programs = {
-    home-manager.enable = true;
-
-    direnv.enable = true;
-
-    git = {
-      enable = true;
-
-      userName = "Dave Gallant";
-
-      lfs.enable = true;
-
-      aliases = {
-        aa = "add -A .";
-        br = "branch";
-        c = "commit -S";
-        ca = "commit -S --amend";
-        cane = "commit -S --amend --no-edit";
-        cb = "checkout -b";
-        co = "checkout";
-        cmp = "! git checkout main && git pl";
-        d = "diff";
-        dc = "diff --cached";
-        dcn = "diff --cached --name-only";
-        ds = "! git diff origin | sed -r 's/value: (.*)/value: \"************\"/'";
-        l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-        ms = "merge --squash";
-        p = "push origin";
-        pf = "push -f";
-        pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)";
-        st = "status";
-        wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
-      };
-
-      includes = [{path = "~/.gitconfig-work";}];
-
-      delta = {
-        enable = true;
-
-        options = {
-          features = "line-numbers decorations";
-          whitespace-error-style = "22 reverse";
-          plus-style = "green bold ul '#198214'";
-          decorations = {
-            commit-decoration-style = "bold yellow box ul";
-            file-style = "bold yellow ul";
-            file-decoration-style = "none";
-          };
-        };
-      };
-
-      extraConfig = {
-        push = {default = "current";};
-        pull = {rebase = true;};
-      };
-    };
-
-    starship = {
-      enable = true;
-      enableZshIntegration = true;
-
-      settings = {
-        add_newline = false;
-        scan_timeout = 10;
-        character = {error_symbol = "[✖](bold red)";};
-        gcloud = {
-          format = "[$symbol($project) ~ $region]($style)";
-        };
-        kubernetes = {
-          disabled = false;
-          context_aliases = {
-            ".*stg_.*" = "stg";
-            ".*test_.*" = "test";
-            ".*prd_.*" = "prd";
-          };
-        };
-      };
-    };
-
-    zsh = {
-      enable = true;
-      enableAutosuggestions = true;
-      enableCompletion = true;
-      enableSyntaxHighlighting = true;
-      history.size = 1000000;
-
-      localVariables = {
-        CASE_SENSITIVE = "true";
-        DISABLE_UNTRACKED_FILES_DIRTY = "true";
-        RPROMPT = ""; # override because macOS defaults to filepath
-        ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#838383,underline";
-        ZSH_DISABLE_COMPFIX = "true";
-      };
-
-      envExtra = ''
-        export PAGER=less
-        export EDITOR=vim
-
-        export PATH=$PATH:~/.cargo/bin
-        export PATH=$PATH:~/.local/bin
-        export PATH=$PATH:~/.npm-packages/bin
-        export PATH=$PATH:/opt/homebrew/bin
-        export PATH=$PATH:~/.krew/bin
-        export PATH=$PATH:~/bin
-        export GOPATH=~/go
-        export GOBIN=$GOPATH/bin
-        export PATH=$PATH:$GOBIN
-
-        export WINEPREFIX=~/.wine32
-
-        # homebrew for x86
-        export PATH=$PATH:/usr/local/homebrew/bin
-      '';
-
-      initExtra = ''
-        setopt noincappendhistory
-
-        source $HOME/.zsh-work
-
-        if [[ "$OSTYPE" == "darwin"* ]];
-        then
-        export PATH = "$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
-          export
-          PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
-
-        alias xdg-open=open
-        fi
-
-        # helm
-        source <(helm completion zsh)
-
-        # kubectl
-        source <(kubectl completion zsh)
-
-        # kubecolor
-        source <(kubectl completion zsh)
-        alias kubectl=kubecolor
-        # make completion work with kubecolor
-        compdef kubecolor=kubectl
-
-        pfetch
-      '';
-
-      shellAliases = {
-        ".." = "cd ..";
-        c = "code";
-        g = "git";
-        gc = "git checkout $(git branch | fzf)";
-        gco = "git checkout $(git branch -r | sed -e 's/^  origin\\///' | fzf)";
-        gr = "cd $(git rev-parse --show-toplevel)";
-        gho = "gh repo view --web >/dev/null";
-        grep = "rg --smart-case";
-        k = "kubecolor";
-        kcx = "kubectx";
-        kns = "kubens";
-        l = "exa -la --git --group-directories-first";
-        m = "make";
-        pia = "sudo openvpn --config ~/pia/$(find ~/pia -execdir basename {} .ovpn ';' -iname \"*.ovpn\" -type f | fzf --exact).ovpn --auth-user-pass ~/pia/pass";
-        ps = "procs";
-        t = "tmux-sessionizer";
-        tf = "terraform";
-        tree = "exa --tree";
-        v = "nvim";
-        nix-install = "nix-env -iA";
-        brew-x86 = "arch -x86_64 /usr/local/homebrew/bin/brew";
-      };
-
-      "oh-my-zsh" = {
-        enable = true;
-        plugins = [
-          "gitfast"
-          "last-working-dir"
-          "tmux"
-        ];
-      };
-    };
-
-    alacritty = {
-      enable = true;
-      settings = {
-        window.padding.x = 10;
-        window.padding.y = 10;
-        scrolling.history = 100000;
-        live_config_reload = true;
-        mouse.hide_when_typing = false;
-
-        font =
-          if stdenv.isLinux
-          then {
-            normal.family = "Fira Code";
-            size = 12;
-          }
-          else {
-            normal.family = "FiraCode Nerd Font";
-            size = 16;
-          };
-
-        shell = {
-          program = "zsh";
-          args = ["-l" "-c" "tmux" "u"];
-        };
-
-        colors = {
-          primary.background = "0x282828";
-          primary.foreground = "0xebdbb2";
-
-          normal = {
-            black = "0x282828";
-            red = "0xcc241d";
-            green = "0x98971a";
-            yellow = "0xd79921";
-            blue = "0x458588";
-            magenta = "0xb16286";
-            cyan = "0x689d6a";
-            white = "0xa89984";
-          };
-
-          bright = {
-            black = "0x928374";
-            red = "0xfb4934";
-            green = "0xb8bb26";
-            yellow = "0xfabd2f";
-            blue = "0x83a598";
-            magenta = "0xd3869b";
-            cyan = "0x8ec07c";
-            white = "0xebdbb2";
-          };
-
-          key_bindings = [
-            {
-              key = "Home";
-              mods = "Control";
-              action = "ResetFontSize";
-            }
-            {
-              key = "Plus";
-              mods = "Control";
-              action = "IncreaseFontSize";
-            }
-            {
-              key = "Minus";
-              mods = "Control";
-              action = "DecreaseFontSize";
-            }
-          ];
-        };
-      };
-    };
-
-    autojump = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    go = {
-      enable = true;
-    };
-
-    tmux = {
-      enable = true;
-      clock24 = true;
-      terminal = "xterm-256color";
-      customPaneNavigationAndResize = true;
-      plugins = with pkgs.tmuxPlugins; [
-        {
-          plugin = pain-control;
-          extraConfig = "set -g @plugin 'tmux-plugins/tmux-pain-control'";
-        }
-        {
-          plugin = sensible;
-          extraConfig = "set -g @plugin 'tmux-plugins/tmux-sensible'";
-        }
-        {
-          plugin = sessionist;
-          extraConfig = "set -g @plugin 'tmux-plugins/tmux-sessionist'";
-        }
-        {
-          plugin = yank;
-          extraConfig = "set -g @plugin 'tmux-plugins/tmux-yank'";
-        }
-        {
-          plugin = sensible;
-          extraConfig = "set -g @plugin 'tmux-plugins/tmux-sensible'";
-        }
-        {
-          plugin = tmux-colors-solarized;
-          extraConfig = ''
-            set -g @plugin 'seebi/tmux-colors-solarized'
-            set -g @colors-solarized 'dark'
-          '';
-        }
-        {
-          plugin = resurrect;
-          extraConfig = ''
-            set -g @plugin 'tmux-plugins/tmux-resurrect'
-          '';
-        }
-        {
-          plugin = continuum;
-          extraConfig = ''
-            set -g @plugin 'tmux-plugins/tmux-continuum'
-            set -g @continuum-restore 'on'
-          '';
-        }
-      ];
-      extraConfig = ''
-        set-window-option -g automatic-rename on
-        set-option -g set-titles on
-
-        set -g mouse on
-
-        set -g status-left-length 30
-        set -g status-right-length 150
-
-        set -g xterm-keys on
-
-        set -g pane-border-status top
-
-        set -g set-titles on
-        set -g display-panes-time 800
-        set -g display-time 2000
-
-        set -q -g utf8 on
-
-        set -g monitor-activity on
-        set -g visual-activity off
-
-        set -g status-right '#(gitmux #{pane_current_path})'
-
-      '';
-    };
-
-    fzf = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    neovim = {
-      enable = true;
-      viAlias = true;
-      vimAlias = true;
-
-      # home-manager doesn't yet support `init.lua`
-      extraConfig = "lua require('init')";
-
-      plugins = with pkgs.vimPlugins; [
-        cmp-nvim-lsp
-        cmp-path
-        cmp-treesitter
-        diffview-nvim
-        git-blame-nvim
-        gitsigns-nvim
-        gruvbox-nvim
-        lualine-nvim
-        luasnip
-        nvim-cmp
-        nvim-lspconfig
-        nvim-tree-lua
-        nvim-treesitter.withAllGrammars
-        nvim-ts-rainbow
-        nvim-web-devicons
-        plenary-nvim
-        telescope-fzy-native-nvim
-        vim-commentary
-        vim-markdown
-        vim-repeat
-        vim-sneak
-        vim-surround
-      ];
-    };
-
-    vscode = {
-      enable = true;
-      extensions = with pkgs.vscode-extensions;
-        [
-          bbenoist.nix
-          github.vscode-pull-request-github
-          golang.go
-          hashicorp.terraform
-          ms-dotnettools.csharp
-          ms-kubernetes-tools.vscode-kubernetes-tools
-          redhat.vscode-yaml
-        ]
-        ++ lib.optionals stdenv.isLinux [
-          ms-vsliveshare.vsliveshare
-          # ms-python.python
-        ];
-    };
-
-    firefox = {
-      enable = stdenv.isLinux;
-
-      package = pkgs.firefox-devedition-bin;
-
-      profiles = {
-        default = {
-          id = 0;
-          isDefault = true;
-          settings = {
-            "privacy.resistFingerprinting" = true;
-          };
-          name = "dev-edition-default";
-          path = "6b7pm104.dev-edition-default";
-        };
-      };
-    };
-  };
-
-  home.file = {
-    ".config/nvim/lua".source = ./nvim/lua;
-    ".aws/config".source = ./.aws/config;
-  };
-
-  home.file.".config/autostart/albert.desktop" = lib.mkIf stdenv.isLinux {
-    source = pkgs.albert + "/share/applications/albert.desktop";
-  };
-}

home/nvim/lua/init.lua

@@ -1,308 +0,0 @@
------------------------------------------------------------------------------
--- Options {{{1 ---------------------------------------------------------------
--------------------------------------------------------------------------------
-vim.opt.autoindent = true
-vim.opt.backup = false
-vim.opt.belloff = "all"
-vim.opt.completeopt = "menuone"
-vim.opt.completeopt = vim.opt.completeopt + "noselect"
-vim.opt.cursorline = true
-vim.opt.expandtab = true
-vim.opt.fillchars = {
-	diff = "∙",
-	eob = " ",
-	vert = "┃",
-}
-vim.opt.hlsearch = true
-vim.opt.ignorecase = true
-vim.opt.incsearch = true
-vim.opt.modelines = 5
-vim.opt.mouse = "a"
-vim.opt.number = true
-vim.opt.pumblend = 10
-vim.opt.scrolloff = 3
-vim.opt.shell = "bash"
-vim.opt.shiftround = false
-vim.opt.shiftwidth = 2
-vim.opt.shortmess = vim.opt.shortmess + "A"
-vim.opt.shortmess = vim.opt.shortmess + "I"
-vim.opt.shortmess = vim.opt.shortmess + "O"
-vim.opt.shortmess = vim.opt.shortmess + "T"
-vim.opt.shortmess = vim.opt.shortmess + "W"
-vim.opt.shortmess = vim.opt.shortmess + "a"
-vim.opt.shortmess = vim.opt.shortmess + "c"
-vim.opt.shortmess = vim.opt.shortmess + "o"
-vim.opt.shortmess = vim.opt.shortmess + "t"
-vim.opt.showbreak = "↳ "
-vim.opt.showcmd = true
-vim.opt.sidescroll = 0
-vim.opt.sidescrolloff = 3
-vim.opt.smartcase = true
-vim.opt.smarttab = true
-vim.opt.spellcapcheck = ""
-vim.opt.splitbelow = true
-vim.opt.splitright = true
-vim.opt.swapfile = false
-vim.opt.switchbuf = "usetab"
-vim.opt.tabstop = 2
-vim.opt.termguicolors = true
-vim.opt.wildmenu = true
-
--- Format JSON
-vim.cmd([[command! JsonFormat execute "::%!jq '.'"]])
-
--- Tab shortcuts
-vim.api.nvim_set_keymap("n", "<C-n>", "<cmd>tabnew<cr>", { noremap = true })
-
--- Copy to OS clipboard
-vim.api.nvim_set_keymap("v", "<leader>y", '"+y', { noremap = true })
-
--- Folding
-vim.api.nvim_set_keymap("n", "<space>", "za", { silent = true, noremap = true })
-
--- Map gx to xdg-open
-vim.api.nvim_set_keymap(
-	"n",
-	"gx",
-	":execute 'silent! !xdg-open ' . shellescape(expand('<cWORD>'), 1)<cr>",
-	{ silent = true, noremap = true }
-)
-
--- Remember line number
-vim.cmd([[au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif]])
-
--- Replace visual selection
-vim.cmd([[vnoremap <C-r> "hy:%s/<C-r>h//g<left><left>]])
-
--- Indent YAML
-vim.cmd([[au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab]])
-
--- Indent Python
-vim.cmd([[au BufNewFile,BufRead *.py set tabstop=4 softtabstop=4 shiftwidth=4 textwidth=79 expandtab autoindent fileformat=unix]])
-
--- Highlight whitespace
-vim.cmd([[highlight ExtraWhitespace ctermbg=red guibg=red]])
-vim.cmd([[match ExtraWhitespace /\s\+$/]])
-
--------------------------------------------------------------------------------
--- LSP {{{1 -------------------------------------------------------------------
--------------------------------------------------------------------------------
--- See `:help vim.lsp.*` for documentation on any of the below functions
-
-local opts = { noremap=true, silent=true }
-vim.api.nvim_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
-vim.api.nvim_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
-vim.api.nvim_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
-vim.api.nvim_set_keymap("n", "<space>", "za", { silent = true, noremap = true })
-
--------------------------------------------------------------------------------
--- packer {{{1 -------------------------------------------------------------------
--------------------------------------------------------------------------------
--- require("packer").startup(function()
---   use({ "MunifTanjim/nui.nvim" })
---   use({ "dpayne/CodeGPT.nvim" })
--- end)
-
--------------------------------------------------------------------------------
--- completion {{{1 -------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-local has_words_before = function()
-  local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-  return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-end
-
-local luasnip = require("luasnip")
-local cmp = require("cmp")
-
-cmp.setup {
-  sources = {
-    { name = 'nvim_lsp' },
-    { name = 'path' },
-    { name = 'treesitter' },
-  },
-  preselect = cmp.PreselectMode.None,
-  mapping = {
-    ["<Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif luasnip.expand_or_jumpable() then
-        luasnip.expand_or_jump()
-      elseif has_words_before() then
-        cmp.complete()
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-
-    ["<S-Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif luasnip.jumpable(-1) then
-        luasnip.jump(-1)
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-  }
-}
-
--------------------------------------------------------------------------------
--- lsp {{{1 -------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-local lspconfig = require "lspconfig"
-
-local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
-
-lspconfig.ansiblels.setup({
-  capabilities = capabilities,
-  cmd = {os.getenv("HOME") .. "/.npm-packages/bin/ansible-language-server", "--stdio"};
-})
-
-lspconfig.bashls.setup({
-  capabilities = capabilities,
-})
-
-lspconfig.gopls.setup({
-  capabilities = capabilities,
-})
-
--- lspconfig.lua_ls.setup({
---   capabilities = capabilities,
---   settings = {
---     Lua = {
---       diagnostics = {
---         globals = { 'vim' }
---       }
---     }
---   }
--- })
-
-lspconfig.pyright.setup({
-  capabilities = capabilities,
-})
-
-lspconfig.rls.setup({
-  capabilities = capabilities,
-})
-
-lspconfig.rnix.setup({
-  capabilities = capabilities,
-})
-
-lspconfig.solargraph.setup({
-  capabilities = capabilities,
-})
-
-lspconfig.terraformls.setup({
-  filetypes={"terraform","tf","hcl"},
-  capabilities = capabilities,
-})
-
-lspconfig.tflint.setup({
-  capabilities = capabilities,
-})
-
-lspconfig.yamlls.setup({
-  capabilities = capabilities,
-})
-
-require'luasnip'.filetype_extend("go", {"go"})
-require'luasnip'.filetype_extend("ruby", {"rails"})
-
--------------------------------------------------------------------------------
--- Plugins {{{1 ---------------------------------------------------------------
--------------------------------------------------------------------------------
-
--- status line
-require("lualine").setup({
-	options = {
-		theme = "gruvbox",
-	},
-})
-
--- nvim-telescope
-require('telescope').setup({
-  defaults = {
-    layout_strategy='vertical',
-    layout_config = {
-      vertical = { width = 0.9 }
-    },
-  },
-})
-
--- nvim-tree
-require'nvim-tree'.setup {}
-
--- gitsigns
-require('gitsigns').setup()
-
--- treesitter
-require("nvim-treesitter.configs").setup({
-  ensure_installed = {},
-
-	highlight = {
-		enable = true,
-	},
-
-	indent = {
-		enable = true,
-	},
-
-	rainbow = {
-		enable = true,
-		extended_mode = true,
-	},
-})
-
--- folding
-vim.api.nvim_exec(
-	[[
-    set foldmethod=expr
-    set foldlevel=20
-    set nofoldenable
-    set foldexpr=nvim_treesitter#foldexpr()
-]],
-	true
-)
-
--- vim-markdown
-vim.g.vim_markdown_override_foldtext = 0
-vim.g.vim_markdown_no_default_key_mappings = 1
-vim.g.vim_markdown_emphasis_multiline = 0
-vim.g.vim_markdown_conceal = 0
-vim.g.vim_markdown_frontmatter = 1
-vim.g.vim_markdown_new_list_item_indent = 0
-
--- vim-prettier
-vim.g["prettier#autoformat"] = 1
-
--- git-blame
-vim.g.gitblame_enabled = 1
-
-vim.api.nvim_set_keymap("n", "<leader>ff", "<cmd>Telescope find_files find_command=rg,--ignore,--hidden,--files,-g,!.git prompt_prefix=🔍<cr>", { silent = true, noremap = true })
-vim.api.nvim_set_keymap("n", "<leader>fg", "<cmd>Telescope live_grep<cr>", { silent = true, noremap = true })
-
--- NvimTree
-vim.api.nvim_set_keymap("n", "<leader>n", "<cmd>NvimTreeToggle<cr>", { noremap = true })
-vim.api.nvim_set_keymap("n", "<leader>r", "<cmd>NvimTreeRefresh<cr>", { noremap = true })
-vim.api.nvim_set_keymap("n", "<leader>nf", "<cmd>NvimTreeFindFile<cr>", { noremap = true })
-
---Set colorscheme
-vim.o.termguicolors = true
-vim.cmd([[colorscheme gruvbox]])

hosts/hephaestus.nix

@@ -0,0 +1,482 @@
+{
+
+  config,
+  lib,
+  inputs,
+  master,
+  modulesPath,
+  pkgs,
+  unstable,
+  vpngate,
+  ...
+}:
+{
+
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  security.sudo-rs = {
+    enable = true;
+    execWheelOnly = true;
+    wheelNeedsPassword = true;
+  };
+
+  boot = {
+    kernelModules = [
+      "kvm-amd"
+    ];
+    kernelPackages = pkgs.linuxPackages;
+    kernelParams = [
+      "amd_iommu=on"
+    ];
+
+    loader = {
+      efi.canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot/efi";
+      grub = {
+        enable = true;
+        device = "nodev";
+        efiSupport = true;
+        enableCryptodisk = true;
+      };
+    };
+
+    supportedFilesystems = [
+      "ntfs"
+    ];
+
+    initrd = {
+      availableKernelModules = [
+        "ahci"
+        "nvme"
+        "sd_mod"
+        "usb_storage"
+        "usbhid"
+        "xhci_pci"
+      ];
+      luks.devices."root" = {
+        allowDiscards = true;
+        device = "/dev/disk/by-uuid/89a14ac5-7723-4a0a-bb95-fb2fb2e92160";
+        preLVM = true;
+        keyFile = "./keyfile0.bin";
+      };
+      secrets = {
+        "keyfile0.bin" = "/etc/secrets/initrd/keyfile0.bin";
+      };
+    };
+  };
+
+  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";
+      fsType = "ext4";
+    };
+    "/boot/efi" = {
+      device = "/dev/disk/by-uuid/F1BD-5227";
+      fsType = "vfat";
+    };
+    "/mnt/synology-2b/media" = {
+      device = "192.168.1.178:/volume1/Media";
+      fsType = "nfs";
+    };
+    "/mnt/truenas/home/backups" = {
+      device = "192.168.1.132:/mnt/wd4t/data/home/backup/";
+      fsType = "nfs";
+    };
+  };
+
+  fonts.packages = with pkgs; [
+    dejavu_fonts
+    fira-mono
+    font-awesome
+    liberation_ttf
+    nerd-fonts.droid-sans-mono
+    nerd-fonts.fira-code
+    nerd-fonts.symbols-only
+    nerd-fonts.ubuntu
+    nerd-fonts.ubuntu-mono
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-color-emoji
+    noto-fonts
+  ];
+
+  fonts.fontconfig.defaultFonts = {
+    sansSerif = [ "Noto Sans" ];
+    serif = [ "Noto Serif" ];
+    monospace = [ "Noto Sans Mono" ];
+    emoji = [ "Noto Color Emoji" ];
+  };
+
+  nixpkgs = {
+    hostPlatform = "x86_64-linux";
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  networking = {
+    iproute2.enable = true;
+    hostName = "hephaestus";
+    hostId = "0e8aad53";
+    interfaces."enp34s0" = {
+      useDHCP = true;
+      wakeOnLan = {
+        enable = true;
+        policy = [ "magic" ];
+      };
+    };
+    firewall = {
+      allowPing = false;
+      enable = true;
+      checkReversePath = "loose";
+      trustedInterfaces = [ "tailscale0" ];
+    };
+  };
+
+  users.users.beszel = {
+    isSystemUser = true;
+    group = "beszel";
+    description = "Beszel Agent service user";
+  };
+  users.groups.beszel = { };
+
+  systemd.services = {
+    NetworkManager-wait-online.enable = false;
+
+    beszel-agent = {
+      description = "Beszel Agent Service";
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Environment = [
+          "PORT=45876"
+          ''KEY="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEaNtnkc+3+fJU+bTO6fibID9FHgFjei0sjJNqvcYtG8"''
+        ];
+        ExecStart = "${lib.getBin unstable.beszel}/bin/beszel-agent";
+        User = "beszel";
+        Restart = "always";
+        RestartSec = 5;
+      };
+    };
+  };
+
+  services = {
+     mullvad-vpn = {
+       enable = true;
+       package = pkgs.mullvad-vpn;
+     };
+  };
+
+  system = {
+    autoUpgrade.enable = true;
+    stateVersion = "25.11";
+    activationScripts = {
+      diff = {
+        supportsDryActivation = true;
+        text = ''
+          if [[ -e /run/current-system ]]; then
+            echo -e "\e[36mPackage version diffs:\e[0m"
+            ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
+          fi
+        '';
+      };
+    };
+  };
+
+  nix = {
+    extraOptions = "experimental-features = nix-command flakes";
+    settings.trusted-users = [ "root" "@wheel" ];
+  };
+
+  users.users.dave = {
+    isNormalUser = true;
+    extraGroups = [
+      "wheel"
+      "libvirtd"
+    ];
+    shell = pkgs.fish;
+  };
+
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.inputMethod = {
+    enable = true;
+    type = "ibus";
+    ibus.engines = with pkgs.ibus-engines; [ anthy ];
+  };
+
+  time.timeZone = "America/Toronto";
+
+  hardware.bluetooth.enable = true;
+
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  documentation.man.generateCaches = false;
+
+  programs = {
+    fish.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+    kdeconnect.enable = true;
+    nix-ld.enable = true;
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+    };
+  };
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    publish = {
+      enable = true;
+      addresses = true;
+      domain = true;
+      hinfo = true;
+      userServices = true;
+      workstation = true;
+    };
+  };
+
+  services = {
+    desktopManager.plasma6.enable = true;
+    displayManager.sddm.enable = true;
+    displayManager.sddm.wayland.enable = true;
+  };
+
+  services.printing.enable = true;
+
+  services.resolved.enable = true;
+
+  services.sshd.enable = true;
+
+  services.tailscale = {
+    enable = true;
+    package = unstable.tailscale;
+  };
+
+  services.clamav.daemon.enable = true;
+  services.clamav.updater.enable = true;
+
+  services.opensnitch = {
+    enable = true;
+    rules = {
+      avahi-ipv4 = {
+        name = "Allow avahi daemon IPv4";
+        enabled = true;
+        action = "allow";
+        duration = "always";
+        operator = {
+          type = "list";
+          operand = "list";
+          list = [
+            {
+              type = "simple";
+              operand = "process.path";
+              sensitive = false;
+              data = "${lib.getBin pkgs.avahi}/bin/avahi-daemon";
+            }
+            {
+              type = "network";
+              operand = "dest.network";
+              data = "224.0.0.0/24";
+            }
+          ];
+        };
+      };
+      systemd-timesyncd = {
+        name = "systemd-timesyncd";
+        enabled = true;
+        action = "allow";
+        duration = "always";
+        operator = {
+          type = "simple";
+          sensitive = false;
+          operand = "process.path";
+          data = "${lib.getBin pkgs.systemd}/lib/systemd/systemd-timesyncd";
+        };
+      };
+      systemd-resolved = {
+        name = "systemd-resolved";
+        enabled = true;
+        action = "allow";
+        duration = "always";
+        operator = {
+          type = "simple";
+          sensitive = false;
+          operand = "process.path";
+          data = "${lib.getBin pkgs.systemd}/lib/systemd/systemd-resolved";
+        };
+      };
+      localhost = {
+        name = "Allow all localhost";
+        enabled = true;
+        action = "allow";
+        duration = "always";
+        operator = {
+          type = "regexp";
+          operand = "dest.ip";
+          sensitive = false;
+          data = "^(127\\.0\\.0\\.1|::1)$";
+          list = [ ];
+        };
+      };
+      nix-update = {
+        name = "Allow Nix";
+        enabled = true;
+        action = "allow";
+        duration = "always";
+        operator = {
+          type = "list";
+          operand = "list";
+          list = [
+            {
+              type = "simple";
+              sensitive = false;
+              operand = "process.path";
+              data = "${lib.getBin pkgs.nix}/bin/nix";
+            }
+            {
+              type = "regexp";
+              operand = "dest.host";
+              sensitive = false;
+              data = "^(([a-z0-9|-]+\\.)*github\\.com|([a-z0-9|-]+\\.)*nixos\\.org)$";
+            }
+          ];
+        };
+      };
+      NetworkManager = {
+        name = "Allow NetworkManager";
+        enabled = true;
+        action = "allow";
+        duration = "always";
+        operator = {
+          type = "list";
+          operand = "list";
+          list = [
+            {
+              type = "simple";
+              sensitive = false;
+              operand = "process.path";
+              data = "${lib.getBin pkgs.networkmanager}/bin/NetworkManager";
+            }
+            {
+              type = "simple";
+              operand = "dest.port";
+              sensitive = false;
+              data = "67";
+            }
+            {
+              type = "simple";
+              operand = "protocol";
+              sensitive = false;
+              data = "udp";
+            }
+          ];
+        };
+      };
+      ssh-github = {
+        name = "Allow SSH to github";
+        enabled = true;
+        action = "allow";
+        duration = "always";
+        operator = {
+          type = "list";
+          operand = "list";
+          list = [
+            {
+              type = "simple";
+              sensitive = false;
+              operand = "process.path";
+              data = "${lib.getBin pkgs.openssh}/bin/ssh";
+            }
+            {
+              type = "simple";
+              operand = "dest.host";
+              sensitive = false;
+              data = "github.com";
+            }
+          ];
+        };
+      };
+    };
+  };
+
+  virtualisation = {
+    podman.enable = true;
+    libvirtd = {
+      enable = true;
+      qemu.swtpm.enable = true;
+    };
+  };
+}

hosts/zelus.nix

@@ -0,0 +1,130 @@
+{ pkgs, ... }:
+{
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  networking = {
+    hostName = "zelus";
+  };
+
+  nix.enable = false;
+
+  system.stateVersion = 4;
+
+  users.users."dave.gallant".home = "/Users/dave.gallant";
+  users.users."dave.gallant".shell = pkgs.fish;
+
+  programs.fish.enable = true;
+
+  system.primaryUser = "dave.gallant";
+
+  system.defaults = {
+
+    trackpad = {
+      ActuationStrength = 0;
+      Clicking = true;
+      FirstClickThreshold = 1;
+      SecondClickThreshold = 1;
+      TrackpadRightClick = true;
+    };
+
+    dock = {
+      autohide = true;
+      tilesize = 50;
+      orientation = "bottom";
+      persistent-apps = [
+        "/Applications/iTerm.app"
+        "/Applications/Google Chrome.app"
+        "/Applications/LibreWolf.app"
+        "/Applications/Obsidian.app"
+        "/Applications/Slack.app"
+        "/Applications/zoom.us.app"
+      ];
+    };
+
+    NSGlobalDomain.AppleShowAllExtensions = true;
+    NSGlobalDomain.AppleShowScrollBars = "Always";
+    NSGlobalDomain.NSUseAnimatedFocusRing = false;
+    NSGlobalDomain.NSNavPanelExpandedStateForSaveMode = true;
+    NSGlobalDomain.NSNavPanelExpandedStateForSaveMode2 = true;
+    NSGlobalDomain.PMPrintingExpandedStateForPrint = true;
+    NSGlobalDomain.PMPrintingExpandedStateForPrint2 = true;
+    NSGlobalDomain.NSDocumentSaveNewDocumentsToCloud = false;
+    NSGlobalDomain.ApplePressAndHoldEnabled = false;
+    NSGlobalDomain.InitialKeyRepeat = 25;
+    NSGlobalDomain.KeyRepeat = 2;
+    NSGlobalDomain."com.apple.mouse.tapBehavior" = 1;
+    NSGlobalDomain.NSWindowShouldDragOnGesture = true;
+    NSGlobalDomain.NSAutomaticSpellingCorrectionEnabled = false;
+    LaunchServices.LSQuarantine = false; # disables "Are you sure?" for new apps
+    loginwindow.GuestEnabled = false;
+    finder.FXPreferredViewStyle = "Nlsv";
+  };
+
+  security.pam.services.sudo_local.touchIdAuth = true;
+
+  homebrew = {
+    enable = true;
+    onActivation = {
+      cleanup = "zap";
+      autoUpdate = true;
+      upgrade = true;
+    };
+    global = {
+      brewfile = true;
+    };
+
+    brews = [
+      "argocd"
+      "azure-cli"
+      "coreutils"
+      "gnu-sed"
+      "gnu-tar"
+      "k6"
+      "node"
+      "oras"
+      "vault"
+    ];
+
+    casks = [
+      "claude-code"
+      "discord"
+      "dbeaver-community"
+      "font-fira-code-nerd-font"
+      "font-hack-nerd-font"
+      "fork"
+      "freelens"
+      "iterm2"
+      "karabiner-elements"
+      "knockknock"
+      "librewolf"
+      "lulu"
+      "notunes"
+      "obsidian"
+      "raycast"
+      "rectangle"
+      "signal"
+      "slack"
+      "spotify"
+      "stats"
+      "steam"
+      "taskexplorer"
+      "tailscale-app"
+      "vlc"
+      "whisky"
+      "zed"
+    ];
+
+    taps = [
+      "hashicorp/tap"
+      "homebrew/bundle"
+      "homebrew/cask-fonts"
+      "homebrew/cask-versions"
+      "homebrew/services"
+    ];
+  };
+
+}

justfile

@@ -0,0 +1,33 @@
+set export
+
+alias u := update
+alias r := rebuild
+
+arch := `uname -s`
+
+cmd := if arch == "Linux" { "nixos-rebuild --sudo" } else { "sudo darwin-rebuild" }
+
+rebuild:
+  $cmd switch --flake .
+
+rebuild-boot:
+  $cmd boot --flake . --install-bootloader
+
+rollback:
+  sudo $cmd switch --rollback --flake .
+
+channel-update:
+  nix-channel --update
+  sudo nix-channel --update
+
+update:
+  @./update-flake.sh
+
+fmt:
+  nixfmt *.nix
+
+clean:
+  echo 'Cleaning user...'
+  nix-collect-garbage -d
+  echo 'Cleaning root...'
+  sudo nix-collect-garbage -d

modules/common/darwin.nix

@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  nix.extraOptions = "experimental-features = nix-command flakes";
-}

modules/common/fonts.nix

@@ -1,24 +0,0 @@
-{pkgs, ...}: {
-  # Set system-wide fonts.
-  fonts.fonts = with pkgs; [
-    dejavu_fonts
-    fira-code
-    fira-code-symbols
-    fira-mono
-    font-awesome
-    google-fonts
-    liberation_ttf
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    noto-fonts-extra
-  ];
-
-  # Set default fonts.
-  fonts.fontconfig.defaultFonts = {
-    sansSerif = ["Noto Sans"];
-    serif = ["Noto Serif"];
-    monospace = ["Noto Sans Mono"];
-    emoji = ["Noto Color Emoji"];
-  };
-}

modules/common/linux-desktop.nix

@@ -1,31 +0,0 @@
-{...}: {
-  services.xserver = {
-    enable = true;
-    displayManager = {
-      gdm = {
-        enable = true;
-        wayland = false;
-      };
-    };
-    desktopManager = {
-      gnome = {
-        enable = true;
-      };
-    };
-  };
-
-  services.gnome.gnome-keyring.enable = true;
-
-  services.avahi = {
-    enable = true;
-    nssmdns = true;
-    publish = {
-      enable = true;
-      addresses = true;
-      domain = true;
-      hinfo = true;
-      userServices = true;
-      workstation = true;
-    };
-  };
-}

modules/common/linux.nix

@@ -1,58 +0,0 @@
-{pkgs, ...}: {
-  boot.kernelPackages = pkgs.linuxPackages;
-  boot.supportedFilesystems = ["ntfs"];
-
-  system.stateVersion = "23.05";
-
-  system.autoUpgrade.enable = true;
-
-  # See: https://github.com/NixOS/nixpkgs/issues/180175
-  systemd.services.NetworkManager-wait-online.enable = false;
-
-  nix.extraOptions = "experimental-features = nix-command flakes";
-  nix.package = pkgs.nixUnstable;
-
-  users.users.dave = {
-    isNormalUser = true;
-    extraGroups = ["docker" "wheel" "libvirtd" "corectrl"];
-    shell = pkgs.zsh;
-  };
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
-  time.timeZone = "America/Toronto";
-
-  sound.enable = true;
-
-  hardware.pulseaudio.enable = true;
-
-  # Enable Vulkan
-  hardware.opengl.driSupport = true;
-  hardware.opengl.driSupport32Bit = true;
-
-  # Enable Steam
-  hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [libva];
-  hardware.pulseaudio.support32Bit = true;
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
-
-  virtualisation.docker.enable = true;
-  virtualisation.libvirtd.enable = true;
-
-  virtualisation.podman.enable = true;
-
-  programs.zsh.enable = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-  programs.corectrl.enable = true;
-}

modules/common/networking.nix

@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  services.tailscale.enable = true;
-
-  networking = {
-    firewall = {
-      allowPing = false;
-      enable = true;
-      checkReversePath = "loose";
-      trustedInterfaces = ["tailscale0"];
-    };
-  };
-}

modules/common/printing.nix

@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  services.printing.enable = true;
-}

modules/darwin/brew.nix

@@ -1,60 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  checkBrew = "command -v brew > /dev/null";
-in {
-  environment = {
-    extraInit = ''
-      ${checkBrew} || >&2 echo "brew is not installed (install it via https://brew.sh)"
-    '';
-  };
-
-  homebrew = {
-    enable = true;
-    onActivation.autoUpdate = false;
-    onActivation.upgrade = false;
-    global = {
-      brewfile = true;
-    };
-
-    brews = [
-      "azure-cli"
-      "coreutils"
-      "gnu-sed"
-      "gnu-tar"
-      "helm"
-      "netdata"
-      "node"
-      "podman"
-      "podman-compose"
-    ];
-
-    casks = [
-      "dbeaver-community"
-      "font-fira-code-nerd-font"
-      "font-hack-nerd-font"
-      "karabiner-elements"
-      "lulu"
-      "notunes"
-      "podman-desktop"
-      "postman"
-      "raycast"
-      "rectangle"
-      "stats"
-      "visual-studio-code"
-    ];
-
-    taps = [
-      "azure/bicep"
-      "homebrew/bundle"
-      "homebrew/cask"
-      "homebrew/cask-fonts"
-      "homebrew/cask-versions"
-      "homebrew/core"
-      "homebrew/services"
-    ];
-  };
-}

modules/darwin/default.nix

@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  users.users."dave.gallant".home = "/Users/dave.gallant";
-  imports = [
-    ./brew.nix
-    ./preferences.nix
-  ];
-}

modules/darwin/preferences.nix

@@ -1,57 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  system.defaults = {
-    loginwindow = {
-      GuestEnabled = false;
-      SHOWFULLNAME = false;
-    };
-
-    finder = {
-      AppleShowAllExtensions = true;
-      FXEnableExtensionChangeWarning = true;
-      _FXShowPosixPathInTitle = true;
-    };
-
-    trackpad = {
-      ActuationStrength = 0;
-      Clicking = true;
-      FirstClickThreshold = 1;
-      SecondClickThreshold = 1;
-      TrackpadRightClick = false;
-    };
-
-    # firewall
-    alf = {
-      # 0 = disabled 1 = enabled 2 = blocks all connections except for essential services
-      globalstate = 1;
-      loggingenabled = 0;
-      stealthenabled = 1;
-    };
-
-    dock = {
-      autohide = true;
-      autohide-delay = 0.0;
-      autohide-time-modifier = 1.0;
-      tilesize = 50;
-      static-only = false;
-      showhidden = false;
-      show-recents = false;
-      show-process-indicators = true;
-      orientation = "bottom";
-      mru-spaces = false;
-    };
-
-    NSGlobalDomain = {
-      "com.apple.sound.beep.feedback" = 0;
-      "com.apple.sound.beep.volume" = 0.000;
-      ApplePressAndHoldEnabled = false;
-      InitialKeyRepeat = 10;
-      KeyRepeat = 2;
-      AppleShowAllExtensions = true;
-      AppleShowScrollBars = "Automatic";
-    };
-  };
-}

modules/machines/aether/configuration.nix

@@ -1,43 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  modulesPath,
-  ...
-}:
-with lib; let
-  nixos-wsl = import ./nixos-wsl;
-in {
-  imports = [
-    "${modulesPath}/profiles/minimal.nix"
-    ./nix-ld-config.nix
-
-    nixos-wsl.nixosModules.wsl
-  ];
-
-  nix-ld-config.enable = true;
-
-  nixpkgs.config.allowUnfree = true;
-
-  system.stateVersion = "unstable";
-
-  networking = {hostName = "aether";};
-
-  wsl = {
-    enable = true;
-    automountPath = "/mnt";
-    defaultUser = "dave";
-    startMenuLaunchers = true;
-
-    # Enable integration with Docker Desktop
-    docker.enable = true;
-
-    tailscale.enable = true;
-  };
-
-  # Enable nix flakes
-  nix.package = pkgs.nixVersions.stable;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-}

modules/machines/aether/nix-ld-config.nix

@@ -1,31 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.nix-ld-config;
-  ldEnv = {
-    NIX_LD_LIBRARY_PATH = with pkgs;
-      makeLibraryPath [
-        stdenv.cc.cc
-      ];
-    NIX_LD = removeSuffix "\n" (builtins.readFile "${pkgs.stdenv.cc}/nix-support/dynamic-linker");
-  };
-  ldExports = mapAttrsToList (name: value: "export ${name}=${value}") ldEnv;
-  joinedLdExports = concatStringsSep "\n" ldExports;
-in {
-  options.nix-ld-config = {
-    enable = mkEnableOption "nix-ld config module";
-    user = mkOption {
-      type = types.str;
-      description = "The name of user you want to configure for using VSCode's Remote WSL extension.";
-      default = "dave";
-    };
-  };
-  config = mkIf cfg.enable {
-    environment.variables = ldEnv;
-    home-manager.users.${cfg.user}.home.file.".vscode-server/server-env-setup".text = joinedLdExports;
-  };
-}

modules/machines/aether/nixos-wsl/.envrc

@@ -1,7 +0,0 @@
-use_flake() {
-    watch_file flake.nix
-    watch_file flake.lock
-    eval "$(nix print-dev-env)"
-}
-
-use flake

modules/machines/aether/nixos-wsl/.github/release-drafter.yml

@@ -1,17 +0,0 @@
-change-template: "* $TITLE (#$NUMBER) @$AUTHOR"
-categories:
-  - title: '🚀 Features'
-    labels:
-      - enhancement
-  - title: "🪲 Bugfixes"
-    labels:
-      - bug
-  - title: "📖 Documentation"
-    labels:
-      - documentation
-template: |
-    # Changelog
-
-    ## 🛠️ General Changes
-
-    $CHANGES

modules/machines/aether/nixos-wsl/.github/workflows/main.yml

@@ -1,70 +0,0 @@
-name: 'Build NixOS WSL tarball'
-
-on: [push, pull_request, release]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          # Nix Flakes doesn't work on shallow clones
-          fetch-depth: 0
-
-      - name: Install nix
-        uses: cachix/install-nix-action@v12
-        with:
-          install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
-          # Configure Nix to enable flakes
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-
-      - name: Run checks
-        run: |
-          nix flake check
-
-      - name: Build tarball
-        run: |
-          nix build '.#nixosConfigurations.mysystem.config.system.build.tarball'
-
-      - name: Upload tarball
-        uses: actions/upload-artifact@v2
-        with:
-          name: rootfs
-          path: result/tarball/nixos-wsl-x86_64-linux.tar.gz
-
-      - name: Build installer
-        run: |
-          nix build '.#nixosConfigurations.mysystem.config.system.build.installer'
-
-      - name: Upload installer
-        uses: actions/upload-artifact@v2
-        with:
-          name: installer
-          path: result/tarball/nixos-wsl-installer.tar.gz
-
-  release:
-    if: startsWith(github.ref, 'refs/tags/')
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - uses: actions/download-artifact@v2
-        with:
-          name: rootfs
-
-      - uses: actions/download-artifact@v2
-        with:
-          name: installer
-
-      - name: Attach to release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            nixos-wsl-x86_64-linux.tar.gz
-            nixos-wsl-installer.tar.gz
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

modules/machines/aether/nixos-wsl/.github/workflows/release-drafter.yml

@@ -1,19 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-   branches:
-    - main
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      -
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

modules/machines/aether/nixos-wsl/.github/workflows/update-flakes.yml

@@ -1,50 +0,0 @@
-name: 'Update flakes'
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 2 * * 0'
-
-jobs:
-  update-flakes:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          # Nix Flakes doesn't work on shallow clones
-          fetch-depth: 0
-
-      - name: Install nix
-        uses: cachix/install-nix-action@v12
-        with:
-          install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
-          # Configure Nix to enable flakes
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-
-      - name: Update flakes
-        run: nix flake update --recreate-lock-file
-
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v3
-        with:
-          commit-message: Update flakes
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          signoff: false
-          branch: flake-updates
-          delete-branch: true
-          title: 'Update flakes'
-          body: |
-            Update report
-            - Updated with *today's* date
-            - Auto-generated by [create-pull-request][1]
-
-            [1]: https://github.com/peter-evans/create-pull-request
-
-      - name: Check outputs
-        run: |
-          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
-          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

modules/machines/aether/nixos-wsl/.gitignore

@@ -1,2 +0,0 @@
-result
-result-*

modules/machines/aether/nixos-wsl/LICENSE

@@ -1,202 +0,0 @@
-
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

modules/machines/aether/nixos-wsl/README.rst

@@ -1,104 +0,0 @@
-============
-NixOS on WSL
-============
-
-A minimal root filesystem for running NixOS on WSL. It can be used with
-DistroLauncher_ as ``install.tar.gz`` or as input to ``wsl --import --version
-2``.
-
-
-Quick start
-===========
-
-First, `download the latest release's installer
-<https://github.com/nix-community/NixOS-WSL/releases/latest/download/nixos-wsl-installer.tar.gz>`_.
-
-Then open up a Terminal, PowerShell or Command Prompt and run::
-
-   wsl --import NixOS .\NixOS\ nixos-wsl-installer.tar.gz --version 2
-
-This sets up a new WSL distribution ``NixOS`` that is installed under
-``.\NixOS``. ``nixos-wsl-installer.tar.gz`` is the path to the file you
-downloaded earlier. You might need to change this path or change to the download
-directory first.
-
-You can now run NixOS::
-
-   wsl -d NixOS
-
-The installer will unpack the file system and subsequently start NixOS.
-A few warnings about file systems and locales will pop up. You can safely ignore them.
-After systemd has started, you should be greeted with a bash prompt inside your fresh NixOS.
-
-If you want to make NixOS your default distribution, you can do so via ``wsl -s
-NixOS``.
-
-
-systemd support
-===============
-
-WSL comes with its own (non-substitutable) init system while NixOS uses systemd.
-Simply starting systemd later on does not work out of the box, because systemd
-as system instance refuses to start if it is not PID 1. This unfortunate
-combination is resolved in two ways:
-
-* the user's default shell is replaced by a wrapper script that acts is init
-  system and then drops to the actual shell
-* systemd is started in its own PID namespace; therefore, it is PID 1. The shell
-  wrapper (see above) enters the systemd namespace before dropping to the shell.
-
-
-Installer
-=========
-
-Usually WSL distributions ship as a tarball of their root file system.
-These tarballs however, can not contain any hard-links due to the way they are unpacked by WSL, resulting in an "Unspecified Error".
-By default some Nix-derivations will contain hard-links when they are built. This results in system tarballs that can not be imported into WSL.
-To circumvent this problem, the rootfs tarball is wrapped in that of a minimal distribution (the installer), that is packaged without any hard-links.
-When the installer system is started for the first time, it overwrites itself with the contents of the rootfs tarball.
-
-
-Build your own system tarball
-=============================
-
-This requires access to a system that already has Nix installed. Please refer to
-the `Nix installation guide <https://nixos.org/guides/install-nix.html>`_ if
-that's not the case.
-
-If you have a flakes-enabled Nix, you can use the following command to build your
-own tarball instead of relying on a prebuilt one::
-
-   nix build github:nix-community/NixOS-WSL#nixosConfigurations.mysystem.config.system.build.installer
-
-Or, if you want to build with local changes, run inside your checkout::
-
-   nix build .#nixosConfigurations.mysystem.config.system.build.installer
-
-Without a flakes-enabled Nix, you can build a tarball using::
-
-   nix-build -A nixosConfigurations.mysystem.config.system.build.installer
-
-The resulting mini rootfs can then be found under
-``./result/tarball/nixos-wsl-installer.tar.gz``.
-
-You can also build a rootfs tarball without wrapping it in the installer by replacing ``installer`` with ``tarball`` in the above commands.
-The rootfs tarball can then be found under ``./result/tarball/nixos-wsl-x86_64-linux.tar.gz``.
-
-
-License
-=======
-
-Apache License, Version 2.0. See ``LICENSE`` or
-http://www.apache.org/licenses/LICENSE-2.0.html for details.
-
-
-Further links
-=============
-
-* DistroLauncher_
-* `A quick way into a systemd "bottle" for WSL <https://github.com/arkane-systems/genie>`_
-* `NixOS in Windows Store for Windows Subsystem for Linux <https://github.com/NixOS/nixpkgs/issues/30391>`_
-* `wsl2-hacks <https://github.com/shayne/wsl2-hacks>`_
-
-
-.. _DistroLauncher: https://github.com/microsoft/WSL-DistroLauncher

modules/machines/aether/nixos-wsl/default.nix

@@ -1,14 +0,0 @@
-(import
-  (
-    let
-      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    in
-      fetchTarball {
-        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-        sha256 = lock.nodes.flake-compat.locked.narHash;
-      }
-  )
-  {
-    src = ./.;
-  })
-.defaultNix

modules/machines/aether/nixos-wsl/flake.lock

@@ -1,59 +0,0 @@
-{
-  "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648199409,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1648297722,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1648203577,
-        "narHash": "sha256-CbXZkiVTA0ByV/yncFHCAGIa/AfcSb0cjqzEa56rO+Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d89f18a17e51532ed5f4d45297b0ddf11e46b9c8",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-21.11",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

modules/machines/aether/nixos-wsl/flake.nix

@@ -1,58 +0,0 @@
-{
-  description = "NixOS WSL";
-
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-21.11";
-    flake-utils.url = "github:numtide/flake-utils";
-
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-  };
-
-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-    ...
-  }:
-    {
-      nixosModules.wsl = {
-        imports = [
-          ./modules/build-tarball.nix
-          ./modules/wsl-distro.nix
-          ./modules/docker-desktop.nix
-          ./modules/tailscale.nix
-          ./modules/installer.nix
-        ];
-      };
-
-      nixosConfigurations.mysystem = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./configuration.nix
-        ];
-      };
-    }
-    // flake-utils.lib.eachSystem
-    (with flake-utils.lib.system; ["x86_64-linux" "aarch64-linux"])
-    (
-      system: let
-        pkgs = import nixpkgs {inherit system;};
-      in {
-        checks.check-format =
-          pkgs.runCommand "check-format"
-          {
-            buildInputs = with pkgs; [nixpkgs-fmt];
-          } ''
-            nixpkgs-fmt --check ${./.}
-            mkdir $out # success
-          '';
-
-        devShell = pkgs.mkShell {
-          nativeBuildInputs = with pkgs; [nixpkgs-fmt];
-        };
-      }
-    );
-}

modules/machines/aether/nixos-wsl/modules/build-tarball.nix

@@ -1,93 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with builtins;
-with lib; let
-  pkgs2storeContents = l:
-    map
-    (x: {
-      object = x;
-      symlink = "none";
-    })
-    l;
-
-  nixpkgs = lib.cleanSource pkgs.path;
-
-  channelSources =
-    pkgs.runCommand "nixos-${config.system.nixos.version}"
-    {preferLocalBuild = true;}
-    ''
-      mkdir -p $out
-      cp -prd ${nixpkgs.outPath} $out/nixos
-      chmod -R u+w $out/nixos
-      if [ ! -e $out/nixos/nixpkgs ]; then
-        ln -s . $out/nixos/nixpkgs
-      fi
-      echo -n ${toString config.system.nixos.revision} > $out/nixos/.git-revision
-      echo -n ${toString config.system.nixos.versionSuffix} > $out/nixos/.version-suffix
-      echo ${toString config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision
-    '';
-
-  preparer = pkgs.writeShellScriptBin "wsl-prepare" ''
-    set -e
-
-    mkdir -m 0755 ./bin ./etc
-    mkdir -m 1777 ./tmp
-
-    # WSL requires a /bin/sh - only temporary, NixOS's activate will overwrite
-    ln -s ${config.users.users.root.shell} ./bin/sh
-
-    # WSL also requires a /bin/mount, otherwise the host fs isn't accessible
-    ln -s /nix/var/nix/profiles/system/sw/bin/mount ./bin/mount
-
-    # Set system profile
-    system=${config.system.build.toplevel}
-    ./$system/sw/bin/nix-store --store `pwd` --load-db < ./nix-path-registration
-    rm ./nix-path-registration
-    ./$system/sw/bin/nix-env --store `pwd` -p ./nix/var/nix/profiles/system --set $system
-
-    # Set channel
-    mkdir -p ./nix/var/nix/profiles/per-user/root
-    ./$system/sw/bin/nix-env --store `pwd` -p ./nix/var/nix/profiles/per-user/root/channels --set ${channelSources}
-    mkdir -m 0700 -p ./root/.nix-defexpr
-    ln -s /nix/var/nix/profiles/per-user/root/channels ./root/.nix-defexpr/channels
-
-    # It's now a NixOS!
-    touch ./etc/NIXOS
-
-    # Write wsl.conf so that it is present when NixOS is started for the first time
-    cp ${config.environment.etc."wsl.conf".source} ./etc/wsl.conf
-
-    # Copy the system configuration
-    mkdir -p ./etc/nixos/nixos-wsl
-    cp -R ${lib.cleanSource ../.}/. ./etc/nixos/nixos-wsl
-    mv ./etc/nixos/nixos-wsl/configuration.nix ./etc/nixos/configuration.nix
-    # Patch the import path to avoid havin a flake.nix in /etc/nixos
-    sed -i 's|import \./default\.nix|import \./nixos-wsl|' ./etc/nixos/configuration.nix
-  '';
-in
-  mkIf config.wsl.enable {
-    # These options make no sense without the wsl-distro module anyway
-
-    system.build.tarball = pkgs.callPackage "${nixpkgs}/nixos/lib/make-system-tarball.nix" {
-      # No contents, structure will be added by prepare script
-      contents = [];
-
-      fileName = "nixos-wsl-${pkgs.hostPlatform.system}";
-
-      storeContents = pkgs2storeContents [
-        config.system.build.toplevel
-        channelSources
-        preparer
-      ];
-
-      extraCommands = "${preparer}/bin/wsl-prepare";
-
-      # Use gzip
-      compressCommand = "gzip";
-      compressionExtension = ".gz";
-    };
-  }

modules/machines/aether/nixos-wsl/modules/docker-desktop.nix

@@ -1,38 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with builtins;
-with lib; {
-  options.wsl.docker = with types; {
-    enable = mkEnableOption "Docker Desktop integration";
-  };
-
-  config = let
-    cfg = config.wsl.docker;
-  in
-    mkIf (config.wsl.enable && cfg.enable) {
-      environment.systemPackages = with pkgs; [
-        docker
-        docker-compose
-      ];
-
-      systemd.services.docker-desktop-proxy = {
-        description = "Docker Desktop proxy";
-        script = ''
-          ${config.wsl.automountPath}/wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${config.wsl.automountPath}/wsl/docker-desktop
-        '';
-        wantedBy = ["multi-user.target"];
-        serviceConfig = {
-          Restart = "on-failure";
-          RestartSec = "30s";
-        };
-      };
-
-      users.groups.docker.members = [
-        config.wsl.defaultUser
-      ];
-    };
-}

modules/machines/aether/nixos-wsl/modules/installer.nix

@@ -1,77 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with builtins;
-with lib; {
-  config = mkIf config.wsl.enable (
-    let
-      mkTarball = pkgs.callPackage "${lib.cleanSource pkgs.path}/nixos/lib/make-system-tarball.nix";
-
-      pkgs2storeContents = map (x: {
-        object = x;
-        symlink = "none";
-      });
-
-      rootfs = let tarball = config.system.build.tarball; in "${tarball}/tarball/${tarball.fileName}.tar${tarball.extension}";
-
-      installer = pkgs.writeScript "installer.sh" ''
-        #!${pkgs.busybox}/bin/sh
-        BASEPATH=$PATH
-        export PATH=$BASEPATH:${pkgs.busybox}/bin # Add busybox to path
-
-        set -e
-        cd /
-
-        echo "Unpacking root file system..."
-        ${pkgs.pv}/bin/pv ${rootfs} | tar xz
-
-        echo "Activating nix configuration..."
-        /nix/var/nix/profiles/system/activate
-        PATH=$BASEPATH:/run/current-system/sw/bin # Use packages from target system
-
-        echo "Cleaning up installer files..."
-        nix-collect-garbage
-        rm /nix-path-registration
-
-        echo "Optimizing store..."
-        nix-store --optimize
-
-
-        echo "Starting systemd..."
-        # Don't package the shell here, it's contained in the rootfs
-        exec ${builtins.unsafeDiscardStringContext config.users.users.root.shell} "$@"
-      '';
-
-      # Set installer.sh as the root shell
-      passwd = pkgs.writeText "passwd" ''
-        root:x:0:0:System administrator:/root:${installer}
-      '';
-    in {
-      system.build.installer = mkTarball {
-        fileName = "nixos-wsl-installer";
-        compressCommand = "gzip";
-        compressionExtension = ".gz";
-        extraArgs = "--hard-dereference";
-
-        storeContents = with pkgs;
-          pkgs2storeContents [
-            installer
-          ];
-
-        contents = [
-          {
-            source = config.environment.etc."wsl.conf".source;
-            target = "/etc/wsl.conf";
-          }
-          {
-            source = passwd;
-            target = "/etc/passwd";
-          }
-        ];
-      };
-    }
-  );
-}

modules/machines/aether/nixos-wsl/modules/tailscale.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with builtins;
-with lib; {
-  options.wsl.tailscale = with types; {
-    enable = mkEnableOption "Tailscale for WSL";
-  };
-
-  config = let
-    cfg = config.wsl.tailscale;
-  in
-    mkIf (config.wsl.enable && cfg.enable) {
-      environment.systemPackages = with pkgs; [
-        tailscale
-      ];
-
-      systemd.services.tailscaled = {
-        description = "Tailscale WSL";
-        script = ''
-          ${pkgs.tailscale}/bin/tailscaled
-        '';
-        wantedBy = ["multi-user.target"];
-        serviceConfig = {
-          Restart = "on-failure";
-          RestartSec = "30s";
-        };
-      };
-    };
-}

modules/machines/aether/nixos-wsl/modules/wsl-distro.nix

@@ -1,137 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with builtins;
-with lib; {
-  options.wsl = with types; let
-    coercedToStr = coercedTo (oneOf [bool path int]) toString str;
-  in {
-    enable = mkEnableOption "support for running NixOS as a WSL distribution";
-    automountPath = mkOption {
-      type = str;
-      default = "/mnt";
-      description = "The path where windows drives are mounted (e.g. /mnt/c)";
-    };
-    automountOptions = mkOption {
-      type = str;
-      default = "metadata,uid=1000,gid=100";
-      description = "Options to use when mounting windows drives";
-    };
-    defaultUser = mkOption {
-      type = str;
-      default = "nixos";
-      description = "The name of the default user";
-    };
-    startMenuLaunchers = mkEnableOption "shortcuts for GUI applications in the windows start menu";
-    wslConf = mkOption {
-      type = attrsOf (attrsOf coercedToStr);
-      description = "Entries that are added to /etc/wsl.conf";
-    };
-
-    interop = {
-      register = mkOption {
-        type = bool;
-        default = true;
-        description = "Explicitly register the binfmt_misc handler for Windows executables";
-      };
-
-      includePath = mkOption {
-        type = bool;
-        default = true;
-        description = "Include Windows PATH in WSL PATH";
-      };
-    };
-  };
-
-  config = let
-    cfg = config.wsl;
-    syschdemd = import ../syschdemd.nix {
-      inherit lib pkgs config;
-      defaultUser = cfg.defaultUser;
-    };
-  in
-    mkIf cfg.enable {
-      wsl.wslConf = {
-        automount = {
-          enabled = true;
-          mountFsTab = true;
-          root = "${cfg.automountPath}/";
-          options = cfg.automountOptions;
-        };
-      };
-
-      # WSL is closer to a container than anything else
-      boot = {
-        isContainer = true;
-
-        binfmt.registrations = mkIf cfg.interop.register {
-          WSLInterop = {
-            magicOrExtension = "MZ";
-            interpreter = "/init";
-            fixBinary = true;
-          };
-        };
-      };
-      environment.noXlibs = lib.mkForce false; # override xlibs not being installed (due to isContainer) to enable the use of GUI apps
-
-      environment = {
-        # Include Windows %PATH% in Linux $PATH.
-        extraInit = mkIf cfg.interop.includePath ''PATH="$PATH:$WSLPATH"'';
-
-        etc = {
-          "wsl.conf".text = generators.toINI {} cfg.wslConf;
-
-          # DNS settings are managed by WSL
-          hosts.enable = false;
-          "resolv.conf".enable = false;
-        };
-      };
-
-      networking.dhcpcd.enable = false;
-
-      users.users.${cfg.defaultUser} = {
-        isNormalUser = true;
-        extraGroups = ["wheel"]; # Allow the default user to use sudo
-        shell = pkgs.zsh;
-      };
-
-      users.users.root = {
-        shell = "${syschdemd}/bin/syschdemd";
-        # Otherwise WSL fails to login as root with "initgroups failed 5"
-        extraGroups = ["root"];
-      };
-
-      security.sudo = {
-        extraConfig = ''
-          Defaults env_keep+=INSIDE_NAMESPACE
-        '';
-        wheelNeedsPassword = mkDefault false; # The default user will not have a password by default
-      };
-
-      system.activationScripts.copy-launchers = mkIf cfg.startMenuLaunchers (
-        stringAfter [] ''
-          for x in applications icons; do
-            echo "Copying /usr/share/$x"
-            mkdir -p /usr/share/$x
-            ${pkgs.rsync}/bin/rsync -ar --delete $systemConfig/sw/share/$x/. /usr/share/$x
-          done
-        ''
-      );
-
-      # Disable systemd units that don't make sense on WSL
-      systemd.services."serial-getty@ttyS0".enable = false;
-      systemd.services."serial-getty@hvc0".enable = false;
-      systemd.services."getty@tty1".enable = false;
-      systemd.services."autovt@".enable = false;
-
-      systemd.services.firewall.enable = false;
-      systemd.services.systemd-resolved.enable = false;
-      systemd.services.systemd-udevd.enable = false;
-
-      # Don't allow emergency mode, because we don't have a console.
-      systemd.enableEmergencyMode = false;
-    };
-}

modules/machines/aether/nixos-wsl/syschdemd.nix

@@ -1,25 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  defaultUser,
-  ...
-}:
-pkgs.substituteAll {
-  name = "syschdemd";
-  src = ./syschdemd.sh;
-  dir = "bin";
-  isExecutable = true;
-
-  buildInputs = with pkgs; [daemonize];
-
-  inherit (pkgs) daemonize;
-  inherit defaultUser;
-  inherit (config.security) wrapperDir;
-  fsPackagesPath = lib.makeBinPath config.system.fsPackages;
-
-  systemdWrapper = pkgs.writeShellScript "systemd-wrapper.sh" ''
-    mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc || true
-    exec systemd
-  '';
-}

modules/machines/aether/nixos-wsl/syschdemd.sh

@@ -1,72 +0,0 @@
-#! @shell@
-
-set -e
-
-sw="/nix/var/nix/profiles/system/sw/bin"
-systemPath=$(${sw}/readlink -f /nix/var/nix/profiles/system)
-
-function start_systemd {
-    @wrapperDir@/umount /proc/sys/fs/binfmt_misc || true
-
-    PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \
-        LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \
-        @daemonize@/bin/daemonize /run/current-system/sw/bin/unshare -fp --mount-proc @systemdWrapper@
-
-    # Wait until systemd has been started to prevent a race condition from occuring
-    while ! /run/current-system/sw/bin/pgrep -xf systemd >/run/systemd.pid; do
-        $sw/sleep 1s
-    done
-
-    # Wait for systemd to start services
-    status=1
-    while [[ $status -gt 0 ]]; do
-        $sw/sleep 1
-        status=0
-        $sw/nsenter -t $(</run/systemd.pid) -p -m -- \
-            $sw/systemctl is-system-running -q --wait 2>/dev/null ||
-            status=$?
-    done
-}
-
-# Needs root to work
-if [[ $EUID -ne 0 ]]; then
-    echo "[ERROR] Requires root! :( Make sure the WSL default user is set to root"
-    exit 1
-fi
-
-if [ ! -e "/run/current-system" ]; then
-    LANG="C.UTF-8" /nix/var/nix/profiles/system/activate
-fi
-
-if [ ! -e "/run/systemd.pid" ]; then
-    start_systemd
-fi
-
-userShell=$($sw/getent passwd @defaultUser@ | $sw/cut -d: -f7)
-if [[ $# -gt 0 ]]; then
-    # wsl seems to prefix with "-c"
-    shift
-    cmd="$@"
-else
-    cmd="$userShell"
-fi
-
-# Pass external environment but filter variables specific to root user.
-exportCmd="$(export -p | $sw/grep -vE ' (HOME|LOGNAME|SHELL|USER)='); export WSLPATH=\"$PATH\"; export INSIDE_NAMESPACE=true"
-
-if [ -z "${INSIDE_NAMESPACE:-}" ]; then
-
-    # Test whether systemd is still alive if it was started previously
-    if ! [ -d "/proc/$(</run/systemd.pid)" ]; then
-        # Clear systemd pid if the process is not alive anymore
-        $sw/rm /run/systemd.pid
-        start_systemd
-    fi
-
-    exec $sw/nsenter -t $(</run/systemd.pid) -p -m -- $sw/machinectl -q \
-        --uid=@defaultUser@ shell .host /bin/sh -c \
-        "cd \"$PWD\"; $exportCmd; source /etc/set-environment; exec $cmd"
-
-else
-    exec $cmd
-fi

modules/machines/hephaestus/configuration.nix

@@ -1,53 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [./hardware.nix];
-
-  hardware.opengl.enable = true;
-
-  nixpkgs.config.allowUnfree = true;
-
-  networking = {
-    hostName = "hephaestus";
-    interfaces.enp34s0 = {
-      useDHCP = true;
-    };
-    defaultGateway = {
-      address = "192.168.1.2";
-      interface = "enp34s0";
-    };
-    firewall = {
-      allowedTCPPorts = [
-        25565 # minecraft
-        19999 # netdata
-      ];
-      allowedUDPPorts = [
-        41641 # tailscale
-      ];
-    };
-  };
-
-  services.sshd.enable = true;
-
-  services.tailscale.enable = true;
-
-  services.xserver.videoDrivers = ["amdgpu"];
-
-  services.minecraft-server = {
-    enable = false;
-    eula = true;
-    declarative = true;
-
-    serverProperties = {
-      server-port = 25565;
-      gamemode = "survival";
-      motd = "NixOS Minecraft server.";
-      max-players = 5;
-      enable-rcon = true;
-      "rcon.password" = "changeme";
-      level-seed = "10292992";
-    };
-  };
-}

modules/machines/hephaestus/hardware.nix

@@ -1,76 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
-
-  boot.initrd.availableKernelModules = [
-    "ahci"
-    "nvme"
-    "sd_mod"
-    "usb_storage"
-    "usbhid"
-    "xhci_pci"
-  ];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = with config.boot.kernelPackages; [
-    xpadneo
-  ];
-
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-
-  boot.loader.grub = {
-    enable = true;
-    device = "nodev";
-    efiSupport = true;
-    enableCryptodisk = true;
-  };
-
-  boot.initrd = {
-    luks.devices."root" = {
-      allowDiscards = true;
-      device = "/dev/disk/by-uuid/21cd166c-1528-49a4-b31b-0d408d48aa80";
-      preLVM = true;
-      keyFile = "./keyfile0.bin";
-    };
-    secrets = {
-      "keyfile0.bin" = "/etc/secrets/initrd/keyfile0.bin";
-    };
-  };
-
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/a6723178-6f18-428e-b541-9ac901861125";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/e3ab2e1a-bddf-4ae0-b00a-bf954c6c182b";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-uuid/3CFD-D749";
-    fsType = "vfat";
-  };
-
-  fileSystems."/mnt/synology-2b/media" = {
-    device = "192.168.1.178:/volume1/Media";
-    fsType = "nfs";
-  };
-
-  fileSystems."/mnt/synology-2b/backups" = {
-    device = "192.168.1.178:/volume1/Backups";
-    fsType = "nfs";
-  };
-
-  swapDevices = [
-    {device = "/dev/disk/by-uuid/5d6d0388-2b15-4ff1-9f0f-391818a76090";}
-  ];
-}

modules/machines/zelus/configuration.nix

@@ -1,19 +0,0 @@
-{pkgs, ...}: {
-  nixpkgs.config.allowUnfree = true;
-
-  environment = {variables = {LANG = "en_US.UTF-8";};};
-
-  networking = {hostName = "zelus";};
-
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  nix.package = pkgs.nixVersions.stable;
-
-  programs.zsh = {
-    enable = true;
-    # https://github.com/nix-community/home-manager/issues/108#issuecomment-340397178
-    enableCompletion = false;
-  };
-
-  system.stateVersion = 4;
-}

modules/overlays/default.nix

@@ -1,6 +0,0 @@
-final: prev: {
-  rfd = prev.callPackage ./rfd {};
-  tmux-sessionizer = prev.callPackage ./tmux-sessionizer {};
-  vpngate = prev.callPackage ./vpngate {};
-  yar = prev.callPackage ./yar {};
-}

modules/overlays/tmux-sessionizer/default.nix

@@ -1,24 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-}:
-stdenv.mkDerivation rec {
-  pname = "tmux-sessionizer";
-  version = "0.0.0";
-
-  executable = ./tmux-sessionizer;
-
-  phases = ["unpackPhase"]; # Remove all other phases
-
-  unpackPhase = ''
-    mkdir -p $out/bin
-    cp ${executable} $out/bin/tmux-sessionizer
-  '';
-
-  meta = with lib; {
-    description = "
-      Tmux sessionizer adapted from https://sourcegraph.com/github.com/ThePrimeagen/.dotfiles@5cd09f06d6683b91c26822a73b40e3d7fb9af57a/-/blob/bin/.local/bin/tmux-sessionizer";
-    platforms = platforms.unix;
-  };
-}

modules/overlays/tmux-sessionizer/tmux-sessionizer

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# Credit to ThePrimeagen for this:
-# https://sourcegraph.com/github.com/ThePrimeagen/.dotfiles@5cd09f06d6683b91c26822a73b40e3d7fb9af57a/-/blob/bin/.local/bin/tmux-sessionizer
-
-
-readarray -t directories < ~/.config/tmux-sessionizer
-
-if [[ $# -eq 1 ]]; then
-    selected=$1
-else
-    selected=$(find "${directories[@]}" -mindepth 1 -maxdepth 1 -type d | fzf --exact)
-fi
-
-if [[ -z $selected ]]; then
-    exit 0
-fi
-
-selected_name=$(basename "$selected" | tr . _)
-tmux_running=$(pgrep tmux)
-
-if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then
-    tmux new-session -s "$selected_name" -c "$selected"
-    exit 0
-fi
-
-if ! tmux has-session -t "$selected_name" 2> /dev/null; then
-    tmux new-session -ds "$selected_name" -c "$selected"
-fi
-
-tmux switch-client -t "$selected_name"

modules/overlays/vpngate/default.nix

@@ -1,28 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-}:
-buildGoModule rec {
-  pname = "vpngate";
-  version = "v0.1.5";
-
-  vendorSha256 = "sha256-TQLHvoVAMvDtm/9EQUaNVVjQajyMBnJu8NF6Kt0+RJ8=";
-
-  src = fetchFromGitHub {
-    owner = "davegallant";
-    repo = "vpngate";
-    rev = version;
-    sha256 = "sha256-+KZ6/h8JLEisnIja4lstJYVHzEC/8PdHL3czK/mJCAs=";
-  };
-
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://www.vpngate.net";
-    description = "a client for vpngate.net";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [davegallant];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}

modules/overlays/yar/default.nix

@@ -1,25 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-}:
-buildGoModule rec {
-  pname = "yar";
-  version = "master";
-
-  vendorSha256 = "sha256-bBaAP9HQ1fG6gPtoYg9HXnv53DueAFnT4OHE4rwlxvA=";
-
-  src = fetchFromGitHub {
-    owner = "nielsing";
-    repo = "yar";
-    rev = version;
-    sha256 = "sha256-f7pTS5Ur8ImbIkPkyunyQEgpeF79CIQFEodg69VxA9I=";
-  };
-
-  meta = with lib; {
-    description = "Yar is a tool for plunderin' organizations, users and/or repositories.";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [davegallant];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}

modules/packages/common.nix

@@ -1,147 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  unstable,
-  ...
-}: let
-  inherit (pkgs) stdenv;
-in {
-  environment.systemPackages = with pkgs; let
-    common = [
-      # classics
-      colordiff
-      curl
-      gcc
-      git-crypt
-      gnumake
-      gnupg
-      imagemagick
-      jq
-      unzip
-      viddy
-      wget
-      xclip
-      xdg-utils
-      zip
-
-      # modern cli
-      bat
-      exa
-      fd
-      unstable.github-cli
-      progress
-      glab
-      hadolint
-      nodePackages.eslint
-      oha
-      postman
-      pre-commit
-      ripgrep
-      yq-go
-      shellcheck
-      shfmt
-      starship
-      tldr
-      tmux-sessionizer
-
-      # containers
-      krew
-      kube-score
-      kubecolor
-      kubectl
-      kubectx
-      kustomize
-      minikube
-      stern
-      unstable.helm-docs
-      unstable.k9s
-      unstable.skaffold
-
-      # language servers
-      nodePackages.bash-language-server
-      nodePackages.pyright
-      nodePackages.yaml-language-server
-      sumneko-lua-language-server
-
-      # monitoring
-      ctop
-      glances
-      htop
-      procs
-
-      # lua
-      lua53Packages.luacheck
-      stylua
-
-      # golang
-      golangci-lint
-      gopls
-      gofumpt
-
-      # rust
-      rustup
-
-      # js
-      nodejs
-      nodePackages.prettier
-      nodePackages.yarn
-
-      # networking
-      arp-scan
-      dnsutils
-      iperf
-      nmap
-      openssl
-      openvpn
-      sshfs # mac requires https://osxfuse.github.io/
-      vpngate
-      whois
-
-      # rice
-      neofetch
-      pfetch
-
-      # backup
-      rclone
-      restic
-
-      # infra
-      terraform-ls
-      terraformer
-      tflint
-
-      # nix
-      alejandra
-      cachix
-      nix-diff
-      nix-tree
-      nixfmt
-      nixpkgs-fmt
-      nixpkgs-review
-      rnix-lsp
-
-      # cloud
-      cloud-sql-proxy
-
-      # python
-      poetry
-      python310
-      python310Packages.black
-      python310Packages.ipython
-      python310Packages.pip
-      python310Packages.poetry-core
-      python310Packages.setuptools
-      python310Packages.virtualenv
-
-      # media
-      youtube-dl
-
-      # blog
-      hugo
-    ];
-  in
-    common;
-
-  programs.gnupg.agent.enable = true;
-}

modules/packages/linux-desktop.nix

@@ -1,61 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  unstable,
-  ...
-}: let
-  inherit (pkgs) stdenv;
-in {
-  environment.systemPackages = with pkgs; let
-    linuxDesktop = [
-      albert
-      bitwarden
-      bitwarden-cli
-      chromium
-      deja-dup
-      discord
-      foliate
-      ghostscript
-      gimp-with-plugins
-      gnome.gnome-sound-recorder
-      gnome.gnome-tweaks
-      gnome.seahorse
-      gnomeExtensions.appindicator
-      gnomeExtensions.bluetooth-quick-connect
-      gnomeExtensions.blur-my-shell
-      gnomeExtensions.caffeine
-      gnomeExtensions.clipboard-indicator
-      gnomeExtensions.grand-theft-focus
-      gnomeExtensions.notification-banner-reloaded
-      gnomeExtensions.quick-settings-tweaker
-      gnomeExtensions.tailscale-status
-      gnomeExtensions.tray-icons-reloaded
-      gnomeExtensions.vitals
-      google-cloud-sdk
-      kazam
-      legendary-gl
-      obs-studio
-      pavucontrol
-      podman
-      prismlauncher
-      psst
-      qemu
-      ryujinx
-      steam-tui
-      unstable.signal-desktop
-      unstable.yuzu
-      unstable.zoom-us
-      usbutils
-      virt-manager
-      vlc
-      wine
-      wine64
-      wireshark-qt
-      yaru-theme
-    ];
-  in
-    linuxDesktop;
-
-  programs.gnupg.agent.enable = true;
-}

modules/packages/linux.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (pkgs) stdenv;
-in {
-  environment.systemPackages = with pkgs; let
-    linux = [
-      cpu-x
-      cryptsetup
-      docker
-      docker-compose
-      glibcLocales
-      lm_sensors
-      netdata
-      pinentry-curses
-      nfs-utils
-      rustup
-      strace
-      tailscale
-      traceroute
-    ];
-  in
-    linux;
-
-  programs.gnupg.agent.enable = true;
-}

modules/services/netdata/default.nix

@@ -1,45 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  netdata = pkgs.netdata;
-  netdataConf = ./netdata.conf;
-  netdataDir = "/var/lib/netdata";
-in {
-  users.extraGroups.netdata.gid = 220008;
-  users.users.netdata.group = "netdata";
-  users.extraUsers.netdata = {
-    description = "Netdata server user";
-    isSystemUser = true;
-    name = "netdata";
-    uid = 200008;
-  };
-  systemd.services.netdata = {
-    wantedBy = ["multi-user.target"];
-    after = ["network.target"];
-    preStart = ''
-      mkdir -p ${netdataDir}/config
-      mkdir -p ${netdataDir}/logs
-      cp -r ${netdata}/share/netdata/web ${netdataDir}/web
-      chmod -R 700 ${netdataDir}
-      chown -R netdata:netdata ${netdataDir}
-    '';
-    serviceConfig = {
-      Type = "forking";
-      ExecStart = "${netdata}/bin/netdata -c ${netdataConf} -u netdata";
-      Restart = "on-failure";
-    };
-  };
-
-  services.nginx.httpConfig = ''
-    server {
-      server_name netdata.thume.net;
-      location / {
-        proxy_set_header Host $http_host;
-        proxy_redirect off;
-        proxy_pass http://127.0.0.1:19999;
-      }
-    }
-  '';
-}

modules/services/netdata/netdata.conf

@@ -1,21 +0,0 @@
-[global]
-  run as user = netdata
-
-  config directory = /var/lib/netdata/config
-  web files directory = /var/lib/netdata/web
-  cache directory = /var/lib/netdata
-  log directory = /var/lib/netdata/logs
-
-  # the default database size - 1 hour
-  history = 3600
-
-  # some defaults to run netdata with least priority
-  process scheduling policy = idle
-  OOM score = 1000
-
-[web]
-  # web files owner = root
-  web files group = netdata
-
-  # by default do not expose the netdata port
-  bind to = localhost

modules/upgrade-diff.nix

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  system.activationScripts.diff = {
-    supportsDryActivation = true;
-    text = ''
-      ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
-    '';
-  };
-}

outputs.nix

@@ -1,133 +0,0 @@
-{
-  self,
-  darwin,
-  home-manager,
-  nixpkgs,
-  nixpkgs-unstable,
-  nixos-hardware,
-  nix-ld,
-  ...
-} @ inputs: {
-  nixosConfigurations = let
-    modulesDir = ./modules;
-    unstable = import nixpkgs-unstable {};
-    defaultModules = [
-      home-manager.nixosModules.home-manager
-      ./modules/common/fonts.nix
-      ./modules/packages/common.nix
-      ./modules/upgrade-diff.nix
-
-      ({
-        config,
-        lib,
-        lib',
-        ...
-      }: {
-        config = {
-          _module.args = {
-            lib' = lib // import ./lib {inherit config lib;};
-          };
-
-          nix = {
-            settings = {
-              auto-optimise-store = true;
-              sandbox = false;
-              substituters = ["https://davegallant.cachix.org"];
-              trusted-users = ["root" "dave"];
-              trusted-public-keys = [
-                "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
-              ];
-            };
-            registry = {nixpkgs.flake = nixpkgs;};
-          };
-
-          nix.gc = {
-            automatic = true;
-            dates = "weekly";
-            options = "--delete-older-than 30d";
-          };
-
-          nixpkgs.overlays = [
-            (import ./modules/overlays)
-          ];
-
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.dave.imports = [./home/default.nix];
-            extraSpecialArgs = {
-              inherit unstable;
-            };
-          };
-        };
-      })
-    ];
-    desktopLinuxModules = [
-      ./modules/common/linux.nix
-      ./modules/common/linux-desktop.nix
-      ./modules/common/networking.nix
-      ./modules/common/printing.nix
-      ./modules/packages/linux-desktop.nix
-      ./modules/packages/linux.nix
-      ./modules/services/netdata/default.nix
-    ];
-  in {
-    hephaestus = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {inherit unstable;};
-      modules =
-        [
-          ./modules/machines/hephaestus/configuration.nix
-          ./modules/machines/hephaestus/hardware.nix
-        ]
-        ++ defaultModules
-        ++ desktopLinuxModules;
-    };
-    aether = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules =
-        [
-          ./modules/machines/aether/configuration.nix
-          nix-ld.nixosModules.nix-ld
-        ]
-        ++ defaultModules;
-    };
-  };
-
-  darwinConfigurations = let
-    system = "aarch64-darwin";
-    unstable = import nixpkgs-unstable {
-      inherit system;
-    };
-  in {
-    zelus = darwin.lib.darwinSystem {
-      inherit system;
-      specialArgs = {inherit unstable;};
-
-      modules = [
-        home-manager.darwinModules.home-manager
-        ./modules/common/darwin.nix
-        ./modules/packages/common.nix
-        ./modules/machines/zelus/configuration.nix
-        ./modules/darwin/default.nix
-        ./modules/upgrade-diff.nix
-
-        ({config, ...}: {
-          config = {
-            nixpkgs.overlays = [
-              (import ./modules/overlays)
-            ];
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."dave.gallant".imports = [./home/default.nix];
-              extraSpecialArgs = {
-                inherit unstable;
-              };
-            };
-          };
-        })
-      ];
-    };
-  };
-}

overlays/cd-fzf/cd-fzf

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+readarray -t directories < ~/.config/cd-fzf
+
+if [[ $# -eq 1 ]]; then
+    selected=$1
+else
+    selected=$(find "${directories[@]}" -mindepth 1 -maxdepth 1 -type d | fzf --exact)
+fi
+if [[ -z $selected ]]; then
+    exit 0
+fi
+
+cd "$selected"
+$SHELL

overlays/cd-fzf/default.nix

@@ -0,0 +1,19 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+}:
+stdenv.mkDerivation rec {
+  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
+  '';
+  meta = with lib; {
+    description = "\n      Fuzzy find change directory";
+    platforms = platforms.unix;
+  };
+}

overlays/default.nix

@@ -0,0 +1,3 @@
+final: prev: {
+  cd-fzf = prev.callPackage ./cd-fzf { };
+}

renovate.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "schedule": [
+    "every weekend"
+  ],
+  "extends": [
+    "config:recommended"
+  ]
+}

shell.nix

@@ -1,5 +0,0 @@
-(import <nixpkgs> {}).mkShell {
-  shellHook = ''
-    ${(import ./default.nix).pre-commit-check.shellHook}
-  '';
-}

update-flake.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if ! git diff-index --quiet HEAD --; then
+  git stash push -m "Auto-stash via update-flash.sh on $(date)"
+fi
+
+git pull
+update_msg=$(nix flake update 2>&1 | grep -v 'warning:')
+just rebuild
+git add .
+
+read -p "Commit and push changes? [yN]? " -r
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+  exit 1
+fi
+
+git commit -S -m "nix flake update: $(TZ=UTC date '+%Y-%m-%d %H:%M:%S %Z')
+
+$update_msg"
+echo "$update_msg"
+git push