From af9a0e56e110b0edd0cf9854a1dd534265cdb0e8 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 13 Apr 2026 21:36:02 -0600 Subject: configure remote builders --- machines/zenbook/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'machines') diff --git a/machines/zenbook/default.nix b/machines/zenbook/default.nix index f3ebeb1..0597811 100644 --- a/machines/zenbook/default.nix +++ b/machines/zenbook/default.nix @@ -7,6 +7,7 @@ { imports = [ ./hardware-configuration.nix + ../../modules/nixos/remote-build.nix ../../modules/nixos/hyprland.nix ../../modules/nixos/niri.nix -- cgit v1.3.1 From 293cdc4e9460b8351c3b14f84e2587eb7ae921f2 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 20 Apr 2026 10:10:37 -0600 Subject: maybe the zeroes work --- machines/bosco/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'machines') diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index 133eca8..be17b25 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -67,10 +67,10 @@ routes = [ { via = "172.16.101.1"; - # address = "0.0.0.0"; - # prefixLength = 0; - address = "172.16.101.82"; - prefixLength = 24; + address = "0.0.0.0"; + prefixLength = 0; + # address = "172.16.101.82"; + # prefixLength = 24; options = { table = "default"; src = "23.131.76.82"; -- cgit v1.3.1 From 03dd076b7684c6c7db20d40d097b5d7d6c1fd014 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 20 Apr 2026 11:06:57 -0600 Subject: maybe routes are a mistake --- machines/bosco/default.nix | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'machines') diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index be17b25..27c63be 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -52,7 +52,7 @@ # networking.localCommands = '' # ip addr add 23.131.76.82/32 dev ens18 - # ip route add default via "172.16.101.1" dev ens18 src 23.131.76.82 + # ip route replace default via 172.16.101.1 src 23.131.76.82 # ''; # ip route del default networking.interfaces."eth0".ipv4 = { @@ -64,26 +64,26 @@ address = "172.16.101.82"; prefixLength = 24; }]; - routes = [ - { - via = "172.16.101.1"; - address = "0.0.0.0"; - prefixLength = 0; - # address = "172.16.101.82"; - # prefixLength = 24; - options = { - table = "default"; - src = "23.131.76.82"; - }; - } - # { - # via = "172.16.101.1"; - # options = { - # table = "default"; - # metric = "202"; - # }; - # } - ]; + # routes = [ + # { + # via = "172.16.101.1"; + # address = "0.0.0.0"; + # prefixLength = 0; + # # address = "172.16.101.82"; + # # prefixLength = 24; + # options = { + # table = "default"; + # src = "23.131.76.82"; + # }; + # } + # # { + # # via = "172.16.101.1"; + # # options = { + # # table = "default"; + # # metric = "202"; + # # }; + # # } + # ]; }; networking.nameservers = [ "9.9.9.9" ]; -- cgit v1.3.1 From 85730ea83e857fcae77190f8d4145e579f387967 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 20 Apr 2026 11:35:02 -0600 Subject: finally a working network config --- machines/bosco/default.nix | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'machines') diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index 27c63be..c62d296 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -50,10 +50,10 @@ # networking.usePredictableInterfaceNames = false; - # networking.localCommands = '' - # ip addr add 23.131.76.82/32 dev ens18 - # ip route replace default via 172.16.101.1 src 23.131.76.82 - # ''; + networking.localCommands = '' + ip route add default via 172.16.101.1 src 23.131.76.82 + ''; + # ip addr add 23.131.76.82/32 dev ens18 # ip route del default networking.interfaces."eth0".ipv4 = { addresses = [{ @@ -64,26 +64,26 @@ address = "172.16.101.82"; prefixLength = 24; }]; - # routes = [ - # { - # via = "172.16.101.1"; - # address = "0.0.0.0"; - # prefixLength = 0; - # # address = "172.16.101.82"; - # # prefixLength = 24; - # options = { - # table = "default"; - # src = "23.131.76.82"; - # }; - # } - # # { - # # via = "172.16.101.1"; - # # options = { - # # table = "default"; - # # metric = "202"; - # # }; - # # } - # ]; + routes = [ + { + via = "172.16.101.1"; + # address = "0.0.0.0"; + # prefixLength = 0; + address = "172.16.101.0"; + prefixLength = 24; + # options = { + # table = "default"; + # src = "23.131.76.82"; + # }; + } + # { + # via = "172.16.101.1"; + # options = { + # table = "default"; + # metric = "202"; + # }; + # } + ]; }; networking.nameservers = [ "9.9.9.9" ]; -- cgit v1.3.1 From deaf688228673127bb150e3c2738d776b8d97e87 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 20 Apr 2026 11:41:55 -0600 Subject: manual route unneeded --- machines/bosco/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'machines') diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index c62d296..1e6f354 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -64,18 +64,18 @@ address = "172.16.101.82"; prefixLength = 24; }]; - routes = [ - { - via = "172.16.101.1"; - # address = "0.0.0.0"; - # prefixLength = 0; - address = "172.16.101.0"; - prefixLength = 24; - # options = { - # table = "default"; - # src = "23.131.76.82"; - # }; - } + # routes = [ + # { + # via = "172.16.101.1"; + # # address = "0.0.0.0"; + # # prefixLength = 0; + # address = "172.16.101.0"; + # prefixLength = 24; + # # options = { + # # table = "default"; + # # src = "23.131.76.82"; + # # }; + # } # { # via = "172.16.101.1"; # options = { -- cgit v1.3.1 From ad8165b2131a17499581eecbd35908bc77332b25 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 20 Apr 2026 11:46:11 -0600 Subject: typo --- machines/bosco/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'machines') diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index 1e6f354..dba217a 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -83,7 +83,7 @@ # metric = "202"; # }; # } - ]; + # ]; }; networking.nameservers = [ "9.9.9.9" ]; -- cgit v1.3.1 From ad409b9b61380b74ba1e4f3c3a8469501cd43900 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 21 Apr 2026 11:15:14 -0600 Subject: update --- flake.lock | 140 +++++++++++++++++++++++++++---------------- home-manager/gaming.nix | 2 +- machines/betsy/default.nix | 2 +- machines/khad/default.nix | 2 +- machines/zenbook/default.nix | 2 +- 5 files changed, 91 insertions(+), 57 deletions(-) (limited to 'machines') diff --git a/flake.lock b/flake.lock index a048e55..1c10423 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1774211390, - "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=", + "lastModified": 1775558810, + "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70", + "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2", "type": "github" }, "original": { @@ -215,6 +215,24 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "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" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -258,11 +276,11 @@ ] }, "locked": { - "lastModified": 1775077333, - "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -275,7 +293,7 @@ "hugo-congo": { "flake": false, "locked": { - "narHash": "sha256-T7+OzM8Dq9vVKZUA90mSoy3ESmoR5Jvzi+yV2vXxLeA=", + "narHash": "sha256-LaLdKuI3m1gFjaAvKYq7j1ksvMvQru5kbqaqJ9dj3ps=", "type": "file", "url": "https://github.com/jpanther/congo" }, @@ -329,11 +347,11 @@ ] }, "locked": { - "lastModified": 1772461523, - "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", + "lastModified": 1775496928, + "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", + "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e", "type": "github" }, "original": { @@ -357,15 +375,15 @@ "nixpkgs-unstable" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1775082056, - "narHash": "sha256-rC0fWLlXNnZe+SjrCUqnX9QSrGiwLhTjR+y14onv+J4=", + "lastModified": 1776710722, + "narHash": "sha256-r3wsMIWSPbT6EEReEyVJ7sULgddOTitn8O0w7mGCjVk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "529f72249c2cf4cefc824a612aeddf2d5f858f54", + "rev": "73f48077965d5b895a731c34ab648f73fdb7b2ce", "type": "github" }, "original": { @@ -407,11 +425,11 @@ ] }, "locked": { - "lastModified": 1772467975, - "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", + "lastModified": 1774710575, + "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", + "rev": "0703df899520001209646246bef63358c9881e36", "type": "github" }, "original": { @@ -538,11 +556,11 @@ ] }, "locked": { - "lastModified": 1774211405, - "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=", + "lastModified": 1774911391, + "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "cb4e152dc72095a2af422956c6b689590572231a", + "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d", "type": "github" }, "original": { @@ -592,11 +610,11 @@ ] }, "locked": { - "lastModified": 1773074819, - "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", + "lastModified": 1775414057, + "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "f68afd0e73687598cc2774804fedad76693046f0", + "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490", "type": "github" }, "original": { @@ -629,11 +647,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1775055092, - "narHash": "sha256-N9EjeJD5qnszo08XSXeCvUylU1tJDJ1LxRb4Zb/YcKU=", + "lastModified": 1776340739, + "narHash": "sha256-s4FDictJlPtY6Shd6scG5hgrDMiHth09+svtvTA5NLA=", "owner": "astro", "repo": "microvm.nix", - "rev": "0f112113172c9fabeb27a94f39397d11df49e671", + "rev": "2f2f62fdfdca2750e3399f66bd03986ab967e5ca", "type": "github" }, "original": { @@ -645,7 +663,7 @@ "modded-minecraft-servers": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nix": "nix", "nixpkgs": "nixpkgs_2" }, @@ -668,11 +686,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1775504466, - "narHash": "sha256-FfRAANlGiF3oxq4aOO4BeyfAHRITsVg9tFdpSGgX/8c=", + "lastModified": 1776458745, + "narHash": "sha256-hKqVIM2g8pJDVKgR561fEuw/TtbtK/8ukmZgRrgJt88=", "owner": "feel-co", "repo": "ndg", - "rev": "3f35db16e655503eb1b0c3fba8e3f003199720a4", + "rev": "6c3864361ebe9c3458a52e0c692d1d66cdbfadb2", "type": "github" }, "original": { @@ -727,11 +745,11 @@ ] }, "locked": { - "lastModified": 1774762074, - "narHash": "sha256-89Mh4Eb/5stVJX6kGagVMijcU2FmfeD8Qv7UXc5d92o=", + "lastModified": 1776575850, + "narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "bc13aeaed568be76eab84df88ff39261bb52ff70", + "rev": "3b9653a107c736222b5ae0d4036dd3b885219065", "type": "github" }, "original": { @@ -744,14 +762,14 @@ "inputs": { "flake-compat": "flake-compat_3", "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { - "lastModified": 1775098524, - "narHash": "sha256-1RmA9W9qSWKHbYv5RBemkbhPLKnvbS/oHuP2Tc4aAU4=", + "lastModified": 1776742288, + "narHash": "sha256-4kvrkYdNdDF+FM0UVqvV6l2gnwPtjBku3lpTxcIaFT8=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "cc4e9a8b8c6e8315fb4cb53606bfd3481417a07c", + "rev": "9bcdf09f184803b32291c3dc08fb6da1b783f1b4", "type": "github" }, "original": { @@ -861,11 +879,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -909,11 +927,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "lastModified": 1776560675, + "narHash": "sha256-p68udKWWh7+V4ZPpcMDq0gTHWNZJnr4JPI+kHPPE40o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "rev": "e07580dae39738e46609eaab8b154de2488133ce", "type": "github" }, "original": { @@ -939,11 +957,11 @@ "nushell-scripts": { "flake": false, "locked": { - "lastModified": 1773315180, - "narHash": "sha256-5FKqphXxVSgqGXbqOL3aiZEGFSr5SMjMVIWzB0dA/+I=", + "lastModified": 1776554812, + "narHash": "sha256-QPKgVj5tWwgwspCQYwjPBJZLTHm2e3AuneOK+hI6qUg=", "owner": "nushell", "repo": "nu_scripts", - "rev": "196d94338d382561e7bacb29948ffcfa5ff1b2a1", + "rev": "c5387bd60ca63d26885ee73ceb8a84160bc6ca6b", "type": "github" }, "original": { @@ -962,11 +980,11 @@ ] }, "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "lastModified": 1775036584, + "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", "type": "github" }, "original": { @@ -984,6 +1002,7 @@ "catppuccin-starship": "catppuccin-starship", "catppuccin-waybar": "catppuccin-waybar", "disko": "disko", + "flake-utils": "flake-utils", "home-manager": "home-manager", "hugo-congo": "hugo-congo", "hyprland": "hyprland", @@ -1009,11 +1028,11 @@ ] }, "locked": { - "lastModified": 1774910634, - "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", + "lastModified": 1776771786, + "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", + "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", "type": "github" }, "original": { @@ -1039,6 +1058,21 @@ } }, "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": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1053,7 +1087,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index d4c4ea5..db00755 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -27,7 +27,7 @@ r2modman marble-marcher-ce prismlauncher - luanti + # luanti #upstream out of date lutris heroic wineWowPackages.waylandFull diff --git a/machines/betsy/default.nix b/machines/betsy/default.nix index 8bede1d..9a54214 100644 --- a/machines/betsy/default.nix +++ b/machines/betsy/default.nix @@ -20,7 +20,7 @@ systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; - kernelPackages = pkgs.linuxPackages_latest; # use latest kernel + # kernelPackages = pkgs.linuxPackages_latest; # use latest kernel #upstream bug # kernelParams = ["acpi=force" "acpi_osi=!" "acpi_osi=Linux"]; # binfmt.emulatedSystems = ["aarch64-linux"]; }; diff --git a/machines/khad/default.nix b/machines/khad/default.nix index b2ab71e..3f88856 100644 --- a/machines/khad/default.nix +++ b/machines/khad/default.nix @@ -24,7 +24,7 @@ systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; - kernelPackages = pkgs.linuxPackages_latest; # use latest kernel + # kernelPackages = pkgs.linuxPackages_latest; # use latest kernel #upstream bug }; boot.binfmt.emulatedSystems = ["aarch64-linux"]; hardware.onlykey.enable = true; diff --git a/machines/zenbook/default.nix b/machines/zenbook/default.nix index 0597811..cfc44f2 100644 --- a/machines/zenbook/default.nix +++ b/machines/zenbook/default.nix @@ -26,7 +26,7 @@ systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; - kernelPackages = pkgs.linuxPackages_latest; # use latest kernel + # kernelPackages = pkgs.linuxPackages_latest; # use latest kernel #upstream packaging issue binfmt.emulatedSystems = ["aarch64-linux"]; }; services.fwupd.enable = true; -- cgit v1.3.1 From d74d24d9a09402118fabb6a287f3d437d019346b Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 21 Apr 2026 12:44:04 -0600 Subject: remote builder biski --- machines/biski/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'machines') diff --git a/machines/biski/default.nix b/machines/biski/default.nix index d9944e6..74363a4 100644 --- a/machines/biski/default.nix +++ b/machines/biski/default.nix @@ -8,6 +8,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ../../modules/nixos/remote-build.nix # /tmp/etc/nixos/hardware-configuartion.nix ./disko.nix ./portforward.nix -- cgit v1.3.1