bosco network/boot rescue ops

2 files changed, 21 insertions, 32 deletions

diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix
index e519f56..a2b493c 100644
--- a/machines/bosco/default.nix
+++ b/machines/bosco/default.nix
@@ -10,11 +10,11 @@
       ./hardware-configuration.nix
       ./disko.nix
 
-      ./reverse-proxy.nix
+      # ./reverse-proxy.nix
 
       # ../biski/portforward.nix
-      ../../modules/nixos/headscale.nix
-      ../../modules/nixos/cgit.nix
+      # ../../modules/nixos/headscale.nix
+      # ../../modules/nixos/cgit.nix
     ];
   nixpkgs.hostPlatform = "x86_64-linux";
   # Use the GRUB 2 boot loader.
@@ -24,7 +24,7 @@
   boot.loader.efi.efiSysMountPoint = "/boot";
   # Define on which hard drive you want to install Grub.
   # boot.loader.grub.device = "nodev";
-  boot.loader.grub.device = "boot";
+  boot.loader.grub.device = "/dev/disk/by-uuid/1282-A4B6";
   boot.loader.timeout = 3;
   # boot.loader.grub.forceInstall = true;
   # boot.loader.grub.extraConfig = ''
@@ -47,20 +47,20 @@
 
   # 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";
+  # networking.localCommands = ''
+  #   ip addr add 23.131.76.82/32 dev ens18
+  # '';
+  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";
diff --git a/machines/bosco/hardware-configuration.nix b/machines/bosco/hardware-configuration.nix
index 34dd9bf..ac2c0ba 100644
--- a/machines/bosco/hardware-configuration.nix
+++ b/machines/bosco/hardware-configuration.nix
@@ -8,28 +8,17 @@
     [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/sda";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/sdb"; }
-    ];
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  # networking.useDHCP = lib.mkDefault true;
-  networking.interfaces.enp0s5.useDHCP = lib.mkDefault true;
-  # required for ssh?
-  networking.interfaces.eth0.useDHCP = true;
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }