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-30 15:34:46 -06:00
commit b322c942bb
6 changed files with 123 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/h001/autofs.nix
View file

@ -8,7 +8,7 @@
autoMaster = autoMaster =
let let
conf = pkgs.writeText "nfs" '' conf = pkgs.writeText "nfs" ''
h002 -fstype=nfs4,rw,nofail,nfsvers=4 h002:/ h002 -fstype=nfs4,rw,nofail,nfsvers=4 10.12.14.183:/
''; '';
in in
'' ''

207
hosts/h001/flake.lock generated
View file

@ -31,11 +31,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/beszel", "dir": "flakes/beszel",
"lastModified": 1766890076, "lastModified": 1767045023,
"narHash": "sha256-u7WSMDprtQXowub2WNCVfZHBaRUysq3hICpiHbyEXLI=", "narHash": "sha256-cCn/1MVpim5Lsiz1PDH732OjTB4Es894vKFJuzmoxKY=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "5fe2566c2da9359de8aa2b610913feb6454a8ceb", "rev": "4ce99393b6e5e9594cf5b7102cc56e676b5d582c",
"revCount": 973, "revCount": 998,
"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": 1766651565, "lastModified": 1766902085,
"narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -80,11 +80,11 @@
"common": { "common": {
"locked": { "locked": {
"dir": "flakes/common", "dir": "flakes/common",
"lastModified": 1766965969, "lastModified": 1767041053,
"narHash": "sha256-uKxbAXX9bLzl7j4D0REN+JNntINdk/e/ry5a6hSqW0I=", "narHash": "sha256-lWHud2uIyG9gycStWMSgK3Xlr0MtfUPhbfrztOxuBTI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "34e37861a716ee5e3498900bc4639a715bcc4adc", "rev": "fd3bb24e4a0c366958c47fccc19d8738408be76d",
"revCount": 981, "revCount": 996,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -153,11 +153,11 @@
}, },
"forgejo-nixpkgs": { "forgejo-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766902085,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,11 +172,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1765979862, "lastModified": 1766939458,
"narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", "narHash": "sha256-VvZeAKyB3vhyHStSO8ACKzWRKNQPmVWktjfuSVdvtUA=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", "rev": "e298a148013c980e3c8c0ac075295fab5074d643",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"litellm-nixpkgs": { "litellm-nixpkgs": {
"locked": { "locked": {
"lastModified": 1766651565, "lastModified": 1766902085,
"narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
}, },
"n8n-nixpkgs": { "n8n-nixpkgs": {
"locked": { "locked": {
"lastModified": 1764667669, "lastModified": 1766902085,
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "418468ac9527e799809c900eda37cbff999199b6", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,11 +263,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1765762245, "lastModified": 1766736597,
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,11 +295,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1765838191, "lastModified": 1766885793,
"narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "rev": "9ef261221d1e72399f2036786498d78c38185c46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,15 +311,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1764776358, "lastModified": 1766309749,
"narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b8cec1eb2241336971009cdd4af641b930d0d97", "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -359,11 +360,11 @@
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1763599441, "lastModified": 1766398838,
"narHash": "sha256-RwCQQfgQIQITVSJSX+QOSIOChT7E2AXdIwfU07S9GaU=", "narHash": "sha256-pO+bnwywDmhEpmU3Zw2VCAT8uLEgRlpHcAfW9NwqWis=",
"owner": "CopilotC-Nvim", "owner": "CopilotC-Nvim",
"repo": "CopilotChat.nvim", "repo": "CopilotChat.nvim",
"rev": "df5376c132382dd47e3e552612940cbf25b3580c", "rev": "ed94e56ee8292f5df351e17709ff4b178ca84200",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,11 +408,11 @@
"nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764732647, "lastModified": 1765914395,
"narHash": "sha256-jya61X22LbcT4hpeio3qE/oOI/lvqKpf09oGEHHvQdA=", "narHash": "sha256-A7pm8sBQWsZl3Kc7JBh3gBUyKb6GfJ5J0zfn3mSGjKs=",
"owner": "MeanderingProgrammer", "owner": "MeanderingProgrammer",
"repo": "render-markdown.nvim", "repo": "render-markdown.nvim",
"rev": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8", "rev": "07d088bf8bdadd159eb807b90eaee86a4778383f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -487,11 +488,11 @@
"nvim_plugin-b0o/schemastore.nvim": { "nvim_plugin-b0o/schemastore.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764655248, "lastModified": 1766167236,
"narHash": "sha256-9nUBzwbMkzLySMW/Y0EkFpvFgHeW5YDQ3J3moVQarjQ=", "narHash": "sha256-+Z1foMyKMxyMmYqmyu1KWiyL4Fc0Zm2SYV7RoZ9Ut2I=",
"owner": "b0o", "owner": "b0o",
"repo": "schemastore.nvim", "repo": "schemastore.nvim",
"rev": "e9c00ea7813006dfa29f35c174f83f0184d45a93", "rev": "8b92ea89835b8e5dbc779a675ebb0e5fcb9a1993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +504,11 @@
"nvim_plugin-catppuccin/nvim": { "nvim_plugin-catppuccin/nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764084803, "lastModified": 1765701669,
"narHash": "sha256-ds+Rm9H00s++RC1dH4OQpCg1FXSm4HuwDGzr4ah0YBU=", "narHash": "sha256-8GKpGGdeBwxuMrheojyl162CzUntRcq9AktQVmKbpuI=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nvim", "repo": "nvim",
"rev": "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00", "rev": "ce8d176faa4643e026e597ae3c31db59b63cef09",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -519,11 +520,11 @@
"nvim_plugin-chrisgrieser/nvim-early-retirement": { "nvim_plugin-chrisgrieser/nvim-early-retirement": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764104935, "lastModified": 1766186911,
"narHash": "sha256-mvs0uIoxidy3jfC6oymwhaZVRbJrW+/kuMcIpR8TI6M=", "narHash": "sha256-COYpFOZTMGpZVfSJFMix/6TM5Eeemngcx1iukMa2nDE=",
"owner": "chrisgrieser", "owner": "chrisgrieser",
"repo": "nvim-early-retirement", "repo": "nvim-early-retirement",
"rev": "cd29cf40af7473530a8598245ba1d348fd5e1fa0", "rev": "86edd80026e4eea2cef7d1e5dadcf34432e6098d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -551,11 +552,11 @@
"nvim_plugin-folke/lazy.nvim": { "nvim_plugin-folke/lazy.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762421181, "lastModified": 1765971162,
"narHash": "sha256-h5404njTAfqMJFQ3MAr2PWSbV81eS4aIs0cxAXkT0EM=", "narHash": "sha256-5A4kducPwKb5fKX4oSUFvo898P0dqfsqqLxFaXBsbQY=",
"owner": "folke", "owner": "folke",
"repo": "lazy.nvim", "repo": "lazy.nvim",
"rev": "85c7ff3711b730b4030d03144f6db6375044ae82", "rev": "306a05526ada86a7b30af95c5cc81ffba93fef97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -663,11 +664,11 @@
"nvim_plugin-j-hui/fidget.nvim": { "nvim_plugin-j-hui/fidget.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761243883, "lastModified": 1766143069,
"narHash": "sha256-XXTeJweQRIsC/WFhFxFbepOETV8e5Wfmh513su2Wve0=", "narHash": "sha256-uy2Z6vn9UYDN7Dr7iuiTrualRQdmUT0dwHP/eZXA/uA=",
"owner": "j-hui", "owner": "j-hui",
"repo": "fidget.nvim", "repo": "fidget.nvim",
"rev": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a", "rev": "64463022a1f2ff1318ab22a2ea4125ed9313a483",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +776,11 @@
"nvim_plugin-mfussenegger/nvim-lint": { "nvim_plugin-mfussenegger/nvim-lint": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1763729870, "lastModified": 1766127989,
"narHash": "sha256-9fIZPUZhnQEHJtvboCs+A2QXo4UMTFejuHNagDkfkRk=", "narHash": "sha256-ysIoJ8uMAHu/OCemQ3yUYMhKIVnSDLQCvJH0SaGIOK4=",
"owner": "mfussenegger", "owner": "mfussenegger",
"repo": "nvim-lint", "repo": "nvim-lint",
"rev": "d1118791070d090777398792a73032a0ca5c79ff", "rev": "7a64f4067065c16a355d40d0d599b8ca6b25de6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -791,11 +792,11 @@
"nvim_plugin-mrcjkb/rustaceanvim": { "nvim_plugin-mrcjkb/rustaceanvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764542305, "lastModified": 1766276825,
"narHash": "sha256-t7xAQ9sczLyA1zODmD+nEuWuLnhrfSOoPu/4G/YTGdU=", "narHash": "sha256-dcXnh5SYPh1VRctTuCnuVPKFQuAI4XEvQasolCOv+Xw=",
"owner": "mrcjkb", "owner": "mrcjkb",
"repo": "rustaceanvim", "repo": "rustaceanvim",
"rev": "6c3785d6a230bec63f70c98bf8e2842bed924245", "rev": "0fa0462a2d6c9629e0bd03d1902e6a1472ceac3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -807,11 +808,11 @@
"nvim_plugin-neovim/nvim-lspconfig": { "nvim_plugin-neovim/nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764477618, "lastModified": 1766443238,
"narHash": "sha256-IpVDEOr//Jy+r3Z5Qo8nxDa3fNO+BTBKzAmbqvxtCQE=", "narHash": "sha256-P95gPOwJ+rRofLb8iV5UOnh26to1I3sFrWGlGxHyz1M=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "effe4bf2e1afb881ea67291c648b68dd3dfc927a", "rev": "b34c08e0ea22bac67798f00238318fd16bd99b7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -919,11 +920,11 @@
"nvim_plugin-nvim-telescope/telescope.nvim": { "nvim_plugin-nvim-telescope/telescope.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764418954, "lastModified": 1766268405,
"narHash": "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4=", "narHash": "sha256-O1rUiVKpDSvKMkZMFaEd8/ACcSgO/lfa1+Hc8uHbFOI=",
"owner": "nvim-telescope", "owner": "nvim-telescope",
"repo": "telescope.nvim", "repo": "telescope.nvim",
"rev": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2", "rev": "e709d31454ee6e6157f0537f861f797bd44c0bad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -935,11 +936,11 @@
"nvim_plugin-nvim-tree/nvim-tree.lua": { "nvim_plugin-nvim-tree/nvim-tree.lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764713359, "lastModified": 1766192360,
"narHash": "sha256-dSaO5esPKj1y4vNyLb3AK9egmFJsmWxkGOT+etJsbRA=", "narHash": "sha256-Br+r9f/2o0AkewnGm7kFNfl3uYm1Akkklof0Sm5AL2M=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-tree.lua", "repo": "nvim-tree.lua",
"rev": "59088b96a32ea47caf4976e164dbd88b86447fb7", "rev": "b8b44b6a2494d086a9177251a119f9daec6cace8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -951,11 +952,11 @@
"nvim_plugin-nvim-tree/nvim-web-devicons": { "nvim_plugin-nvim-tree/nvim-web-devicons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761440007, "lastModified": 1766287594,
"narHash": "sha256-klBjUtj0AvarN5a6O8Hh2t5BuOTe/m3ps2cHnlxVJvE=", "narHash": "sha256-ZdFRd0//C0Lle4cYIoAHBdz/yvQqmeylLNwvSifaWm4=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-web-devicons", "repo": "nvim-web-devicons",
"rev": "8dcb311b0c92d460fac00eac706abd43d94d68af", "rev": "6788013bb9cb784e606ada44206b0e755e4323d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -967,11 +968,11 @@
"nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "nvim_plugin-nvim-treesitter/nvim-treesitter-context": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762769683, "lastModified": 1765030629,
"narHash": "sha256-ICwAUXKngSPsJ6VV+84KUPqtAwlGPrm4FIf9ioisiz8=", "narHash": "sha256-3NtwOA9d2ezLoo7qnzKAr6gwEdcpUqLc7ou4QI+9rDY=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter-context", "repo": "nvim-treesitter-context",
"rev": "660861b1849256398f70450afdf93908d28dc945", "rev": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1079,11 +1080,11 @@
"nvim_plugin-stevearc/conform.nvim": { "nvim_plugin-stevearc/conform.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764743081, "lastModified": 1766346125,
"narHash": "sha256-qCjrMt3fsRbLr/iM7nFHG7oKtyTTGcse4/cJbm3odJE=", "narHash": "sha256-Pp4bGTlZEqxHoHqVCEekDdg2jvNayxAuBReK4HJ6yGg=",
"owner": "stevearc", "owner": "stevearc",
"repo": "conform.nvim", "repo": "conform.nvim",
"rev": "ffe26e8df8115c9665d24231f8a49fadb2d611ce", "rev": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1191,11 +1192,11 @@
"nvim_plugin-zbirenbaum/copilot.lua": { "nvim_plugin-zbirenbaum/copilot.lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764638966, "lastModified": 1766207702,
"narHash": "sha256-wQ6SfAunVMd5tNeM7RMvrfPC2ELRibyEQboVQlU/fBs=", "narHash": "sha256-879050VUJpWBrHxUA3hRpcYbn3KgBGpVpKLdSVOwbIA=",
"owner": "zbirenbaum", "owner": "zbirenbaum",
"repo": "copilot.lua", "repo": "copilot.lua",
"rev": "881f99b827d65b41f522eecc21b112cf518028ac", "rev": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1206,11 +1207,11 @@
}, },
"oauth2-proxy-nixpkgs": { "oauth2-proxy-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766902085,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1238,11 +1239,11 @@
}, },
"pinchflat-nixpkgs": { "pinchflat-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766902085,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1354,11 +1355,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1765641080, "lastModified": 1766468664,
"narHash": "sha256-AyPi7rZVfjTjQrhPHP+ugpVY8tcUzF3Lw1RjACuxAms=", "narHash": "sha256-QfAZCWfwIDiOvikyMb9Tsg2X0n659zd6DxDT88ILE4I=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "224ad4e3ecd9421c7469c4f06ff5faf7f6e8bedb", "rev": "99a57f25b959d7226d68f1b53ff60f0c4cc5b210",
"revCount": 325, "revCount": 326,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/nvim" "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
}, },
@ -1375,11 +1376,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764729618, "lastModified": 1766457837,
"narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", "narHash": "sha256-aeBbkQ0HPFNOIsUeEsXmZHXbYq4bG8ipT9JRlCcKHgU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", "rev": "2c7510a559416d07242621d036847152d970612b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1416,11 +1417,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/secrets", "dir": "flakes/secrets",
"lastModified": 1766965969, "lastModified": 1767020360,
"narHash": "sha256-uKxbAXX9bLzl7j4D0REN+JNntINdk/e/ry5a6hSqW0I=", "narHash": "sha256-ZtHcZ4zmYEVenQwQ6S70tvCFYge0VQIky5N3qOIBFFw=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "34e37861a716ee5e3498900bc4639a715bcc4adc", "rev": "cf9b4b8ed597aa7e3b9dd6343668c32c09eea4b1",
"revCount": 981, "revCount": 986,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -1462,11 +1463,11 @@
}, },
"trilium-nixpkgs": { "trilium-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766902085,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1514,11 +1515,11 @@
}, },
"zitadel-nixpkgs": { "zitadel-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766902085,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
hosts/h001/flake.nix
View file

@ -42,7 +42,6 @@
configuration_name = "h001"; configuration_name = "h001";
stateVersion = "24.11"; stateVersion = "24.11";
primaryUser = "luser"; primaryUser = "luser";
overlayIp = "100.64.0.13";
lib = nixpkgs.lib; lib = nixpkgs.lib;
in in
{ {
@ -63,6 +62,7 @@
common.nixosModules.essentials common.nixosModules.essentials
common.nixosModules.git common.nixosModules.git
common.nixosModules.tmux
common.nixosModules.boot_systemd common.nixosModules.boot_systemd
common.nixosModules.hardening common.nixosModules.hardening
common.nixosModules.nix_options common.nixosModules.nix_options
@ -75,11 +75,8 @@
beszel.nixosModules.agent beszel.nixosModules.agent
({ ({
beszelAgent = { beszelAgent = {
listen = "${overlayIp}:45876";
token = "20208198-87c2-4bd1-ab09-b97c3b9c6a6e"; token = "20208198-87c2-4bd1-ab09-b97c3b9c6a6e";
}; extraFilesystems = "sda__Media";
services.beszel.agent.environment = {
EXTRA_FILESYSTEMS = "sda__Media";
}; };
}) })
@ -148,6 +145,7 @@
lua lua
sqlite sqlite
ttyd ttyd
rclone
]; ];
} }
) )

9
hosts/h001/mods/hardware-transcoding.nix
View file

@ -1,4 +1,9 @@
{ pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
############################ ############################
# Intel iGPU / VAAPI / QSV # # Intel iGPU / VAAPI / QSV #
@ -29,7 +34,7 @@
}; };
# Optional but can help when services (like jellyfin) run in their own units # Optional but can help when services (like jellyfin) run in their own units
systemd.services.jellyfin.environment.LIBVA_DRIVER_NAME = "iHD"; systemd.services.jellyfin.environment.LIBVA_DRIVER_NAME = lib.mkIf config.nixarr.enable "iHD";
######################## ########################
# Firmware for the iGPU # Firmware for the iGPU

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

@ -15,7 +15,8 @@ in
config = { config = {
nixarr = { nixarr = {
enable = true; enable = true;
mediaDir = "/drives/wd10/nixarr/media"; # mediaDir = "/drives/wd10/nixarr/media";
mediaDir = "/nfs/h002/nixarr/media";
stateDir = "/var/lib/nixarr/state"; stateDir = "/var/lib/nixarr/state";
vpn = lib.mkIf (hasSecret "us_chi_wg") { vpn = lib.mkIf (hasSecret "us_chi_wg") {
@ -53,7 +54,7 @@ in
# recyclarr.enable = true; # not sure how to use this yet # recyclarr.enable = true; # not sure how to use this yet
}; };
services.nginx = { services.nginx = lib.mkIf config.nixarr.enable {
virtualHosts = { virtualHosts = {
"jellyfin.joshuabell.xyz" = { "jellyfin.joshuabell.xyz" = {
addSSL = true; addSSL = true;

8
hosts/h001/mods/pinchflat.nix
View file

@ -1,6 +1,7 @@
{ {
lib, lib,
inputs, inputs,
config,
pkgs, pkgs,
... ...
}: }:
@ -15,13 +16,14 @@ in
{ {
disabledModules = [ declaration ]; disabledModules = [ declaration ];
imports = [ "${nixpkgsPinchflat}/nixos/modules/${declaration}" ]; imports = [ "${nixpkgsPinchflat}/nixos/modules/${declaration}" ];
config = { config = lib.mkIf config.nixarr.enable {
services.pinchflat = { services.pinchflat = {
package = pkgsPinchflat.pinchflat; package = pkgsPinchflat.pinchflat;
enable = true; enable = true;
port = 8945; port = 8945;
selfhosted = true; selfhosted = true;
mediaDir = "/drives/wd10/pinchflat/media"; mediaDir = "/nfs/h002/pinchflat/media";
# mediaDir = "/drives/wd10/pinchflat/media";
extraConfig = { extraConfig = {
YT_DLP_WORKER_CONCURRENCY = 1; YT_DLP_WORKER_CONCURRENCY = 1;
}; };
@ -49,7 +51,7 @@ in
]; ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d '/drives/wd10/pinchflat/media' 0775 pinchflat pinchflat - -" "d '${config.services.pinchflat.mediaDir}' 0775 pinchflat pinchflat - -"
]; ];
services.nginx = { services.nginx = {