diff options
-rw-r--r-- | modules/server/bitfolk/default.nix | 16 | ||||
-rw-r--r-- | sys/atuin.nix | 9 |
2 files changed, 17 insertions, 8 deletions
diff --git a/modules/server/bitfolk/default.nix b/modules/server/bitfolk/default.nix new file mode 100644 index 000000000000..461d232e7add --- /dev/null +++ b/modules/server/bitfolk/default.nix @@ -0,0 +1,16 @@ +{ ... }: + +{ + boot.initrd.availableKernelModules = [ "xen_blkfront" ]; + + systemd.enableEmergencyMode = false; + + # Bitfolk provides its own GRUB, so we need to give it a grub.cfg + # but don't need to actually install GRUB anywhere. + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + boot.loader.grub.device = "nodev"; + + networking.dhcpcd.enable = false; +} + diff --git a/sys/atuin.nix b/sys/atuin.nix index 986031f6a58f..8de5d0cb5392 100644 --- a/sys/atuin.nix +++ b/sys/atuin.nix @@ -3,6 +3,7 @@ { imports = [ ../modules/server + ../modules/server/bitfolk ../modules/server/dns ../modules/server/irc ../modules/server/cgit @@ -15,8 +16,6 @@ ../modules/users ]; - boot.initrd.availableKernelModules = [ "xen_blkfront" ]; - fileSystems = { "/" = { device = "rpool/root"; fsType = "zfs"; neededForBoot = true; }; "/boot" = { device = "/dev/disk/by-partlabel/boot"; fsType = "ext4"; }; @@ -27,8 +26,6 @@ "/root" = { device = "rpool/home/root"; fsType = "zfs"; }; }; - systemd.enableEmergencyMode = false; - boot.zfs.devNodes = "/dev"; swapDevices = [ @@ -37,9 +34,6 @@ nix.maxJobs = 2; - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.device = "nodev"; boot.loader.grub.configurationLimit = 2; boot.supportedFilesystems = [ "zfs" ]; @@ -57,7 +51,6 @@ }; networking.defaultGateway = "85.119.80.1"; networking.defaultGateway6 = { address = "2001:ba8:1f1:f0bc::1"; }; - networking.dhcpcd.enable = false; networking.firewall.allowedTCPPorts = [ 80 443 6697 ]; networking.firewall.extraCommands = '' |