From 361576ad246cab07b870be5a2c6c19a1778f64ca Mon Sep 17 00:00:00 2001 From: kat witch Date: Mon, 30 Nov 2020 02:33:18 +0000 Subject: [PATCH] Mabon plans. Samhain work in progress continuations. --- README.md | 8 ++++++-- configuration/hosts/samhain/configuration.nix | 1 + configuration/hosts/samhain/hardware-configuration.nix | 5 +++++ configuration/profiles/common/default.nix | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e73cae39..59e50bf4 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,12 @@ Nix deployment related stuff. - [x] Format "BigExtfs" as an encrypted, perhaps compressed ZFS pool. - [x] Migrate the content from "BigEXT" over to the new ZFS pool. - [x] Format "BigEXT" to be the mirror of the drive formerly known as "BigExtfs". - - [ ] Excess space on the 3TiB drive should be formatted as either exFAT or ext4. - - [ ] Work out any remaining quirks of this. + - [x] Excess space on the 3TiB drive should be formatted as either exFAT or ext4. + - [x] Work out any remaining quirks of this. + +### Host: mabon +- [ ] Reinstall mabon with a ZFS filesystem for the root. + - [ ] Set up a backups system that pulls from samhain's protected dataset. ### Group: graphical - [ ] Move all devices to using Sway. diff --git a/configuration/hosts/samhain/configuration.nix b/configuration/hosts/samhain/configuration.nix index 56683152..84bb76c4 100644 --- a/configuration/hosts/samhain/configuration.nix +++ b/configuration/hosts/samhain/configuration.nix @@ -14,6 +14,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + boot.supportedFilesystems = [ "zfs" "xfs" ]; networking.hostName = "samhain"; networking.hostId = "617050fc"; diff --git a/configuration/hosts/samhain/hardware-configuration.nix b/configuration/hosts/samhain/hardware-configuration.nix index 4e3002c0..e9d67b2a 100644 --- a/configuration/hosts/samhain/hardware-configuration.nix +++ b/configuration/hosts/samhain/hardware-configuration.nix @@ -43,6 +43,11 @@ fsType = "zfs"; }; + fileSystems."/disks/excess" = + { device = "/dev/disk/by-uuid/0af88a48-ccfd-4e54-9652-a5ae7f74e21d"; + fsType = "xfs"; + }; + swapDevices = [ { device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; } ]; diff --git a/configuration/profiles/common/default.nix b/configuration/profiles/common/default.nix index 48401235..32d3fc96 100644 --- a/configuration/profiles/common/default.nix +++ b/configuration/profiles/common/default.nix @@ -25,7 +25,8 @@ in { nix.gc.options = lib.mkDefault "--delete-older-than 1w"; nix.trustedUsers = [ "root" "@wheel" ]; environment.variables.EDITOR = "kak"; - + boot.supportedFilesystems = [ "zfs" ]; + services.openssh.enable = true; services.openssh.ports = lib.mkDefault [ 62954 ]; services.openssh.passwordAuthentication = false;