diff options
Diffstat (limited to 'machines/bosco')
| -rw-r--r-- | machines/bosco/default.nix | 66 | ||||
| -rw-r--r-- | machines/bosco/disko.nix | 10 |
2 files changed, 24 insertions, 52 deletions
diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index dba217a..143db1d 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -10,32 +10,23 @@ ./hardware-configuration.nix ./disko.nix - # ./reverse-proxy.nix + ./reverse-proxy.nix + ../biski/portforward.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. - # 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-partlabel/boot"; + # boot.loader.systemd-boot.enable = true; + # boot.loader.efi.efiSysMountPoint = "/boot"; + # boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub = { + enable = true; + device = "nodev"; + efiSupport = true; + efiInstallAsRemovable = true; + }; 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. @@ -50,11 +41,6 @@ # networking.usePredictableInterfaceNames = false; - 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 = [{ address = "23.131.76.82"; @@ -64,28 +50,14 @@ 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"; - # # }; - # } - # { - # via = "172.16.101.1"; - # options = { - # table = "default"; - # metric = "202"; - # }; - # } - # ]; }; networking.nameservers = [ "9.9.9.9" ]; + networking.localCommands = '' + ip route add default via 172.16.101.1 src 23.131.76.82 + ip addr del 172.16.101.82/24 dev eth0 + ''; + # ip addr add 23.131.76.82/32 dev ens18 + # ip route del default # Select internationalisation properties. # i18n.defaultLocale = "en_US.UTF-8"; diff --git a/machines/bosco/disko.nix b/machines/bosco/disko.nix index bace733..3b5d899 100644 --- a/machines/bosco/disko.nix +++ b/machines/bosco/disko.nix @@ -13,7 +13,7 @@ label = "boot"; name = "ESP"; # start = "1M"; - size = "512M"; + size = "1G"; type = "EF00"; content = { type = "filesystem"; @@ -34,15 +34,15 @@ subvolumes = { "@root" = { mountpoint = "/"; - mountOptions = [ "subvol=root" "compress-force=zstd:5"]; + mountOptions = [ "subvol=root" "compress-force=zstd:5" "nodatacow"]; }; "@home" = { mountpoint = "/home"; - mountOptions = [ "subvol=home" "compress-force=zstd:5"]; + mountOptions = [ "subvol=home" "compress-force=zstd:5" "nodatacow"]; }; "@nix" = { mountpoint = "/nix"; - mountOptions = [ "subvol=nix" "compress-force=zstd:5"]; + mountOptions = [ "subvol=nix" "compress-force=zstd:5" "nodatacow"]; }; "@persist" = { mountpoint = "/persist"; @@ -50,7 +50,7 @@ }; "@log" = { mountpoint = "/var/log"; - mountOptions = [ "subvol=log" "compress-force=zstd:5"]; + mountOptions = [ "subvol=log" "compress-force=zstd:5" "nodatacow"]; }; "@swap" = { mountpoint = "/swap"; |