Merge branch 'master' of ssh://git.joshuabell.xyz:3032/ringofstorms/dotfiles

This commit is contained in:
RingOfStorms (Joshua Bell) 2025-12-27 20:47:56 -06:00
commit 5fe2566c2d
6 changed files with 72 additions and 65 deletions

View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1766025857, "lastModified": 1766125104,
"narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=", "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -21,11 +21,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1766260273, "lastModified": 1766426038,
"narHash": "sha256-jY7aB0sRBJy1g36mPu5yb+3h7IMx7/fY3pKI10KcJ6A=", "narHash": "sha256-3TxsJjL5M83q9nOa4ls6rWfbECYUE6llzBAgqCYQml8=",
"owner": "sst", "owner": "sst",
"repo": "opencode", "repo": "opencode",
"rev": "6c40bfe04322c14350c9bd3447174986800a57d7", "rev": "6baee0791f48bcf32eef1e199d0cadca57772b9b",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
hosts/h001/flake.lock generated
View file

@ -211,11 +211,11 @@
}, },
"litellm-nixpkgs": { "litellm-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766309749,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1222,11 +1222,11 @@
}, },
"open-webui-nixpkgs": { "open-webui-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766309749,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -65,9 +65,11 @@ in
"claude-sonnet-3.5" "claude-sonnet-3.5"
"claude-sonnet-4" "claude-sonnet-4"
"claude-sonnet-4.5" "claude-sonnet-4.5"
"claude-haiku-4.5"
"gemini-2.5-pro" "gemini-2.5-pro"
"openai-gpt-5" "openai-gpt-5"
"openai-gpt-5-mini" "openai-gpt-5-mini"
"grok-code-fast-1"
] ]
) )
# Azure # Azure
@ -77,13 +79,13 @@ in
litellm_params = { litellm_params = {
model = "azure/${m}"; model = "azure/${m}";
api_base = "http://100.64.0.8:9010/azure"; api_base = "http://100.64.0.8:9010/azure";
api_version = "2025-04-01-preview"; api_version = "2025-07-01-preview";
api_key = "na"; api_key = "na";
}; };
}) })
# curl -L "http://100.64.0.8:9010/azure/openai/models?api-version=2025-04-01-preview" | jq '.data.[].id' # curl -L "http://100.64.0.8:9010/azure/openai/models?api-version=2025-04-01-preview" | jq '.data.[].id'
[ [
"gpt-5.2-2025-12-11" "gpt-5.2"
"gpt-5.1-2025-11-13" "gpt-5.1-2025-11-13"
"gpt-4o-2024-05-13" "gpt-4o-2024-05-13"
"gpt-4.1-2025-04-14" "gpt-4.1-2025-04-14"

View file

@ -13,6 +13,7 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.supportedFilesystems = [ "bcachefs" ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"ehci_pci" "ehci_pci"
"ahci" "ahci"

98
hosts/oren/flake.lock generated
View file

@ -31,11 +31,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/beszel", "dir": "flakes/beszel",
"lastModified": 1765154566, "lastModified": 1766426360,
"narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", "narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", "rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892",
"revCount": 855, "revCount": 967,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -47,11 +47,11 @@
}, },
"beszel-nixpkgs": { "beszel-nixpkgs": {
"locked": { "locked": {
"lastModified": 1764517877, "lastModified": 1765472234,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,11 +64,11 @@
"common": { "common": {
"locked": { "locked": {
"dir": "flakes/common", "dir": "flakes/common",
"lastModified": 1765154566, "lastModified": 1766426360,
"narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", "narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", "rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892",
"revCount": 855, "revCount": 967,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -123,11 +123,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/de_plasma", "dir": "flakes/de_plasma",
"lastModified": 1765602270, "lastModified": 1766426360,
"narHash": "sha256-zDzxBXsYE/aFvgNMeG5We4R6oaiPzrTgGOVKHHXcosw=", "narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "7ce490fd5ec0bf85bd4eb0f4dd2e355080caec73", "rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892",
"revCount": 880, "revCount": 967,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -161,11 +161,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/flatpaks", "dir": "flakes/flatpaks",
"lastModified": 1765154566, "lastModified": 1766426360,
"narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", "narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", "rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892",
"revCount": 855, "revCount": 967,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -202,11 +202,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1764866045, "lastModified": 1766292113,
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,11 +273,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1764950072, "lastModified": 1765779637,
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f61125a668a320878494449750330ca58b78c557", "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,11 +289,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1764522689, "lastModified": 1766201043,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +305,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1764983851, "lastModified": 1766201043,
"narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +321,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1765270179, "lastModified": 1766125104,
"narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1236,11 +1236,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/opencode", "dir": "flakes/opencode",
"lastModified": 1765399958, "lastModified": 1766426360,
"narHash": "sha256-IPFaDFPmIBTJEbiDkiTjBbbUb2iZmfQ8nLQAIWiIehk=", "narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "db74abbb28b226e6ee7c9a2453a44fa127df7027", "rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892",
"revCount": 868, "revCount": 967,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -1255,11 +1255,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1765399732, "lastModified": 1766426038,
"narHash": "sha256-cYLaGukNd9MpJ9tR4Gg/6r2YwySDKB43bTzsYzvDkhM=", "narHash": "sha256-3TxsJjL5M83q9nOa4ls6rWfbECYUE6llzBAgqCYQml8=",
"owner": "sst", "owner": "sst",
"repo": "opencode", "repo": "opencode",
"rev": "6288a032fd5c0ea7085e2f31071212147fed1cfe", "rev": "6baee0791f48bcf32eef1e199d0cadca57772b9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1383,11 +1383,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1764777428, "lastModified": 1765641080,
"narHash": "sha256-wFfPnXo1P+NwSK+Y7xYVwt0mbYhe9uBrf80T5KpBV5Q=", "narHash": "sha256-AyPi7rZVfjTjQrhPHP+ugpVY8tcUzF3Lw1RjACuxAms=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "ee642c429fced7d51c5f9c9694034f6222a1186f", "rev": "224ad4e3ecd9421c7469c4f06ff5faf7f6e8bedb",
"revCount": 324, "revCount": 325,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/nvim" "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
}, },
@ -1445,11 +1445,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/secrets", "dir": "flakes/secrets",
"lastModified": 1765154566, "lastModified": 1766426360,
"narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", "narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", "rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892",
"revCount": 855, "revCount": 967,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },

View file

@ -130,6 +130,12 @@
common.homeManagerModules.starship common.homeManagerModules.starship
common.homeManagerModules.zoxide common.homeManagerModules.zoxide
common.homeManagerModules.zsh common.homeManagerModules.zsh
(
{ ... }:
{
programs.tmux.package = pkgs.unstable.tmux;
}
)
]; ];
}; };
@ -165,8 +171,6 @@
nodejs_24 nodejs_24
ttyd ttyd
appimage-run appimage-run
unstable.opencode
]; ];
services.flatpak.packages = [ services.flatpak.packages = [