From 11825210f98836f344d1d1cb89459cb14287a17b Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 27 Sep 2025 23:57:12 -0500 Subject: [PATCH 1/6] Add vm-jellyfin home config --- home/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/default.nix b/home/default.nix index 29caf42..23a3738 100644 --- a/home/default.nix +++ b/home/default.nix @@ -40,4 +40,5 @@ in jeremiah = greg "jeremiah"; linode = greg "linode"; vm-gitlab = greg "vm-gitlab"; + vm-jellyfin = greg "vm-jellyfin"; } From 3046178f6b8970d90a770e4f9b00afc7db71065d Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 27 Sep 2025 17:53:39 -0500 Subject: [PATCH 2/6] Add gcc-tune script --- hosts/baseline.nix | 1 + pkgs/default.nix | 1 + pkgs/gcc-tune.nix | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 pkgs/gcc-tune.nix diff --git a/hosts/baseline.nix b/hosts/baseline.nix index fc580f7..55e2ce0 100644 --- a/hosts/baseline.nix +++ b/hosts/baseline.nix @@ -36,6 +36,7 @@ in efibootmgr findutils file + gcc-tune git gnupatch hms # My own home manager switcher diff --git a/pkgs/default.nix b/pkgs/default.nix index 75f2738..65a3287 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -10,6 +10,7 @@ in aacs = c ./aacs.nix { }; brew = c ./homebrew.nix { }; create_ssl = c ./create_ssl.nix { }; + gcc-tune = c ./gcc-tune.nix { }; gen-build = c ./gen-build { }; hms = c ./hms { }; inject-darwin = c ./inject-darwin.nix { }; diff --git a/pkgs/gcc-tune.nix b/pkgs/gcc-tune.nix new file mode 100644 index 0000000..196fa37 --- /dev/null +++ b/pkgs/gcc-tune.nix @@ -0,0 +1,16 @@ +{ + writeShellApplication, + gcc, + gnugrep, +}: + +writeShellApplication { + name = "gcc-tune"; + runtimeInputs = [ + gcc + gnugrep + ]; + text = '' + gcc -march=native -Q --help=target | grep 'mtune=' + ''; +} From f7346b6e8d90a15ec414faeadb0b9a590418de04 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 27 Sep 2025 23:29:41 -0500 Subject: [PATCH 3/6] Move from crontab to systemd timers --- hosts/vm-gitlab/default.nix | 60 ++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/hosts/vm-gitlab/default.nix b/hosts/vm-gitlab/default.nix index a7e5473..ee7e9e5 100644 --- a/hosts/vm-gitlab/default.nix +++ b/hosts/vm-gitlab/default.nix @@ -72,14 +72,6 @@ in }; services = { - # Fetch the SSL certificates for nginx to use - cron = { - enable = true; - systemCronJobs = [ - "0 0 1 */2 * cd /etc/certs && tailscale cert vm-gitlab.shire-zebra.ts.net && chown nginx * && systemctl reload nginx" - ]; - }; - gitlab = { enable = true; backup = { @@ -228,17 +220,51 @@ in # Do not start nginx until we have tailscaled up and running, so it can bind # to the 100.* addresses - systemd.services = { - nginx = rec { - after = [ "network-online.target" ]; - requires = [ "network-online.target" ]; - wants = after; - serviceConfig = { - RestartMaxDelaySec = "30s"; - RestartSteps = "5"; + systemd = { + services = { + certRefresh = + let + script = pkgs.writeShellApplication { + name = "cert-refresh"; + runtimeInputs = [ pkgs.tailscale ]; + + text = '' + cd /etc/certs + tailscale cert vm-gitlab.shire-zebra.ts.net + chown nginx ./* + systemctl reload nginx + ''; + }; + in + { + script = lib.getExe script; + serviceConfig = { + Type = "oneshot"; + User = "root"; + }; + }; + + nginx = rec { + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + wants = after; + serviceConfig = { + RestartMaxDelaySec = "30s"; + RestartSteps = "5"; + }; + }; + tailscaled.partOf = [ "network-online.target" ]; + }; + + timers = { + "cert-refresh" = { + wantedBy = [ "cert-refresh.service" ]; + timerConfig = { + OnCalendar = "monthly"; + Persistent = true; + }; }; }; - tailscaled.partOf = [ "network-online.target" ]; }; system.stateVersion = lib.mkForce "24.11"; } From 701090d10a6744fd88c1ceee6161db05591a451c Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 30 Sep 2025 21:57:11 -0500 Subject: [PATCH 4/6] Tidy up vim config and Flake update --- flake.lock | 84 +++++++++++++++--------------- home/baseline/nushell/functions.nu | 2 +- home/baseline/vim/config.nix | 1 - home/baseline/vim/init.lua | 2 +- home/baseline/vim/vimrc | 2 +- hosts/exodus/default.nix | 5 +- 6 files changed, 49 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index d56ebce..8462936 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1757985998, - "narHash": "sha256-9wxH9I7BJflSBXxXQJwqqWLC/lGr96MNI++Ci70HBF0=", + "lastModified": 1759023284, + "narHash": "sha256-yYVUjuExr0v0bmM9qTGt0Chhw5eLHJLAFlqQOwVWVVM=", "owner": "nix-community", "repo": "nixhelm", - "rev": "0b9e8a1e3ed75731507d1055a75343a616dda286", + "rev": "b69e7f1e2dbdd67707f60ad02bf436325ce0b160", "type": "github" }, "original": { @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1757430124, - "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", + "lastModified": 1758805352, + "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", + "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", "type": "github" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1757997814, - "narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", + "lastModified": 1759043321, + "narHash": "sha256-Efi3THvsIS6Qd97s52/PSSHWybDlSbtUZXP8l3AR9Ps=", "owner": "nix-community", "repo": "home-manager", - "rev": "5820376beb804de9acf07debaaff1ac84728b708", + "rev": "c75fd8e300b79502b8eecdacd8a426b12fadb460", "type": "github" }, "original": { @@ -424,11 +424,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1757974173, - "narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "302af509428169db34f268324162712d10559f74", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -489,11 +489,11 @@ }, "nix-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -648,11 +648,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", + "lastModified": 1758029226, + "narHash": "sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", + "rev": "08b8f92ac6354983f5382124fef6006cade4a1c1", "type": "github" }, "original": { @@ -664,11 +664,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -696,11 +696,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -720,11 +720,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1758032055, - "narHash": "sha256-quoLrTtC8JVG0HEv3VzJSXiQnL40K5CX9yvYqd7OKpc=", + "lastModified": 1759016999, + "narHash": "sha256-UhQmUPSWYpKJQutTzy9TKiRBMg/qVJn6AoNsFR+5Zmc=", "owner": "nix-community", "repo": "nixvim", - "rev": "796d662401c420ba11d34901185718059aa3bfb5", + "rev": "4cec67651a6dfdab9a79e68741282e3be8231a61", "type": "github" }, "original": { @@ -740,11 +740,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1758030607, - "narHash": "sha256-ph7zS5GkgIh0fvaSNbIstJEVDgkskdRIwNyfXccSTSo=", + "lastModified": 1759077554, + "narHash": "sha256-W4ZnOzeVSbokayX7Hz+aIOemXXm/lUZRB4S/Bptn6XM=", "owner": "nix-community", "repo": "NUR", - "rev": "f534dee3dc628ceb5b036b174363c1196df5a529", + "rev": "669ab83f6fe35cae4bee00e9a66e79b1936612cd", "type": "github" }, "original": { @@ -763,11 +763,11 @@ ] }, "locked": { - "lastModified": 1757885130, - "narHash": "sha256-56CMb5W/pgjKLh0bx2ekhn5rde/YmgR63HAqrY9/BCw=", + "lastModified": 1758662783, + "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", "owner": "NuschtOS", "repo": "search", - "rev": "fae3c59a646e00c4b1d359c50b27458a0713d2fd", + "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", "type": "github" }, "original": { @@ -809,11 +809,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1754428470, - "narHash": "sha256-Sxf8gf+vfGeFaJMW3D+8pwH/+WwYTQOg47Lrm42+kTc=", + "lastModified": 1758650077, + "narHash": "sha256-ZeRtJimtk0Faiq7DPZEQNGipda3TaR4QXp0TAzu934Q=", "owner": "SaumonNet", "repo": "proxmox-nixos", - "rev": "6faed2845ef5f0bb05c9519b75097bbe7fb39327", + "rev": "ce8768f43b4374287cd8b88d8fa9c0061e749d9a", "type": "github" }, "original": { @@ -1022,11 +1022,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1757987448, - "narHash": "sha256-ltDT7EIfLHV42p99HnDfDviC8jN7tcOed1qsLEFypl8=", + "lastModified": 1759024939, + "narHash": "sha256-4HEtZ+hVr8c/rbr1xXb9yq7YA/Ued5KrixAvhuIAg/4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e496568b0e69d9d54c8cfef96ed1370952ad9786", + "rev": "6db4b0a9395b1002b6d18c6967d4cd2566e8bd16", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ ] }, "locked": { - "lastModified": 1757937573, - "narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=", + "lastModified": 1758785683, + "narHash": "sha256-mRn51IeEBXeNh5a6xNLylk4PKBX0s/QQxgkEbYoPq/w=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "134e117c969f42277f1c5e60c8fbcac103c2c454", + "rev": "1bfb978f2f6261b6086e04af17f9418e1fe36d70", "type": "github" }, "original": { diff --git a/home/baseline/nushell/functions.nu b/home/baseline/nushell/functions.nu index 75fadd2..d4acf0d 100644 --- a/home/baseline/nushell/functions.nu +++ b/home/baseline/nushell/functions.nu @@ -17,7 +17,7 @@ def rebuild [] { sudo darwin-rebuild switch } else { let hostname = uname | get nodename - let build = ^nom build $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel" + let build = ^nom build --keep-going $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel" if $env.LAST_EXIT_CODE == 0 { nvd diff /run/current-system result run0 nixos-rebuild switch diff --git a/home/baseline/vim/config.nix b/home/baseline/vim/config.nix index a22f0a1..ac0e6a4 100644 --- a/home/baseline/vim/config.nix +++ b/home/baseline/vim/config.nix @@ -115,7 +115,6 @@ lsp = { enable = true; servers = { - ansiblels.enable = true; cmake.enable = true; gopls.enable = true; html.enable = true; diff --git a/home/baseline/vim/init.lua b/home/baseline/vim/init.lua index 0031df6..08099b9 100644 --- a/home/baseline/vim/init.lua +++ b/home/baseline/vim/init.lua @@ -59,7 +59,7 @@ local lspconfig = require('lspconfig') -- capabilities = capabilities --} --lspconfig.pyright.setup { capabilities = capabilities } -lspconfig.ansiblels.setup { capabilities = capabilities } +--lspconfig.ansiblels.setup { capabilities = capabilities } --lspconfig.jedi_language_server.setup { capabilities } -- ====================================================================== diff --git a/home/baseline/vim/vimrc b/home/baseline/vim/vimrc index 075335a..caf64c1 100644 --- a/home/baseline/vim/vimrc +++ b/home/baseline/vim/vimrc @@ -88,7 +88,7 @@ lua < Date: Thu, 2 Oct 2025 21:18:57 -0500 Subject: [PATCH 5/6] Add gnucash to exodus --- home/hosts/exodus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/hosts/exodus/default.nix b/home/hosts/exodus/default.nix index 2d29c75..bf0ede7 100644 --- a/home/hosts/exodus/default.nix +++ b/home/hosts/exodus/default.nix @@ -13,6 +13,7 @@ cargo freeciv gimp + gnucash k9s kdePackages.kdenlive kubernetes-helm From a14121563eea6a3d5ea4c66c3988397f09c9b458 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 2 Oct 2025 23:06:22 -0500 Subject: [PATCH 6/6] Add pre-commit to Exodus --- home/hosts/exodus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/hosts/exodus/default.nix b/home/hosts/exodus/default.nix index bf0ede7..c4cf52d 100644 --- a/home/hosts/exodus/default.nix +++ b/home/hosts/exodus/default.nix @@ -20,6 +20,7 @@ kubectl kubectl-cnpg mumble + pre-commit wineWowPackages.stable ]; }