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.
This commit is contained in:
2025-12-12 12:40:09 -05:00
parent a367f724ce
commit 80033fd2ae
24 changed files with 149 additions and 264 deletions

View File

@@ -0,0 +1,2 @@
.headers on
.mode column

View File

@@ -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;
};
}

View File

@@ -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
'';

View File

@@ -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;
};
};
}