Merge branch 'master' of ssh://bosco:/srv/git/.flake

5 files changed, 22 insertions, 20 deletions

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/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
diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix
index 133eca8..dba217a 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 add default via "172.16.101.1" dev ens18 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,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.82";
-        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 = {
@@ -83,7 +83,7 @@
       #     metric = "202";
       #   };
       # }
-    ];
+    # ];
   };
   networking.nameservers = [ "9.9.9.9" ];
 
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 f3ebeb1..cfc44f2 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
@@ -25,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;