From 80033fd2ae89ff4b19fc215f8099277ff2b29a09 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Fri, 12 Dec 2025 12:40:09 -0500 Subject: [PATCH] chore(release): bump NixOS to 25.11 and update channels Upgrade the NixOS `stateVersion` from 25.05 to 25.11 in all system configuration files and update all nix channel URLs to the 25.11 releases. Adjust Home Manager and terminal module configurations accordingly, clean up duplicated SSH keys, and update LLaMA server command lines. Minor housekeeping changes to package definitions and other configuration files are also included. --- README.md | 4 +- .../default.nix | 38 +++---------------- .../evanreichard@mac-va-mbp-work/default.nix | 9 +---- .../default.nix | 38 ++++--------------- .../evanreichard@lin-va-terminal/default.nix | 14 +++---- .../evanreichard@lin-va-thinkpad/default.nix | 21 ++++------ .../evanreichard@lin-va-utility/default.nix | 28 ++++---------- .../programs/terminal/bash/config/.sqliterc | 2 + .../home/programs/terminal/bash/default.nix | 25 +++++++++--- .../home/programs/terminal/nvim/default.nix | 11 ++++-- modules/nixos/services/openssh/default.nix | 16 +++++--- packages/llama-cpp/default.nix | 4 +- .../lin-o1-headscale/default.nix | 23 ++++------- systems/aarch64-linux/lin-o1-node/default.nix | 24 ++++-------- .../lin-va-mbp-personal/default.nix | 2 +- .../x86_64-linux/lin-o1-x86-node/default.nix | 23 ++++------- .../x86_64-linux/lin-ovh-kube1/default.nix | 23 ++++------- .../x86_64-linux/lin-ssd-kube1/default.nix | 24 ++++-------- .../x86_64-linux/lin-va-desktop/default.nix | 13 ++++--- .../lin-va-nix-builder/default.nix | 30 ++------------- .../x86_64-linux/lin-va-office/default.nix | 22 ++++------- .../x86_64-linux/lin-va-terminal/default.nix | 2 +- .../x86_64-linux/lin-va-thinkpad/default.nix | 9 +++-- systems/x86_64-vmware/lin-va-rke2/default.nix | 8 +++- 24 files changed, 149 insertions(+), 264 deletions(-) create mode 100644 modules/home/programs/terminal/bash/config/.sqliterc diff --git a/README.md b/README.md index 4653d28..07e0ffd 100755 --- a/README.md +++ b/README.md @@ -53,11 +53,11 @@ nix-collect-garbage --delete-old ```bash # Update System Channels -sudo nix-channel --add https://nixos.org/channels/nixpkgs-25.05-darwin nixpkgs +sudo nix-channel --add https://nixos.org/channels/nixpkgs-25.11-darwin nixpkgs sudo nix-channel --update # Update Home Manager -nix-channel --add https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz home-manager +nix-channel --add https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz home-manager nix-channel --update # Link Repo diff --git a/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix b/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix index 1056267..d4838b0 100755 --- a/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix +++ b/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix @@ -1,9 +1,13 @@ -{ lib, pkgs, config, namespace, ... }: +{ lib +, config +, namespace +, ... +}: let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; reichard = { user = { @@ -11,15 +15,6 @@ in inherit (config.snowfallorg.user) name; }; - services = { - # TODO - # sops = { - # enable = true; - # defaultSopsFile = lib.snowfall.fs.get-file "secrets/mac-va-mbp-personal/evanreichard/default.yaml"; - # sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; - # }; - }; - programs = { graphical = { ghostty = enabled; @@ -35,25 +30,4 @@ in }; }; }; - - # Global Packages - # programs.jq = enabled; - # programs.pandoc = enabled; - # home.packages = with pkgs; [ - # android-tools - # imagemagick - # mosh - # python311 - # texliveSmall # Pandoc PDF Dep - # google-cloud-sdk - # tldr - # ]; - - home.packages = with pkgs; [ fastfetch ]; - - # SQLite Configuration - home.file.".sqliterc".text = '' - .headers on - .mode column - ''; } diff --git a/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix b/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix index 3a44abb..65e9d16 100755 --- a/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix +++ b/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix @@ -8,7 +8,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; reichard = { user = { @@ -39,7 +39,6 @@ in home.packages = with pkgs; [ android-tools imagemagick - mosh python312 texliveSmall # Pandoc PDF Dep google-cloud-sdk @@ -47,10 +46,4 @@ in claude-code reichard.qwen-code ]; - - # SQLite Configuration - home.file.".sqliterc".text = '' - .headers on - .mode column - ''; } diff --git a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix index 146c85b..9f869b7 100755 --- a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix +++ b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix @@ -1,9 +1,15 @@ -{ pkgs, lib, config, namespace, osConfig, ... }: +{ pkgs +, lib +, config +, namespace +, osConfig +, ... +}: let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; reichard = { user = { @@ -49,25 +55,16 @@ in }; }; - # home.packages = with pkgs; [ - # catppuccin-gtk - # ]; - dconf = { settings = { "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; cursor-theme = "catppuccin-macchiato-mauve-cursors"; cursor-size = 24; - # enable-hot-corners = false; - # font-name = osConfig.${namespace}.system.fonts.default; - # gtk-theme = cfg.theme.name; - # icon-theme = cfg.icon.name; }; }; }; - home.pointerCursor = { gtk.enable = true; name = "catppuccin-macchiato-mauve-cursors"; @@ -81,23 +78,4 @@ in path = "${config.home.homeDirectory}/.kube/rke2"; }; }; - - # Global Packages - # programs.jq = enabled; - # programs.pandoc = enabled; - # home.packages = with pkgs; [ - # android-tools - # imagemagick - # mosh - # python311 - # texliveSmall # Pandoc PDF Dep - # google-cloud-sdk - # tldr - # ]; - - # SQLite Configuration - home.file.".sqliterc".text = '' - .headers on - .mode column - ''; } diff --git a/homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix b/homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix index e7fe2bf..c52e152 100755 --- a/homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix +++ b/homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix @@ -1,9 +1,13 @@ -{ lib, config, namespace, ... }: +{ lib +, config +, namespace +, ... +}: let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; reichard = { user = { @@ -27,10 +31,4 @@ in }; }; }; - - # SQLite Configuration - home.file.".sqliterc".text = '' - .headers on - .mode column - ''; } diff --git a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix index 22075b9..1feaf40 100755 --- a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix +++ b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix @@ -1,9 +1,15 @@ -{ pkgs, lib, config, namespace, osConfig, ... }: +{ pkgs +, lib +, config +, namespace +, osConfig +, ... +}: let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; reichard = { user = { @@ -55,15 +61,10 @@ in color-scheme = "prefer-dark"; cursor-theme = "catppuccin-macchiato-mauve-cursors"; cursor-size = 24; - # enable-hot-corners = false; - # font-name = osConfig.${namespace}.system.fonts.default; - # gtk-theme = cfg.theme.name; - # icon-theme = cfg.icon.name; }; }; }; - home.pointerCursor = { gtk.enable = true; name = "catppuccin-macchiato-mauve-cursors"; @@ -77,10 +78,4 @@ in path = "${config.home.homeDirectory}/.kube/rke2"; }; }; - - # SQLite Configuration - home.file.".sqliterc".text = '' - .headers on - .mode column - ''; } diff --git a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix index d2eaadb..72367e7 100755 --- a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix +++ b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix @@ -1,4 +1,10 @@ -{ pkgs, lib, config, namespace, osConfig, ... }: +{ pkgs +, lib +, config +, namespace +, osConfig +, ... +}: let inherit (lib.${namespace}) enabled; in @@ -62,7 +68,6 @@ in }; }; - home.pointerCursor = { gtk.enable = true; name = "catppuccin-macchiato-mauve-cursors"; @@ -76,23 +81,4 @@ in path = "${config.home.homeDirectory}/.kube/rke2"; }; }; - - # Global Packages - # programs.jq = enabled; - # programs.pandoc = enabled; - # home.packages = with pkgs; [ - # android-tools - # imagemagick - # mosh - # python311 - # texliveSmall # Pandoc PDF Dep - # google-cloud-sdk - # tldr - # ]; - - # SQLite Configuration - home.file.".sqliterc".text = '' - .headers on - .mode column - ''; } diff --git a/modules/home/programs/terminal/bash/config/.sqliterc b/modules/home/programs/terminal/bash/config/.sqliterc new file mode 100644 index 0000000..1b46ea8 --- /dev/null +++ b/modules/home/programs/terminal/bash/config/.sqliterc @@ -0,0 +1,2 @@ +.headers on +.mode column diff --git a/modules/home/programs/terminal/bash/default.nix b/modules/home/programs/terminal/bash/default.nix index 9ea5677..8512cd0 100755 --- a/modules/home/programs/terminal/bash/default.nix +++ b/modules/home/programs/terminal/bash/default.nix @@ -1,7 +1,12 @@ -{ pkgs, lib, config, namespace, ... }: +{ pkgs +, lib +, config +, namespace +, ... +}: let inherit (lib) mkIf optionalAttrs; - inherit (pkgs.stdenv) isLinux; + inherit (pkgs.stdenv) isLinux isDarwin; cfg = config.${namespace}.programs.terminal.bash; in { @@ -15,8 +20,12 @@ in shellAliases = { grep = "grep --color"; ssh = "TERM=xterm-256color ssh"; - } // optionalAttrs isLinux { + } + // optionalAttrs isLinux { sync-watch = "watch -d grep -e Dirty: -e Writeback: /proc/meminfo"; + } + // optionalAttrs isDarwin { + mosh = "mosh --ssh=\"/usr/bin/ssh\""; }; profileExtra = '' export COLORTERM=truecolor @@ -28,7 +37,11 @@ in VISUAL=vim EDITOR="$VISUAL" - fastfetch + if [ -z "$CLAUDE_CODE_ENTRYPOINT" ]; then + fastfetch + fi + + [[ -f ~/.bash_custom ]] && . ~/.bash_custom ''; }; @@ -57,11 +70,13 @@ in }; home.packages = with pkgs; [ - fastfetch bashInteractive + fastfetch + mosh nerd-fonts.meslo-lg ]; home.file.".config/fastfetch/config.jsonc".text = builtins.readFile ./config/fastfetch.jsonc; + home.file.".sqliterc".text = builtins.readFile ./config/.sqliterc; }; } diff --git a/modules/home/programs/terminal/nvim/default.nix b/modules/home/programs/terminal/nvim/default.nix index 9152ed0..a216a52 100755 --- a/modules/home/programs/terminal/nvim/default.nix +++ b/modules/home/programs/terminal/nvim/default.nix @@ -133,12 +133,16 @@ in ]; extraPackages = with pkgs; [ + # Toggle Term + bashInteractive + # Telescope Dependencies fd ripgrep tree-sitter # LSP Dependencies + eslint_d go golangci-lint golangci-lint-langserver @@ -151,7 +155,6 @@ in nodePackages.typescript-language-server nodePackages.vscode-langservers-extracted pyright - eslint_d python312Packages.autopep8 # Formatters @@ -178,14 +181,14 @@ in # Generate Nix Vars "nvim/lua/nix-vars.lua".text = '' local nix_vars = { + clangd = "${pkgs.clang-tools}/bin/clangd", + golintls = "${pkgs.golangci-lint-langserver}/bin/golangci-lint-langserver", gopls = "${pkgs.gopls}/bin/gopls", luals = "${pkgs.lua-language-server}/bin/lua-language-server", + omnisharp = "${pkgs.omnisharp-roslyn}/bin/OmniSharp", sveltels = "${pkgs.nodePackages.svelte-language-server}/bin/svelteserver", tsls = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", - golintls = "${pkgs.golangci-lint-langserver}/bin/golangci-lint-langserver", vscls = "${pkgs.nodePackages.vscode-langservers-extracted}", - clangd = "${pkgs.clang-tools}/bin/clangd", - omnisharp = "${pkgs.omnisharp-roslyn}/bin/OmniSharp", } return nix_vars ''; diff --git a/modules/nixos/services/openssh/default.nix b/modules/nixos/services/openssh/default.nix index aeded87..2f9486e 100644 --- a/modules/nixos/services/openssh/default.nix +++ b/modules/nixos/services/openssh/default.nix @@ -1,4 +1,8 @@ -{ config, lib, namespace, ... }: +{ config +, lib +, namespace +, ... +}: let inherit (lib) types @@ -9,23 +13,23 @@ let cfg = config.${namespace}.services.openssh; - authorizedKeys = [ + globalKeys = [ # evanreichard@lin-va-mbp-personal "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" # evanreichard@mac-va-mbp-personal "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" # evanreichard@lin-va-thinkpad "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" - # evanreichard@mobile - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIARTNbl4lgQsp7SJEng7vprL0+ChC9e6iR7o/PiC4Jme" # evanreichard@lin-va-terminal "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM5e6Cty+7rX5BjIEHBTU6GnzfOxPJiHpSqin/BnsypO" + # evanreichard@mobile + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIARTNbl4lgQsp7SJEng7vprL0+ChC9e6iR7o/PiC4Jme" ]; in { options.${namespace}.services.openssh = with types; { enable = lib.mkEnableOption "OpenSSH support"; - authorizedKeys = mkOpt (listOf str) authorizedKeys "The public keys to apply."; + authorizedKeys = mkOpt (listOf str) [ ] "The public keys to apply."; extraConfig = mkOpt str "" "Extra configuration to apply."; }; @@ -80,7 +84,7 @@ in }; reichard = { - user.extraOptions.openssh.authorizedKeys.keys = cfg.authorizedKeys; + user.extraOptions.openssh.authorizedKeys.keys = cfg.authorizedKeys ++ globalKeys; }; }; } diff --git a/packages/llama-cpp/default.nix b/packages/llama-cpp/default.nix index e20cf61..6b48548 100644 --- a/packages/llama-cpp/default.nix +++ b/packages/llama-cpp/default.nix @@ -7,12 +7,12 @@ vulkanSupport = true; }).overrideAttrs (oldAttrs: rec { - version = "7343"; + version = "7360"; src = pkgs.fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${version}"; - hash = "sha256-hD8cyorU5NezRmKx+iN5gOD+3bAzS3IDVl7Ju5/zVHc="; + hash = "sha256-576UL3aZ4AFvxCUP2U4W1gJuAjStRZ6y0uUy/hsdRW0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/systems/aarch64-linux/lin-o1-headscale/default.nix b/systems/aarch64-linux/lin-o1-headscale/default.nix index 60ceaf0..450ab3f 100755 --- a/systems/aarch64-linux/lin-o1-headscale/default.nix +++ b/systems/aarch64-linux/lin-o1-headscale/default.nix @@ -1,4 +1,10 @@ -{ namespace, config, pkgs, lib, modulesPath, ... }: +{ namespace +, config +, pkgs +, lib +, modulesPath +, ... +}: let inherit (lib.${namespace}) enabled; @@ -9,7 +15,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "UTC"; boot.loader.grub = { @@ -41,19 +47,6 @@ in }; }; - users.users.${cfg.name} = { - openssh = { - authorizedKeys.keys = [ - # evanreichard@lin-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" - # evanreichard@mac-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" - # evanreichard@lin-va-thinkpad - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" - ]; - }; - }; - environment.systemPackages = with pkgs; [ btop tmux diff --git a/systems/aarch64-linux/lin-o1-node/default.nix b/systems/aarch64-linux/lin-o1-node/default.nix index af0a400..df74787 100755 --- a/systems/aarch64-linux/lin-o1-node/default.nix +++ b/systems/aarch64-linux/lin-o1-node/default.nix @@ -1,15 +1,18 @@ -{ namespace, config, pkgs, lib, modulesPath, ... }: +{ namespace +, pkgs +, lib +, modulesPath +, ... +}: let inherit (lib.${namespace}) enabled; - - cfg = config.${namespace}.user; in { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "UTC"; boot.loader.grub = { @@ -39,19 +42,6 @@ in }; }; - users.users.${cfg.name} = { - openssh = { - authorizedKeys.keys = [ - # evanreichard@lin-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" - # evanreichard@mac-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" - # evanreichard@lin-va-thinkpad - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" - ]; - }; - }; - environment.systemPackages = with pkgs; [ btop tmux diff --git a/systems/aarch64-linux/lin-va-mbp-personal/default.nix b/systems/aarch64-linux/lin-va-mbp-personal/default.nix index 60a2756..8778658 100755 --- a/systems/aarch64-linux/lin-va-mbp-personal/default.nix +++ b/systems/aarch64-linux/lin-va-mbp-personal/default.nix @@ -7,7 +7,7 @@ in ./hardware-configuration.nix ]; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "America/New_York"; # System Config diff --git a/systems/x86_64-linux/lin-o1-x86-node/default.nix b/systems/x86_64-linux/lin-o1-x86-node/default.nix index af0a400..158d801 100755 --- a/systems/x86_64-linux/lin-o1-x86-node/default.nix +++ b/systems/x86_64-linux/lin-o1-x86-node/default.nix @@ -1,4 +1,10 @@ -{ namespace, config, pkgs, lib, modulesPath, ... }: +{ namespace +, config +, pkgs +, lib +, modulesPath +, ... +}: let inherit (lib.${namespace}) enabled; @@ -9,7 +15,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "UTC"; boot.loader.grub = { @@ -39,19 +45,6 @@ in }; }; - users.users.${cfg.name} = { - openssh = { - authorizedKeys.keys = [ - # evanreichard@lin-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" - # evanreichard@mac-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" - # evanreichard@lin-va-thinkpad - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" - ]; - }; - }; - environment.systemPackages = with pkgs; [ btop tmux diff --git a/systems/x86_64-linux/lin-ovh-kube1/default.nix b/systems/x86_64-linux/lin-ovh-kube1/default.nix index 647e2cf..dbd6f50 100755 --- a/systems/x86_64-linux/lin-ovh-kube1/default.nix +++ b/systems/x86_64-linux/lin-ovh-kube1/default.nix @@ -1,4 +1,10 @@ -{ namespace, config, pkgs, lib, modulesPath, ... }: +{ namespace +, config +, pkgs +, lib +, modulesPath +, ... +}: let inherit (lib.${namespace}) enabled; @@ -9,7 +15,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "UTC"; networking.firewall.allowedTCPPorts = [ 443 ]; @@ -44,19 +50,6 @@ in }; }; - users.users.${cfg.name} = { - openssh = { - authorizedKeys.keys = [ - # evanreichard@lin-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" - # evanreichard@mac-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" - # evanreichard@lin-va-thinkpad - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" - ]; - }; - }; - environment.systemPackages = with pkgs; [ btop tmux diff --git a/systems/x86_64-linux/lin-ssd-kube1/default.nix b/systems/x86_64-linux/lin-ssd-kube1/default.nix index d5ff227..a9e8070 100755 --- a/systems/x86_64-linux/lin-ssd-kube1/default.nix +++ b/systems/x86_64-linux/lin-ssd-kube1/default.nix @@ -1,15 +1,18 @@ -{ namespace, config, pkgs, lib, modulesPath, ... }: +{ namespace +, pkgs +, lib +, modulesPath +, ... +}: let inherit (lib.${namespace}) enabled; - - cfg = config.${namespace}.user; in { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "UTC"; networking.firewall.allowedTCPPorts = [ 443 ]; @@ -52,19 +55,6 @@ in }; }; - # users.users.${cfg.name} = { - # openssh = { - # authorizedKeys.keys = [ - # # evanreichard@lin-va-mbp-personal - # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" - # # evanreichard@mac-va-mbp-personal - # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" - # # evanreichard@lin-va-thinkpad - # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" - # ]; - # }; - # }; - environment.systemPackages = with pkgs; [ btop tmux diff --git a/systems/x86_64-linux/lin-va-desktop/default.nix b/systems/x86_64-linux/lin-va-desktop/default.nix index 7bf6b09..2d54f30 100755 --- a/systems/x86_64-linux/lin-va-desktop/default.nix +++ b/systems/x86_64-linux/lin-va-desktop/default.nix @@ -92,10 +92,11 @@ in package = pkgs.reichard.llama-swap; settings = { models = { - # https://huggingface.co/mradermacher/gpt-oss-20b-heretic-GGUF/tree/main + # https://huggingface.co/mradermacher/gpt-oss-20b-heretic-v2-i1-GGUF/tree/main + # --chat-template-kwargs '{\"reasoning_effort\":\"low\"}' "gpt-oss-20b-thinking" = { name = "GPT OSS (20B) - Thinking"; - cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server --port \${PORT} -m /mnt/ssd/Models/gpt-oss-20b-heretic-MXFP4.gguf --ctx-size 128000 -ts 75,25 --mlock --chat-template-kwargs '{\"reasoning_effort\":\"low\"}'"; + cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server --port \${PORT} -m /mnt/ssd/Models/gpt-oss-20b-heretic-v2.i1-MXFP4_MOE.gguf --ctx-size 131072 -ts 57,43 --temp 1.0 --top-p 1.0 --top-k 40 --mlock"; aliases = [ "claude-sonnet-4-5" "claude-sonnet-4-5-20250929" @@ -109,19 +110,19 @@ in # https://huggingface.co/unsloth/Qwen3-Coder-30B-A3B-Instruct-GGUF/tree/main "qwen3-coder-30b-instruct" = { name = "Qwen3 Coder (30B) - Instruct"; - cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server --port \${PORT} -m /mnt/ssd/Models/Qwen3-Coder-30B-A3B-Instruct-UD-IQ2_M.gguf --ctx-size 262144 --temp 0.7 --min-p 0.0 --top-p 0.8 --top-k 20 --repeat-penalty 1.05 --cache-type-k q4_0 --cache-type-v q4_0 --mlock"; + cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server --port \${PORT} -m /mnt/ssd/Models/Qwen3-Coder-30B-A3B-Instruct-IQ4_XS.gguf --ctx-size 65536 --temp 0.7 --min-p 0.0 --top-p 0.8 --top-k 20 --repeat-penalty 1.05 --cache-type-k q4_0 --cache-type-v q4_0 --mlock"; }; # https://huggingface.co/unsloth/Qwen3-30B-A3B-Instruct-2507-GGUF/tree/main "qwen3-30b-2507-instruct" = { name = "Qwen3 2507 (30B) - Instruct"; - cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server --port \${PORT} -m /mnt/ssd/Models/Qwen3-30B-A3B-Instruct-2507-UD-IQ2_M.gguf --ctx-size 262144 --temp 0.7 --min-p 0.0 --top-p 0.8 --top-k 20 --repeat-penalty 1.05 --cache-type-k q4_0 --cache-type-v q4_0"; + cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server --port \${PORT} -m /mnt/ssd/Models/Qwen3-30B-A3B-Instruct-2507-IQ4_XS.gguf --ctx-size 65536 --temp 0.7 --min-p 0.0 --top-p 0.8 --top-k 20 --repeat-penalty 1.05 --cache-type-k q4_0 --cache-type-v q4_0 --mlock"; }; # https://huggingface.co/unsloth/Qwen3-30B-A3B-Thinking-2507-GGUF/tree/main "qwen3-30b-2507-thinking" = { name = "Qwen3 2507 (30B) - Thinking"; - cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server --port \${PORT} -m /mnt/ssd/Models/Qwen3-30B-A3B-Thinking-2507-Q4_K_M.gguf --ctx-size 16384 --temp 0.7 --min-p 0.0 --top-p 0.8 --top-k 20 --cache-type-k q4_0 --cache-type-v q4_0"; + cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server --port \${PORT} -m /mnt/ssd/Models/Qwen3-30B-A3B-Thinking-2507-IQ4_XS.gguf --ctx-size 65536 --temp 0.7 --min-p 0.0 --top-p 0.8 --top-k 20 --repeat-penalty 1.05 --cache-type-k q4_0 --cache-type-v q4_0 --mlock"; }; # https://huggingface.co/unsloth/Qwen3-Next-80B-A3B-Instruct-GGUF/tree/main @@ -151,7 +152,7 @@ in # https://huggingface.co/unsloth/Qwen2.5-Coder-3B-Instruct-128K-GGUF/tree/main "qwen2.5-coder-3b-instruct" = { name = "Qwen2.5 Coder (3B) - Instruct"; - cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server -m /mnt/ssd/Models/Qwen2.5-Coder-3B-Instruct-Q4_K_M.gguf --fim-qwen-3b-default --ctx-size 32768 -dev CUDA1 --port \${PORT}"; + cmd = "${pkgs.reichard.llama-cpp}/bin/llama-server -m /mnt/ssd/Models/Qwen2.5-Coder-3B-Instruct-Q4_K_M.gguf --fim-qwen-3b-default --ctx-size 20000 -ts 60,40 --port \${PORT}"; }; # https://huggingface.co/unsloth/Qwen3-VL-8B-Instruct-GGUF/tree/main diff --git a/systems/x86_64-linux/lin-va-nix-builder/default.nix b/systems/x86_64-linux/lin-va-nix-builder/default.nix index e08fc0c..77808bc 100755 --- a/systems/x86_64-linux/lin-va-nix-builder/default.nix +++ b/systems/x86_64-linux/lin-va-nix-builder/default.nix @@ -1,10 +1,9 @@ -{ namespace, config, pkgs, ... }: -let - cfg = config.${namespace}.user; -in +{ pkgs +, ... +}: { time.timeZone = "America/New_York"; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; reichard = { system = { @@ -31,12 +30,6 @@ in openssh = { enable = true; authorizedKeys = [ - # evanreichard@lin-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" - # evanreichard@mac-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" - # evanreichard@lin-va-thinkpad - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" # NixOS Builder "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDF8QjeN8lpT+Mc70zwEJQqN9W/GKvTOTd32VgfNhVdN" ]; @@ -44,21 +37,6 @@ in }; }; - users.users.${cfg.name} = { - openssh = { - authorizedKeys.keys = [ - # evanreichard@lin-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" - # evanreichard@mac-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" - # evanreichard@lin-va-thinkpad - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" - # NixOS Builder - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDF8QjeN8lpT+Mc70zwEJQqN9W/GKvTOTd32VgfNhVdN" - ]; - }; - }; - # System Packages environment.systemPackages = with pkgs; [ btop diff --git a/systems/x86_64-linux/lin-va-office/default.nix b/systems/x86_64-linux/lin-va-office/default.nix index df98841..456329b 100755 --- a/systems/x86_64-linux/lin-va-office/default.nix +++ b/systems/x86_64-linux/lin-va-office/default.nix @@ -1,10 +1,15 @@ -{ namespace, pkgs, config, lib, ... }: +{ namespace +, pkgs +, config +, lib +, ... +}: let inherit (lib.${namespace}) enabled; cfg = config.${namespace}.user; in { - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "America/New_York"; nixpkgs.config.allowUnfree = true; @@ -47,19 +52,6 @@ in }; }; - users.users.${cfg.name} = { - openssh = { - authorizedKeys.keys = [ - # evanreichard@lin-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY" - # evanreichard@mac-va-mbp-personal - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV" - # evanreichard@lin-va-thinkpad - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz" - ]; - }; - }; - # System Packages environment.systemPackages = with pkgs; [ btop diff --git a/systems/x86_64-linux/lin-va-terminal/default.nix b/systems/x86_64-linux/lin-va-terminal/default.nix index 747cea2..e75c6c7 100755 --- a/systems/x86_64-linux/lin-va-terminal/default.nix +++ b/systems/x86_64-linux/lin-va-terminal/default.nix @@ -3,7 +3,7 @@ let inherit (lib.${namespace}) enabled; in { - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "America/New_York"; boot.supportedFilesystems = [ "nfs" ]; diff --git a/systems/x86_64-linux/lin-va-thinkpad/default.nix b/systems/x86_64-linux/lin-va-thinkpad/default.nix index f1fab3c..08398bc 100755 --- a/systems/x86_64-linux/lin-va-thinkpad/default.nix +++ b/systems/x86_64-linux/lin-va-thinkpad/default.nix @@ -1,12 +1,15 @@ -{ namespace, pkgs, lib, ... }: +{ namespace +, pkgs +, lib +, ... +}: let inherit (lib.${namespace}) enabled; in { - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "America/New_York"; - boot = { supportedFilesystems = [ "nfs" ]; kernelParams = [ diff --git a/systems/x86_64-vmware/lin-va-rke2/default.nix b/systems/x86_64-vmware/lin-va-rke2/default.nix index 0421929..43b0065 100755 --- a/systems/x86_64-vmware/lin-va-rke2/default.nix +++ b/systems/x86_64-vmware/lin-va-rke2/default.nix @@ -1,4 +1,8 @@ -{ namespace, lib, modulesPath, ... }: +{ namespace +, lib +, modulesPath +, ... +}: let inherit (lib.${namespace}) enabled; in @@ -9,7 +13,7 @@ in config = { # Basic System - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; time.timeZone = "UTC"; reichard = {