diff options
| -rw-r--r-- | machines/bosco/default.nix | 34 | ||||
| -rw-r--r-- | machines/bosco/disko.nix | 4 |
2 files changed, 31 insertions, 7 deletions
diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index 461ebb1..17db03e 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -18,13 +18,16 @@ ]; nixpkgs.hostPlatform = "x86_64-linux"; # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - boot.loader.grub.efiSupport = true; + # boot.loader.grub.enable = true; + # boot.loader.grub.efiSupport = true; + boot.loader.systemd-boot.enable = true; # boot.loader.grub.efiInstallAsRemovable = true; boot.loader.efi.efiSysMountPoint = "/boot"; + boot.loader.efi.canTouchEfiVariables = true; # Define on which hard drive you want to install Grub. # boot.loader.grub.device = "nodev"; - boot.loader.grub.device = "/dev/disk/by-uuid/1282-A4B6"; + # boot.loader.grub.device = "/dev/disk/by-uuid/1282-A4B6"; + # boot.loader.grub.device = "/dev/disk/by-partlabel/boot"; boot.loader.timeout = 3; # boot.loader.grub.forceInstall = true; # boot.loader.grub.extraConfig = '' @@ -49,16 +52,35 @@ # networking.localCommands = '' # ip addr add 23.131.76.82/32 dev ens18 + # ip route del default + # ip route add default via "172.16.101.1" dev ens18 src 23.131.76.82 # ''; networking.interfaces."eth0".ipv4 = { addresses = [{ address = "23.131.76.82"; prefixLength = 32; - }]; - routes = [{ - address = "172.16.101.1"; + } + { + address = "172.16.101.82"; prefixLength = 24; }]; + routes = [ + { + via = "172.16.101.1"; + address = "23.131.76.82"; + prefixLength = 32; + options = { + table = "default"; + }; + } + # { + # via = "172.16.101.1"; + # options = { + # table = "default"; + # metric = "202"; + # }; + # } + ]; }; # networking.nameservers = [ "9.9.9.9" ]; diff --git a/machines/bosco/disko.nix b/machines/bosco/disko.nix index 3bb1f85..bace733 100644 --- a/machines/bosco/disko.nix +++ b/machines/bosco/disko.nix @@ -9,15 +9,17 @@ content = { type = "gpt"; partitions = { - ESP = { + boot = { label = "boot"; name = "ESP"; + # start = "1M"; size = "512M"; type = "EF00"; content = { type = "filesystem"; format = "vfat"; mountpoint = "/boot"; + # mountOptions = [ "umask 0077" ]; mountOptions = [ "defaults" ]; |