trying to rehome bosco

1 files changed, 34 insertions, 14 deletions

diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix
index 621710f..e519f56 100644
--- a/machines/bosco/default.nix
+++ b/machines/bosco/default.nix
@@ -8,26 +8,31 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ./disko.nix
+
       ./reverse-proxy.nix
 
+      # ../biski/portforward.nix
       ../../modules/nixos/headscale.nix
       ../../modules/nixos/cgit.nix
     ];
-
+  nixpkgs.hostPlatform = "x86_64-linux";
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
-  # boot.loader.grub.efiSupport = true;
+  boot.loader.grub.efiSupport = true;
   # boot.loader.grub.efiInstallAsRemovable = true;
-  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.loader.efi.efiSysMountPoint = "/boot";
   # Define on which hard drive you want to install Grub.
-  boot.loader.grub.device = "nodev";
-  boot.loader.timeout = 10;
-  boot.loader.grub.forceInstall = true;
-  boot.loader.grub.extraConfig = ''
-    serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1;
-    terminal_input serial;
-    terminal_output serial
-  '';
+  # boot.loader.grub.device = "nodev";
+  boot.loader.grub.device = "boot";
+  boot.loader.timeout = 3;
+  # boot.loader.grub.forceInstall = true;
+  # boot.loader.grub.extraConfig = ''
+  #   serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1;
+  # #  serial --speed=115200
+  #   terminal_input serial;
+  #   terminal_output serial
+  # '';
 
   networking.hostName = "bosco"; # Define your hostname.
 
@@ -40,7 +45,22 @@
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-  networking.usePredictableInterfaceNames = false;
+  # networking.usePredictableInterfaceNames = false;
+
+  networking.localCommands = ''
+    ip addr add 23.131.76.82/32 eth0
+  '';
+  # networking.interfaces."eth0".ipv4 = {
+  #   addresses = [{
+  #     address = "23.131.76.82";
+  #     prefixLength = 32;
+  #   }];
+  #   routes = [{
+  #     address = "172.16.101.1";
+  #     prefixLength = 24;
+  #   }];
+  # };
+  # networking.nameservers = "9.9.9.9";
 
   # Select internationalisation properties.
   # i18n.defaultLocale = "en_US.UTF-8";
@@ -78,7 +98,7 @@
   services.openssh = {
     enable = true;
     settings.PermitRootLogin = "no";
-    ports = [ 22 2200];
+    ports = [ 22 ];
     extraConfig = "LoginGraceTime = 0";
   };
 
@@ -109,7 +129,7 @@
   # and migrated your data accordingly.
   #
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "25.11"; # Did you read the comment?
 
 }