ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-12-28 22:07:17 -06:00
commit 684439595f
6 changed files with 290 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hosts/h001/flake.lock generated
View file

@ -31,11 +31,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/beszel", "dir": "flakes/beszel",
"lastModified": 1766078770, "lastModified": 1766890076,
"narHash": "sha256-zzH5ejNAs/B42GGLVaa+SLt11PU0RPVKAdvTZUJolRU=", "narHash": "sha256-u7WSMDprtQXowub2WNCVfZHBaRUysq3hICpiHbyEXLI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "49f82a343492cd5c47797f4f1b843bb5453a7c7b", "rev": "5fe2566c2da9359de8aa2b610913feb6454a8ceb",
"revCount": 953, "revCount": 973,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -63,11 +63,11 @@
}, },
"beszel-nixpkgs_2": { "beszel-nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766651565,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"litellm-nixpkgs": { "litellm-nixpkgs": {
"locked": { "locked": {
"lastModified": 1766309749, "lastModified": 1766651565,
"narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
hosts/h001/mods/litellm.nix
View file

@ -79,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-07-01-preview"; api_version = "2025-04-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" # "gpt-5.2-2025-12-11"
"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"
@ -110,6 +110,7 @@ in
"gpt-5-mini" "gpt-5-mini"
"gpt-5-nano" "gpt-5-nano"
"gpt-5.1" "gpt-5.1"
"gpt-5.2"
"gpt-5" "gpt-5"
"gpt-4.1" "gpt-4.1"
"gpt-4.1-mini" "gpt-4.1-mini"

283
hosts/h002/flake.lock generated
View file

@ -1,5 +1,66 @@
{ {
"nodes": { "nodes": {
"agenix": {
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager_2",
"nixpkgs": [
"secrets",
"ragenix",
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1761656077,
"narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=",
"owner": "ryantm",
"repo": "agenix",
"rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5",
"type": "github"
},
"original": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
"beszel": {
"inputs": {
"beszel-nixpkgs": "beszel-nixpkgs"
},
"locked": {
"dir": "flakes/beszel",
"lastModified": 1766960535,
"narHash": "sha256-t9xcmWlc2kB1wcKH4V9OMQoQYoMS4pDK/TLOGmmohf8=",
"ref": "refs/heads/master",
"rev": "a76b100f6eae86dbcb9327fece4ee03bebe5410a",
"revCount": 974,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
},
"original": {
"dir": "flakes/beszel",
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}
},
"beszel-nixpkgs": {
"locked": {
"lastModified": 1765472234,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"common": { "common": {
"locked": { "locked": {
"dir": "flakes/common", "dir": "flakes/common",
@ -17,51 +78,66 @@
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
} }
}, },
"de_plasma": { "crane": {
"inputs": {
"plasma-manager": "plasma-manager"
},
"locked": { "locked": {
"dir": "flakes/de_plasma", "lastModified": 1760924934,
"lastModified": 1766101096, "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=",
"narHash": "sha256-fOPGpgrgt4pNKzdpA+Xc/c3lev6Af2gM2ge2Gh4H9pk=", "owner": "ipetkov",
"ref": "refs/heads/master", "repo": "crane",
"rev": "acfec76a791abf5bcef22240a1e559e8e5e49004", "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f",
"revCount": 957, "type": "github"
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
"original": { "original": {
"dir": "flakes/de_plasma", "owner": "ipetkov",
"type": "git", "repo": "crane",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "type": "github"
} }
}, },
"home-manager": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"de_plasma", "secrets",
"plasma-manager", "ragenix",
"agenix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1756579987, "lastModified": 1744478979,
"narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=", "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
"owner": "nix-community", "owner": "lnl7",
"repo": "home-manager", "repo": "nix-darwin",
"rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a", "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "lnl7",
"repo": "home-manager", "ref": "master",
"repo": "nix-darwin",
"type": "github" "type": "github"
} }
}, },
"home-manager_2": { "flake-utils": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "systems": "systems_2"
},
"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"
}
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1765979862, "lastModified": 1765979862,
@ -78,23 +154,30 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "home-manager_2": {
"inputs": {
"nixpkgs": [
"secrets",
"ragenix",
"agenix",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1756542300, "lastModified": 1745494811,
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
"owner": "NixOS", "owner": "nix-community",
"repo": "nixpkgs", "repo": "home-manager",
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nix-community",
"ref": "nixos-unstable", "repo": "home-manager",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1765762245, "lastModified": 1765762245,
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
@ -110,7 +193,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1765838191, "lastModified": 1765838191,
"narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
@ -126,7 +209,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1764776358, "lastModified": 1764776358,
"narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", "narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=",
@ -141,6 +224,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1761672384,
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nvim_plugin-Almo7aya/openingh.nvim": { "nvim_plugin-Almo7aya/openingh.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1005,37 +1104,41 @@
"type": "github" "type": "github"
} }
}, },
"plasma-manager": { "ragenix": {
"inputs": { "inputs": {
"home-manager": "home-manager", "agenix": "agenix",
"nixpkgs": "nixpkgs" "crane": "crane",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1763909441, "lastModified": 1761832913,
"narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "narHash": "sha256-VCNVjjuRvrKPiYYwqhE3BAKIaReiKXGpxGp27lZ0MFM=",
"owner": "nix-community", "owner": "yaxitech",
"repo": "plasma-manager", "repo": "ragenix",
"rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "rev": "83bccfdea758241999f32869fb6b36f7ac72f1ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "yaxitech",
"repo": "plasma-manager", "repo": "ragenix",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"beszel": "beszel",
"common": "common", "common": "common",
"de_plasma": "de_plasma", "home-manager": "home-manager",
"home-manager": "home-manager_2", "nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim",
"ros_neovim": "ros_neovim" "secrets": "secrets"
} }
}, },
"ros_neovim": { "ros_neovim": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim",
"nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
@ -1126,6 +1229,78 @@
"repo": "rust-overlay", "repo": "rust-overlay",
"type": "github" "type": "github"
} }
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"secrets",
"ragenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1761791894,
"narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "59c45eb69d9222a4362673141e00ff77842cd219",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"secrets": {
"inputs": {
"ragenix": "ragenix"
},
"locked": {
"dir": "flakes/secrets",
"lastModified": 1766960535,
"narHash": "sha256-t9xcmWlc2kB1wcKH4V9OMQoQYoMS4pDK/TLOGmmohf8=",
"ref": "refs/heads/master",
"rev": "a76b100f6eae86dbcb9327fece4ee03bebe5410a",
"revCount": 974,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
},
"original": {
"dir": "flakes/secrets",
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}
},
"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"
}
} }
}, },
"root": "root", "root": "root",

