refactor(drives): add disclaimer and change order

hosts/argon/configuration.nix

@@ -8,13 +8,14 @@
     ../../modules/nixos/drives.nix
     ../../modules/nixos/gnupg.nix
     ../../modules/nixos/graphics.nix
+    ../../modules/nixos/greetd.nix
     ../../modules/nixos/locales.nix
     ../../modules/nixos/networking.nix
     ../../modules/nixos/niri.nix
     ../../modules/nixos/noctalia.nix
     ../../modules/nixos/openssh.nix
     ../../modules/nixos/packages.nix
-    ../../modules/nixos/sddm.nix
+    ../../modules/nixos/protonvpn.nix
     ../../modules/nixos/services.nix
     ../../modules/nixos/settings.nix
     ../../modules/nixos/steam.nix

modules/nixos/drives.nix

@@ -1,25 +1,8 @@
 { config, lib, pkgs, ... }:
 
-{
+# Add encrypted drives to argon
-  # decrypt data drives with keyfiles
-  boot.initrd.luks.devices = {
-    "data1" = {
-      device = "/dev/disk/by-uuid/dfae62cc-bad1-4879-bf9a-461bde833625";
-      keyFile = "/etc/nixos/keys/data1.key";
-      fallbackToPassword = true;
-    };
-    "data2" = {
-      device = "/dev/disk/by-uuid/8312edae-9247-481b-a313-52a7f848f027";
-      keyFile = "/etc/nixos/keys/data2.key";
-      fallbackToPassword = true;
-    };
-    "nvmecache" = {
-      device = "/dev/disk/by-uuid/2352250e-4ebe-4f9a-bf66-0d4aaa961bd8";
-      keyFile = "/etc/nixos/keys/nvmecache.key";
-      fallbackToPassword = true;
-    };
-  };
 
+{
   # copy keyfiles into initrd to make them available during early boot
   boot.initrd.secrets = {
     "/etc/nixos/keys/data1.key" = "/etc/nixos/keys/data1.key";
@@ -27,6 +10,22 @@
     "/etc/nixos/keys/nvmecache.key" = "/etc/nixos/keys/nvmecache.key";
   };
 
+  # decrypt data drives with keyfiles for argon
+  boot.initrd.luks.devices = {
+    "data1" = {
+      device = "/dev/disk/by-uuid/dfae62cc-bad1-4879-bf9a-461bde833625";
+      keyFile = "/etc/nixos/keys/data1.key";
+    };
+    "data2" = {
+      device = "/dev/disk/by-uuid/8312edae-9247-481b-a313-52a7f848f027";
+      keyFile = "/etc/nixos/keys/data2.key";
+    };
+    "nvmecache" = {
+      device = "/dev/disk/by-uuid/2352250e-4ebe-4f9a-bf66-0d4aaa961bd8";
+      keyFile = "/etc/nixos/keys/nvmecache.key";
+    };
+  };
+
   # mount decrypted filesystems
   fileSystems."/mnt/data1" = {
     device = "/dev/mapper/data1";

modules/nixos/graphics.nix

@@ -1,9 +1,17 @@
 { config, lib, pkgs, ... }:
 
 {
-  # enable GPU acceleration (mesa, vulkan, egl)
+  # enable amd GPU acceleration (mesa, vulkan, egl)
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
   };
+
+  # install amdgpu_top
+  environment.systemPackages = with pkgs; [
+    amdgpu_top
+  ];
+  
+  # add amdgpu to the initrd for plymouth
+  hardware.amdgpu.initrd.enable = true;
 }

modules/nixos/greetd.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # greetd display manager with tuigreet
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd niri-session";
+        user = "greeter";
+      };
+    };
+  };
+}

modules/nixos/networking.nix

@@ -1,9 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  ## set hostnname
-  #networking.hostName = "neon";
-
   # user networkmanager
   networking.networkmanager.enable = true;
 

modules/nixos/protonvpn.nix

@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  networking.firewall.checkReversePath = false;
+  environment.systemPackages = with pkgs; [
+    wireguard-tools
+    protonvpn-gui
+  ];
+}