Add bind \cw backward-kill-word

unpacking 'https://flakehub.com/f/DeterminateSystems/determinate/%2A' into the Git cache...
unpacking 'github:nix-community/home-manager/8c8a16d41353a174767c38b962359b51a56ca02e' into the Git cache...
unpacking 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b' into the Git cache...
unpacking 'github:NixOS/nixpkgs/f244e841501d61e8fda288c2a9f56ca46e4429de' into the Git cache...
unpacking 'github:NixOS/nixpkgs/5912c1772a44e31bf1c63c0390b90501e5026886' into the Git cache...
• Updated input 'home-manager':
    'github:nix-community/home-manager/c08430923ed417abc653884328a39e98496cfd0f?narHash=sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs%2Bdfl6IbSq3r7s%3D' (2026-01-07)
  → 'github:nix-community/home-manager/8c8a16d41353a174767c38b962359b51a56ca02e?narHash=sha256-D3QzdIT11J66I4mzwmIpAGLzPAcbCS2VaKN8fmOe6%2BE%3D' (2026-01-08)
• Updated input 'home-manager/nixpkgs':
    'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05)
  → 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b?narHash=sha256-r4GVX%2BFToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE%3D' (2026-01-07)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05)
  → 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b?narHash=sha256-r4GVX%2BFToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE%3D' (2026-01-07)
• Updated input 'nixpkgs-master':
    'github:NixOS/nixpkgs/c0fc386a2f5f7027de84c302659f16c93f8da151?narHash=sha256-Eu0eZDABynDaCPRr5bce4UpVcmRHioxG8pJTpPPMrWE%3D' (2026-01-07)
  → 'github:NixOS/nixpkgs/f244e841501d61e8fda288c2a9f56ca46e4429de?narHash=sha256-UP55tLruQPznPL6IMxTzRtx/jhvVhxMuF%2BCUpH78New%3D' (2026-01-08)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5?narHash=sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i%2BbwD6XxMb8A%3D' (2026-01-05)
  → 'github:NixOS/nixpkgs/5912c1772a44e31bf1c63c0390b90501e5026886?narHash=sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4%3D' (2026-01-07)

.github/workflows/cachix.yml

@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: cachix/install-nix-action@v31
       with:
         nix_path: nixpkgs=channel:nixos-unstable

README.md

@@ -4,9 +4,31 @@ This repo stores nix configuration to manage my hosts running [NixOS](https://ni
 
 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.
 
+```console
+❯ macchina
+
+        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|    .'
+ `--..__)     `._.'
+```
+
 ## Prerequisites
 