37
hosts/h002/flake.nix
View file

@ -4,8 +4,10 @@
home-manager.url = "github:rycee/home-manager/release-25.11"; home-manager.url = "github:rycee/home-manager/release-25.11";
common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common"; common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common";
# de_plasma.url = "path:../../../../flakes/de_plasma"; # secrets.url = "path:../../flakes/secrets";
de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma"; secrets.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/secrets";
# beszel.url = "path:../../flakes/beszel";
beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel";
ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
}; };
@ -13,7 +15,6 @@
outputs = outputs =
{ {
nixpkgs, nixpkgs,
common,
ros_neovim, ros_neovim,
... ...
}@inputs: }@inputs:
@ -22,7 +23,7 @@
primaryUser = "luser"; primaryUser = "luser";
configLocation = "/home/${primaryUser}/.config/nixos-config/hosts/${configurationName}"; configLocation = "/home/${primaryUser}/.config/nixos-config/hosts/${configurationName}";
stateAndHomeVersion = "25.11"; stateAndHomeVersion = "25.11";
# overlayIp = "100.64.0.14"; overlayIp = "100.64.0.3";
lib = inputs.nixpkgs.lib; lib = inputs.nixpkgs.lib;
in in
{ {
@ -35,8 +36,7 @@
modules = [ modules = [
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
# TODO inputs.secrets.nixosModules.default
# secrets.nixosModules.default
inputs.ros_neovim.nixosModules.default inputs.ros_neovim.nixosModules.default
({ ({
ringofstorms-nvim.includeAllRuntimeDependencies = true; ringofstorms-nvim.includeAllRuntimeDependencies = true;
@ -58,20 +58,20 @@
inputs.common.nixosModules.timezone_auto inputs.common.nixosModules.timezone_auto
inputs.common.nixosModules.tty_caps_esc inputs.common.nixosModules.tty_caps_esc
inputs.common.nixosModules.zsh inputs.common.nixosModules.zsh
# TODO inputs.common.nixosModules.tailnet
# common.nixosModules.tailnet inputs.beszel.nixosModules.agent
# beszel.nixosModules.agent ({
# ( beszelAgent = {
# { ... }: listen = "${overlayIp}:45876";
# { token = "11714da6-fd2e-436a-8b83-e0e07ba33a95";
# beszelAgent = { };
# listen = "${overlayIp}:45876"; services.beszel.agent.environment = {
# token = "f8a54c41-486b-487a-a78d-a087385c317b"; EXTRA_FILESYSTEMS = "sdb__Data";
# }; };
# } })
# )
./hardware-configuration.nix ./hardware-configuration.nix
./nfs-data.nix
( (
{ {
config, config,
@ -102,6 +102,7 @@
inputs.common.homeManagerModules.starship inputs.common.homeManagerModules.starship
inputs.common.homeManagerModules.zoxide inputs.common.homeManagerModules.zoxide
inputs.common.homeManagerModules.zsh inputs.common.homeManagerModules.zsh
inputs.common.homeManagerModules.ssh
]; ];
extraSpecialArgs = { extraSpecialArgs = {

16
hosts/h002/hardware-configuration.nix
View file

@ -36,6 +36,22 @@
{ device = "/dev/disk/by-uuid/f043c171-5d20-4c6c-bc82-6e72139d7cb1"; } { device = "/dev/disk/by-uuid/f043c171-5d20-4c6c-bc82-6e72139d7cb1"; }
]; ];
fileSystems."/data" = {
device =
# root@h002:/home/luser/ > bcachefs format --compression=zstd --replicas=2 /dev/sda /dev/sdb /dev/sdc /dev/sde /dev/sdf
# External UUID: 53a26b95-941b-4f41-b049-c166905ed8c2
# Internal UUID: 9d63b280-7b25-46a7-8437-4c6d92e63790
# Magic number: c68573f6-66ce-90a9-d96a-60cf803df7ef
"UUID=53a26b95-941b-4f41-b049-c166905ed8c2";
fsType = "bcachefs";
options = [
"defaults"
"compression=zstd"
"fsck"
"fix_errors"
];
};
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction

13
hosts/h002/nfs-data.nix Normal file
View file

@ -0,0 +1,13 @@
{ pkgs, ... }:
{
services.nfs.server = {
enable = true;
exports = ''
/data 100.64.0.0/10(rw,sync,no_subtree_check,fsid=0,crossmnt)
'';
};
environment.systemPackages = [
pkgs.nfs-utils
];
}