palantir: resized lvs

disko/palantir/lvm.nix

@@ -2,8 +2,8 @@
 
 let
     disks = [
-        "/dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_184377804456"
+        "/dev/disk/by-id/ata-KINGSTON_SA400S37960G_50026B7383515406"
-        "/dev/disk/by-id/ata-KINGSTON_SA400S37120G_50026B7783176055"
+        #"/dev/disk/by-id/ata-KINGSTON_SA400S37120G_50026B7783176055"
     ];
 in 
 {
@@ -15,12 +15,18 @@ in
                 content = {
                     type = "gpt";
                     partitions = {
-                        bios_grub = {
+                        esp = {
-                            size = "2M";
+                            size = "512M";
-                            type = "EF02";
+                            type = "EF00";
+                            content = {
+                                type = "filesystem";
+                                format = "vfat";
+                                mountpoint = "/boot/efi";
+                                mountOptions = [ "umask=0077" ];
+                            };
                         };
 
-                        pv = {
+                        lvm = {
                             size = "100%";
                             content = {
                                 type = "lvm_pv";
@@ -31,22 +37,22 @@ in
                 };
             };
 
-            ssd1 = {
+            #ssd1 = {
-                type = "disk";
+            #    type = "disk";
-                device = builtins.elemAt disks 1;
+            #    device = builtins.elemAt disks 1;
-                content = {
+            #    content = {
-                    type = "gpt";
+            #        type = "gpt";
-                    partitions = {
+            #        partitions = {
-                        pv = {
+            #            lvm = {
-                            size = "100%";
+            #                size = "100%";
-                            content = {
+            #                content = {
-                                type = "lvm_pv";
+            #                    type = "lvm_pv";
-                                vg = "mainpool";
+            #                    vg = "mainpool";
-                            };
+            #                };
-                        };
+            #            };
-                    };
+            #        };
-                };
+            #    };
-            };
+            #};
         };
 
         lvm_vg = {
@@ -55,34 +61,28 @@ in
                 lvs = {
                     root = {
                         size = "30G";
-                        lvm_type = "raid0";
                         content = {
                             type = "filesystem";
                             format = "ext4";
                             mountpoint = "/";
-                            mountOptions = [ "noatime" ];
                         };
                     };
 
                     nix = {
-                        size = "50G";
+                        size = "100G";
-                        lvm_type = "raid0";
                         content = {
                             type = "filesystem";
                             format = "ext4";
                             mountpoint = "/nix";
-                            mountOptions = [ "noatime" ];
                         };
                     };
 
                     games = {
-                        size = "100%FREE";
+                        size = "200G";
-                        lvm_type = "raid0";
                         content = {
                             type = "filesystem";
                             format = "ext4";
                             mountpoint = "/games";
-                            mountOptions = [ "noatime" ];
                         };
                     };
                 };

flake.nix

@@ -24,16 +24,16 @@
                 inherit system;
                 specialArgs = { inherit release myUser disko; };
                 modules = [
-                    ./hosts/isengard.nix
                     ./modules/base.nix
+                    ./hosts/isengard.nix
                 ];
             };
             palantir = lib.nixosSystem {
                 inherit system;
                 specialArgs = { inherit release myUser disko; };
                 modules = [
-                    ./hosts/palantir.nix
                     ./modules/base.nix
+                    ./hosts/palantir.nix
 
                     home-manager.nixosModules.home-manager
                     ./modules/home.nix

hosts/palantir.nix

@@ -14,6 +14,7 @@
     boot.loader = {
         systemd-boot.enable = true;
         efi.canTouchEfiVariables = true;
+        efi.efiSysMountPoint = "/boot/efi";
     };
 
     # Networking

modules/containers/ntfy.nix

@@ -15,7 +15,7 @@ in
         image = "binwiederhier/ntfy:latest";
 
         ports = [
-            "127.0.0.1:10000:80"
+            "0.0.0.0:10000:80"
         ];
 
         volumes = [