Unencrypt and rename to Bun

README.md

@@ -1,3 +1,6 @@
 # ROCKPro64-Server
 
 A flake for Jules' ROCKPro64 server.
+
+For personal use, unlocking secrets can be done with this command:  
+``gpg --pinentry-mode loopback --decrypt local.key.asc | git-crypt unlock -``

flake.nix

@@ -18,7 +18,7 @@
     ...
   }@inputs:
   {
-    nixosConfigurations.rubble = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.progesterone = nixpkgs.lib.nixosSystem {
       modules = [ ./system ];
       specialArgs = inputs;
     };

system/accounts/users/custom/bun/default.nix

@@ -1,13 +1,14 @@
 { config, pkgs, ... }:
 {
-  users.users.jimbo = {
-    hashedPassword = config.secrets.jimboAccPass;
+  users.users.bun = {
+    hashedPassword = config.secrets.bunAccPass;
     isNormalUser = true;
     createHome = true;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2lMkUd+BbXITE5LTg94hEzmA6UKsIIbaf5YOjGoLzl Desktop"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFGHaxdTeC1xnTx2BY5LLR5LxhdSkmYoWuOeEuRIz0k Server"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHMJtG55GlIRVs6NzN9MeGZUFeduOcbOhFc0QEqWEl7o"
     ];
     extraGroups = [
       "wheel"

system/accounts/users/custom/default.nix

@@ -2,6 +2,6 @@
 {
   imports = [
     ./jules
-    ./jimbo
+    ./bun
   ];
 }

system/default.nix

@@ -11,7 +11,7 @@
   ];
 
   networking = {
-    hostName = "rubble";
+    hostName = "progesterone";
     hostId = "e0b1fcef";
   };
 

system/devices/disks/disko/default.nix

@@ -21,13 +21,8 @@
                 mountOptions = [ "umask=0077" ];
               };
             };
-            luks = {
+            main = {
               size = "100%";
-              content = {
-                type = "luks";
-                name = "${config.networking.hostName}-disk";
-                settings.allowDiscards = true;
-                passwordFile = "/tmp/secret.key";
               content = {
                 type = "lvm_pv";
                 vg = "${config.networking.hostName}";
@@ -37,7 +32,6 @@
         };
       };
     };
-    };
 
     lvm_vg = {
       "${config.networking.hostName}" = {
@@ -68,14 +62,13 @@
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
                 "/persist/.snapshots" = { };
-
                 "/persist/home/jules" = { };
                 "/persist/home/jules/.snapshots" = { };
               };
             };
           };
           swap = {
-            size = "4G";
+            size = "2G";
             content = {
               type = "swap";
               discardPolicy = "both";