diff options
| -rw-r--r-- | hosts/kansai/hardware-configuration.nix | 13 | ||||
| -rw-r--r-- | modules/desktop/default.nix | 4 | ||||
| -rw-r--r-- | modules/desktop/software/services/plex.nix | 5 | ||||
| -rw-r--r-- | modules/desktop/sops.nix | 7 | ||||
| -rw-r--r-- | modules/pc/software/boot/default.nix | 1 | ||||
| -rw-r--r-- | secrets/kansai.yaml | bin | 1223 -> 1442 bytes |
6 files changed, 27 insertions, 3 deletions
diff --git a/hosts/kansai/hardware-configuration.nix b/hosts/kansai/hardware-configuration.nix index 8a3e2af..7b3eae2 100644 --- a/hosts/kansai/hardware-configuration.nix +++ b/hosts/kansai/hardware-configuration.nix @@ -70,6 +70,19 @@ in "dmask=0022" ]; }; + + # "/mnt/plex" = { + # device = "/dev/mapper/plex"; + # fsType = "exfat"; + + # options = [ + # "rw" + # "uid=1000" + # "nofail" + # "nohidden" + # "noatime" + # ]; + # }; }; swapDevices = [ ]; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 5ef140c..580a81a 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,10 +1,8 @@ -{ config, self, ... }: { imports = [ ./networking ./software ./virtualisation + ./sops.nix ]; - - sops.defaultSopsFile = "${self}/secrets/${config.networking.hostName}.yaml"; } diff --git a/modules/desktop/software/services/plex.nix b/modules/desktop/software/services/plex.nix index 95a919b..1d2d1b1 100644 --- a/modules/desktop/software/services/plex.nix +++ b/modules/desktop/software/services/plex.nix @@ -1,6 +1,11 @@ +{ config, ... }: { services.plex = { enable = true; user = "ebisu"; }; + + environment.etc.crypttab.text = '' + plex /dev/sdc1 ${config.sops.secrets.plex_drive_bitlocker_recovery_key.path} bitlk + ''; } diff --git a/modules/desktop/sops.nix b/modules/desktop/sops.nix new file mode 100644 index 0000000..df280eb --- /dev/null +++ b/modules/desktop/sops.nix @@ -0,0 +1,7 @@ +{ config, self, ... }: +{ + sops = { + defaultSopsFile = "${self}/secrets/${config.networking.hostName}.yaml"; + secrets.plex_drive_bitlocker_recovery_key = { }; + }; +} diff --git a/modules/pc/software/boot/default.nix b/modules/pc/software/boot/default.nix index 41531c8..a8ed471 100644 --- a/modules/pc/software/boot/default.nix +++ b/modules/pc/software/boot/default.nix @@ -11,6 +11,7 @@ consoleLogLevel = 3; kernelPackages = pkgs.linuxPackages_zen; initrd.systemd.enable = true; + supportedFilesystems = [ "ntfs" ]; kernelParams = [ "iommu=pt" diff --git a/secrets/kansai.yaml b/secrets/kansai.yaml Binary files differindex 62cf0e8..cd4d8a0 100644 --- a/secrets/kansai.yaml +++ b/secrets/kansai.yaml |