-- [Determine Nix](https://determinate.systems/nix-installer)
+- [NixOS](nixos.org) (Linux)
+- [Determinate Nix](https://determinate.systems/nix-installer) (macOS)
 - [just](https://github.com/casey/just)
 
 ## Build
@@ -43,6 +65,21 @@ To cleanup previous files, run nix garbage collection:
 just clean
 ```
 
-## Pre-commit hooks
+## Restoring from a live USB
 
-Run `nix develop` to install the pre-commit hooks.
+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

@@ -16,27 +16,26 @@
     zip
 
     # modern cli
+    atuin
     bat
     cd-fzf
     doggo
     eza
     fd
+    github-cli
     hadolint
-    nodePackages.eslint
+    lazygit
-    oha
+    macchina
-    pre-commit
+    ncdu
     progress
     ripgrep
     shellcheck
     shfmt
-    tldr
-    atuin
-
-    github-cli
     viddy
     yq-go
 
     # containers
+    unstable.argocd
     unstable.k9s
     unstable.krew
     unstable.kubecolor
@@ -52,12 +51,12 @@
 
     # lsp
     nodePackages.bash-language-server
+    nodePackages.eslint
     nodePackages.yaml-language-server
     terraform-ls
 
     # monitoring
-    htop
+    btop
-    procs
 
     # golang
     gofumpt
@@ -81,17 +80,13 @@
     openvpn
     tcpdump
 
-    # rice
-    fastfetch
-
     # nix
     nix-tree
     nixfmt-rfc-style
     nixpkgs-review
+    nvd
 
     # python
-    poetry
-    python313
     virtualenv
 
     # media

flake.nix

@@ -3,20 +3,18 @@
 
   inputs = {
     determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
-    fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1";
+    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
-    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
-    pre-commit-hooks.url = "github:cachix/git-hooks.nix";
     darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-24.11";
+      url = "github:lnl7/nix-darwin/nix-darwin-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    home-manager.url = "https://flakehub.com/f/nix-community/home-manager/*";
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.11";
+      url = "github:nix-community/nixvim/nixos-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    stylix.url = "github:danth/stylix/release-24.11";
     vpngate.url = "github:davegallant/vpngate";
   };
 
@@ -24,12 +22,11 @@
     {
       self,
       darwin,
-      fh,
       determinate,
       home-manager,
       nixpkgs,
       nixpkgs-unstable,
-      stylix,
+      nixpkgs-master,
       vpngate,
       ...
     }@inputs:
@@ -44,41 +41,29 @@
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
     in
     {
-      checks = forAllSystems (system: {
-        pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
-          src = ./.;
-          hooks = {
-            nixfmt-rfc-style.enable = true;
-          };
-        };
-      });
-      devShells = forAllSystems (system: {
-        default = nixpkgs.legacyPackages.${system}.mkShell {
-          inherit (self.checks.${system}.pre-commit-check) shellHook;
-          buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;
-        };
-      });
       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 fh;
               inherit unstable;
+              inherit master;
               inherit vpngate;
+              inherit inputs;
             };
             modules = [
               ./hosts/hephaestus.nix
               ./common-packages.nix
-              ./upgrade-diff.nix
-              determinate.nixosModules.default
               home-manager.nixosModules.home-manager
-              stylix.nixosModules.stylix
               (
                 { ... }:
                 {
@@ -112,10 +97,11 @@
                       useUserPackages = true;
                       users.dave.imports = [
                         ./home.nix
-                        inputs.nixvim.homeManagerModules.nixvim
+                        inputs.nixvim.homeModules.nixvim
                       ];
                       extraSpecialArgs = {
                         inherit unstable;
+                        inherit master;
                       };
                     };
                   };
@@ -132,21 +118,23 @@
             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
-              stylix.darwinModules.stylix
               ./hosts/zelus.nix
               ./common-packages.nix
-              ./upgrade-diff.nix
-
               (
                 { ... }:
                 {
@@ -157,10 +145,11 @@
                       useUserPackages = true;
                       users."dave.gallant".imports = [
                         ./home.nix
-                        inputs.nixvim.homeManagerModules.nixvim
+                        inputs.nixvim.homeModules.nixvim
                       ];
                       extraSpecialArgs = {
                         inherit unstable;
+                        inherit master;
                       };
                     };
                   };

home.nix

@@ -8,25 +8,10 @@ let
   inherit (pkgs) stdenv;
 in
 {
-  home.stateVersion = "24.11";
+  home.stateVersion = "25.11";
 
   home.packages = with pkgs; [ just ];
 
-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
-
-    fonts.monospace = {
-      name = "FiraCode Nerd Font Mono";
-      package = "${pkgs.fira-mono}";
-    };
-
-    fonts.sansSerif = {
-      name = "FiraCode Nerd Font";
-      package = "${pkgs.fira-code}";
-    };
-  };
-
   services = {
     gpg-agent = {
       enable = stdenv.isLinux;
@@ -45,41 +30,42 @@ in
 
     direnv.enable = true;
 
+    diff-so-fancy = {
+      enable = true;
+      enableGitIntegration = true;
+    };
+
     git = {
       enable = true;
 
-      userName = "Dave Gallant";
-
-      diff-so-fancy.enable = true;
-
       lfs.enable = true;
 
-      aliases = {
+      settings = {
-        aa = "add -A .";
+        user.name = "Dave Gallant";
-        br = "branch";
+        user.signingkey = "5A548984C7377E4D";
-        c = "commit -S";
+        commit.gpgsign = true;
-        cm = "commit -S -m";
+        tag.gpgsign = true;
-        ca = "commit -S --amend";
+        alias = {
-        cane = "commit -S --amend --no-edit";
+          aa = "add -A .";
-        cb = "checkout -b";
+          br = "branch";
-        co = "checkout";
+          c = "commit";
-        cmp = "! git checkout main && git pl";
+          cm = "commit -m";
-        d = "diff";
+          ca = "commit --amend";
-        dc = "diff --cached";
+          cane = "commit --amend --no-edit";
-        dcn = "diff --cached --name-only";
+          cb = "checkout -b";
-        ds = "! git diff origin | sed -r 's/value: (.*)/value: \"************\"/'";
+          co = "checkout";
-        l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+          cmp = "! git checkout main && git pl";
-        ms = "merge --squash";
+          d = "diff";
-        p = "push origin";
+          dc = "diff --cached";
-        pf = "push -f";
+          dcn = "diff --cached --name-only";
-        pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)";
+          l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-        st = "status";
+          ms = "merge --squash";
-        wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
+          p = "push origin";
-      };
+          pf = "push -f";
-
+          pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)";
-      includes = [ { path = "~/.gitconfig-work"; } ];
+          st = "status";
-
+          wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
-      extraConfig = {
+        };
         push = {
           default = "current";
         };
@@ -87,12 +73,33 @@ in
           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;
-      enableZshIntegration = true;
+      enableFishIntegration = true;
-
       settings = {
         add_newline = false;
         gcloud = {
@@ -104,63 +111,45 @@ in
       };
     };
 
-    zsh = {
+    fish = {
       enable = true;
-      autosuggestion.enable = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      history.size = 1000000;
 
-      localVariables = {
+      interactiveShellInit = ''
-        CASE_SENSITIVE = "true";
+          set fish_greeting
-        DISABLE_UNTRACKED_FILES_DIRTY = "true";
-        RPROMPT = ""; # override because macOS defaults to filepath
-        ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#838383,underline";
-        ZSH_DISABLE_COMPFIX = "true";
-      };
 
-      envExtra = ''
+          bind \cw backward-kill-word
-        export PAGER=less
-        export EDITOR=vim
-        export DOCKER_CLI_HINTS=false
-        export TERM=xterm-256color
 
-        export PATH=$PATH:~/.cargo/bin
+          set -x DOCKER_CLI_HINTS false
-        export PATH=$PATH:~/.local/bin
+          set -x DOCKER_DEFAULT_PLATFORM linux/amd64
-        export PATH=$PATH:~/.npm-packages/bin
+          set -x EDITOR vim
-        export PATH=$PATH:/opt/homebrew/bin
+          set -x NNN_FIFO "$XDG_RUNTIME_DIR/nnn.fifo"
-        export PATH=$PATH:~/.krew/bin
+          set -x PAGER less
-        export PATH=$PATH:~/bin
+          set -x TERM xterm-256color
-        export GOPATH=~/go
-        export GOBIN=$GOPATH/bin
-        export PATH=$PATH:$GOBIN
-      '';
 
-      initExtra = ''
+          set -x PATH $PATH \
-        setopt noincappendhistory
+            ~/.cargo/bin \
+            ~/.local/bin \
+            ~/.npm-packages/bin \
+            /opt/homebrew/bin \
+            ~/.krew/bin \
+            ~/bin
 
-        source $HOME/.zsh-work
+          # golang
+          set -x GOPATH ~/go
+          set -x GOBIN $GOPATH/bin
+          set -x PATH $PATH $GOBIN
 
-        if [[ "$OSTYPE" == "darwin"* ]];
+          source $HOME/work.fish
-        then
+        # '';
-          export PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
-          alias xdg-open=open
-        fi
 
-        source <(helm completion zsh)
+      shellInit = ''
-        source <(kubectl completion zsh)
+        atuin init fish | source
-        eval "$(atuin init zsh)"
+        helm completion fish | source
-
+        kubectl completion fish | source
-        # kubecolor
-        source <(kubectl completion zsh)
-        alias kubectl=kubecolor
-        # make completion work with kubecolor
-        compdef kubecolor=kubectl
       '';
 
       shellAliases = {
         ".." = "cd ..";
-        c = "code";
         g = "git";
         gc = "git checkout $(git branch | fzf)";
         gco = "git checkout $(git branch -r | sed -e 's/^  origin\\///' | fzf)";
@@ -169,22 +158,18 @@ in
         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";
-        ps = "procs";
         t = "cd-fzf";
         tf = "terraform";
         tree = "eza --tree";
         v = "nvim";
       };
-
-      "oh-my-zsh" = {
-        enable = true;
-      };
     };
 
     go = {
@@ -195,6 +180,32 @@ in
       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;
@@ -257,7 +268,6 @@ in
         lualine.enable = true;
         lsp.enable = true;
         lsp.servers = {
-          ansiblels.enable = true;
           bashls.enable = true;
           dockerls.enable = true;
           gopls.enable = true;
@@ -277,10 +287,6 @@ in
         };
         cmp.enable = true;
         nvim-tree.enable = true;
-        packer = {
-          enable = true;
-          plugins = [ ];
-        };
         rainbow-delimiters.enable = true;
         treesitter.enable = true;
         telescope = {
@@ -378,27 +384,51 @@ in
       '';
     };
 
-    vscode = {
+    zed-editor = {
       enable = stdenv.isLinux;
-      package = unstable.vscode;
+      package = unstable.zed-editor;
-      extensions =
+      extensions = [
-        with unstable.vscode-extensions;
+        "ansible"
-        [
+        "color-highlight"
-          bbenoist.nix
+        "dockerfile"
-          github.vscode-pull-request-github
+        "html"
-          golang.go
+        "make"
-          hashicorp.terraform
+        "material-icon-theme"
-          ms-dotnettools.csharp
+        "nix"
-          ms-kubernetes-tools.vscode-kubernetes-tools
+        "toml"
-          redhat.vscode-yaml
+        "vue"
-        ]
+      ];
-        ++ lib.optionals stdenv.isLinux [ ms-python.python ];
+      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 = unstable.librewolf;
+      package = pkgs.librewolf;
 
       profiles = {
         default = {

hosts/hephaestus.nix

@@ -1,43 +1,30 @@
 {
+
   config,
-  fh,
   lib,
+  inputs,
+  master,
   modulesPath,
   pkgs,
   unstable,
   vpngate,
   ...
 }:
-let
-  gnomeExtensions = with pkgs.gnomeExtensions; [
-    caffeine
-    grand-theft-focus
-  ];
-in
 {
 
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  stylix = {
+  security.sudo-rs = {
     enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
+    execWheelOnly = true;
-    image = pkgs.fetchurl {
+    wheelNeedsPassword = true;
-      url = "https://raw.githubusercontent.com/davegallant/nix-config/refs/heads/main/nixos-wallpaper.png";
-      sha256 = "Ztqn9+CHslr6wZdnOTeo/YNi/ICerpcFLyMArsZ/PIY=";
-    };
-    polarity = "dark";
-    fonts.sizes.desktop = 24;
   };
 
   boot = {
     kernelModules = [
       "kvm-amd"
-      "vfio_pci"
-      "vfio"
-      "vfio_iommu_type1"
-      "vfio_virqfd"
     ];
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages;
     kernelParams = [
       "amd_iommu=on"
     ];
@@ -68,7 +55,7 @@ in
       ];
       luks.devices."root" = {
         allowDiscards = true;
-        device = "/dev/disk/by-uuid/21cd166c-1528-49a4-b31b-0d408d48aa80";
+        device = "/dev/disk/by-uuid/89a14ac5-7723-4a0a-bb95-fb2fb2e92160";
         preLVM = true;
         keyFile = "./keyfile0.bin";
       };
@@ -81,39 +68,50 @@ in
   environment.systemPackages =
     with pkgs;
     [
-      albert
-      android-studio
-      android-tools
       bleachbit
       calibre
-      chromium
+      clamtk
       cryptsetup
+      dbeaver-bin
       discord
-      docker-compose
-      fh.packages.x86_64-linux.default
       freefilesync
       gimp-with-plugins
-      gnome-tweaks
+      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
-      mission-center
+      lutris
+      mupen64plus
       nfs-utils
       onlyoffice-desktopeditors
       opensnitch-ui
-      pavucontrol
       pciutils
       pika-backup
       pinentry-curses
-      protonvpn-gui
+      pinta
+      protonup-qt
+      qbittorrent
       qemu
-      remmina
-      ryujinx
       traceroute
-      unityhub
+      unrar
       unstable.beszel
-      unstable.ghostty
+      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
@@ -121,22 +119,20 @@ in
       virt-manager
       vlc
       vpngate.packages.x86_64-linux.default
+      wayland-utils
       whois
       wine
-    ]
+      wl-clipboard
-    ++ gnomeExtensions;
+    ];
+
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/a6723178-6f18-428e-b541-9ac901861125";
+      device = "/dev/disk/by-uuid/7f4f0948-041c-47e9-ab28-53132026f158";
-      fsType = "ext4";
-    };
-    "/home" = {
-      device = "/dev/disk/by-uuid/e3ab2e1a-bddf-4ae0-b00a-bf954c6c182b";
       fsType = "ext4";
     };
     "/boot/efi" = {
-      device = "/dev/disk/by-uuid/3CFD-D749";
+      device = "/dev/disk/by-uuid/F1BD-5227";
       fsType = "vfat";
     };
     "/mnt/synology-2b/media" = {
@@ -151,17 +147,18 @@ in
 
   fonts.packages = with pkgs; [
     dejavu_fonts
-    fira-code
-    fira-code-symbols
     fira-mono
     font-awesome
-    google-fonts
     liberation_ttf
-    nerdfonts
+    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-emoji
+    noto-fonts-color-emoji
-    noto-fonts-extra
+    noto-fonts
   ];
 
   fonts.fontconfig.defaultFonts = {
@@ -226,24 +223,41 @@ in
     };
   };
 
+  services = {
+     mullvad-vpn = {
+       enable = true;
+       package = pkgs.mullvad-vpn;
+     };
+  };
+
   system = {
     autoUpgrade.enable = true;
-    stateVersion = "24.11";
+    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 = [
-      "docker"
       "wheel"
       "libvirtd"
-      "corectrl"
     ];
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
   };
 
   i18n.defaultLocale = "en_US.UTF-8";
@@ -256,6 +270,8 @@ in
 
   time.timeZone = "America/Toronto";
 
+  hardware.bluetooth.enable = true;
+
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
@@ -263,17 +279,20 @@ in
 
   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;
     };
-    zsh.enable = true;
   };
 
   services.avahi = {
@@ -289,9 +308,11 @@ in
     };
   };
 
-  services.flatpak.enable = true;
+  services = {
-
+    desktopManager.plasma6.enable = true;
-  services.gnome.gnome-keyring.enable = true;
+    displayManager.sddm.enable = true;
+    displayManager.sddm.wayland.enable = true;
+  };
 
   services.printing.enable = true;
 
@@ -304,45 +325,8 @@ in
     package = unstable.tailscale;
   };
 
-  services.xserver = {
+  services.clamav.daemon.enable = true;
-    enable = true;
+  services.clamav.updater.enable = true;
-    displayManager = {
-      gdm = {
-        enable = true;
-        wayland = true;
-      };
-    };
-    desktopManager.gnome.enable = true;
-    videoDrivers = [ "amdgpu" ];
-  };
-
-  services.ollama = {
-    package = unstable.ollama;
-    enable = true;
-    acceleration = "rocm";
-    host = "0.0.0.0";
-    environmentVariables = {
-      HSA_OVERRIDE_GFX_VERSION = "11.0.2";
-    };
-    loadModels = [
-      "dolphin3:8b"
-      "llama3.1"
-      "llava"
-    ];
-  };
-
-  services.open-webui = {
-    enable = true;
-    package = unstable.open-webui;
-    host = "0.0.0.0";
-    environment = {
-      ANONYMIZED_TELEMETRY = "False";
-      DO_NOT_TRACK = "True";
-      SCARF_NO_ANALYTICS = "True";
-      OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api";
-      OLLAMA_BASE_URL = "http://127.0.0.1:11434";
-    };
-  };
 
   services.opensnitch = {
     enable = true;
@@ -489,7 +473,6 @@ in
   };
 
   virtualisation = {
-    docker.enable = true;
     podman.enable = true;
     libvirtd = {
       enable = true;

hosts/zelus.nix

@@ -12,15 +12,14 @@
 
   nix.enable = false;
 
-  programs.zsh = {
-    enable = true;
-    # https://github.com/nix-community/home-manager/issues/108#issuecomment-340397178
-    enableCompletion = 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 = {
 
@@ -37,13 +36,11 @@
       tilesize = 50;
       orientation = "bottom";
       persistent-apps = [
-        "/Applications/Ghostty.app"
+        "/Applications/iTerm.app"
         "/Applications/Google Chrome.app"
         "/Applications/LibreWolf.app"
         "/Applications/Obsidian.app"
         "/Applications/Slack.app"
-        "/Applications/Spotify.app"
-        "/Applications/Visual Studio Code.app"
         "/Applications/zoom.us.app"
       ];
     };
@@ -67,7 +64,7 @@
     finder.FXPreferredViewStyle = "Nlsv";
   };
 
-  security.pam.enableSudoTouchIdAuth = true;
+  security.pam.services.sudo_local.touchIdAuth = true;
 
   homebrew = {
     enable = true;
@@ -86,27 +83,27 @@
       "coreutils"
       "gnu-sed"
       "gnu-tar"
+      "k6"
       "node"
       "oras"
-      "k6"
+      "vault"
     ];
 
     casks = [
+      "claude-code"
       "discord"
       "dbeaver-community"
       "font-fira-code-nerd-font"
       "font-hack-nerd-font"
       "fork"
-      "ghostty"
+      "freelens"
       "iterm2"
       "karabiner-elements"
       "knockknock"
       "librewolf"
       "lulu"
-      "mitmproxy"
       "notunes"
       "obsidian"
-      "ollama"
       "raycast"
       "rectangle"
       "signal"
@@ -115,11 +112,14 @@
       "stats"
       "steam"
       "taskexplorer"
-      "tailscale"
+      "tailscale-app"
       "vlc"
+      "whisky"
+      "zed"
     ];
 
     taps = [
+      "hashicorp/tap"
       "homebrew/bundle"
       "homebrew/cask-fonts"
       "homebrew/cask-versions"
@@ -127,9 +127,4 @@
     ];
   };
 
-  stylix = {
-    enable = true;
-    image = "/Library/tokyo-night.jpg";
-  };
-
 }

justfile

@@ -5,13 +5,16 @@ alias r := rebuild
 
 arch := `uname -s`
 
-cmd := if arch == "Linux" { "sudo nixos-rebuild --use-remote-sudo" } else { "darwin-rebuild" }
+cmd := if arch == "Linux" { "nixos-rebuild --sudo" } else { "sudo darwin-rebuild" }
 
 rebuild:
-  $cmd switch --flake . -I nixos-config="hosts/$(hostname).nix"
+  $cmd switch --flake .
+
+rebuild-boot:
+  $cmd boot --flake . --install-bootloader
 
 rollback:
-  $cmd switch --rollback --flake .
+  sudo $cmd switch --rollback --flake .
 
 channel-update:
   nix-channel --update

update-flake.sh

@@ -2,6 +2,10 @@
 
 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

upgrade-diff.nix

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