From fb78c160e7d649e363b1602a968a68dea2ad4792 Mon Sep 17 00:00:00 2001
From: Ray Andrew <rs@rs.ht>
Date: Mon, 17 Mar 2025 16:53:18 -0500
Subject: [PATCH] update lemur

---
 .sops.yaml                     |  2 --
 home/emacs/config/post-init.el |  2 +-
 home/email/secrets.yaml        | 19 +++-------
 hosts/lemur/disko.nix          | 66 ++++++++++++----------------------
 4 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index 3adae0c..5d49d29 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,9 +1,7 @@
 keys:
   - &pickwick age13cfe8fhp4m978qlcur46vkkxepsl93ggwe53kmhue9xtpgr5zu5q4y6ln2
-  - &lemur age18cwckktnpxsg835kz8g55fdp7k7jqvglhykjuqhp8keajeldedqqzp2pvl
 creation_rules:
   - path_regex: home/email/secrets.yaml$
     key_groups:
     - age:
       - *pickwick
-      - *lemur
diff --git a/home/emacs/config/post-init.el b/home/emacs/config/post-init.el
index a027cf9..358fda7 100644
--- a/home/emacs/config/post-init.el
+++ b/home/emacs/config/post-init.el
@@ -407,7 +407,7 @@
   :commands (ace-window)
   :bind ("C-x C-o" . ace-window))
 
-(use-package compat)
+;; (use-package compat)
 (use-package transient)
 
 (use-package compile-angel
diff --git a/home/email/secrets.yaml b/home/email/secrets.yaml
index a256b15..fceb335 100644
--- a/home/email/secrets.yaml
+++ b/home/email/secrets.yaml
@@ -9,20 +9,11 @@ sops:
         - recipient: age13cfe8fhp4m978qlcur46vkkxepsl93ggwe53kmhue9xtpgr5zu5q4y6ln2
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBicUpzVUtabEJQbXF5c2g4
-            V2tWQUNuYXlYNGVZZGU2OVNTZXBNdDcreHpjCmtiemlqa0xiYm5zMG1IcXh5VC9F
-            OUhmVFJWd3B1ZG10REdORHo3ek44bDgKLS0tIHBIT0NxK3BqZTB1czRmN3BJTUJy
-            Qk1vTUVOKzRHcU5ja2JKY3hVYUpPaWMKY+U2YiE2+C6TQn6iqwC8uYOvOm66TdG7
-            ++jqQLKeqVUBoqSH7KJ3b2/SDqpFZyg9BPE/snZ3dyO3dCMPFMk6Hg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age18cwckktnpxsg835kz8g55fdp7k7jqvglhykjuqhp8keajeldedqqzp2pvl
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXRkIxcVhxUldIOHlwTlNn
-            d0MydEN1NGpaY1lSY1M3cUh3U2xVT1RkaEIwCnVXNWpVMTJ1cDIycnZBa3VWZVNa
-            dmFFeHlFSDhHalFrcTkyOWRVbDlDVHcKLS0tIFIybXpFWnFjK0ZUOHR2eXE2KzQv
-            VUt5eVJWUEJ6djdPc243bzl2UzZ2Rm8KssGa4dxjXWgf/h3KKkbGyyOioA+rf1yF
-            BUGJgpKmMxpib2OHWfKjusdMwF4Eep5ovqkggn4IB3TuWMNWD3mBkQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBndjF2VHhoK2J5clFZQzRa
+            SHZYajgvTWNET3dUbzN2Z0hmVFlNaWZVQlhrCkFZSm1RT2ZIZXhNaGVTVHhhQWQz
+            L3NhV29VTFdyK0ZSTW05cERtQ1kxcjgKLS0tIHAyeld3VUwxZjFuL2l1VVBYMWx0
+            UEFwZ1FwbUV6UksrMWgvNlJrYnUxeEUKVTAXJedGS5SUATd7TxNtIb+VPE/jJpew
+            D5eP8zK9SA0fNN36GLZhOqXlZk+7KDMqANO9RMD0XZex3XebdAeLEw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2025-03-04T21:54:28Z"
     mac: ENC[AES256_GCM,data:r+2SOcW7xLHee9kL8369yB6l/Z2XdnzGkeFygSrDgcZVfBfp/fT1xeMvu5tuu8aqsUeJ7lkFD2VKiBue95XSojdlM+5YyTerqdzLyMCRbkRivC3O2xXe90B4hVqm+twE9uu74mIznAQ2e0EO9E0MMlMNBo3EwsEcYA8gyVuB5mc=,iv:plNu3BircQ+kpPaXqlNvYlLAL5V5RX/yiETs+nY1pfw=,tag:7gVuOpzx5YsHtwodIRr4TQ==,type:str]
diff --git a/hosts/lemur/disko.nix b/hosts/lemur/disko.nix
index 775728a..4213cdc 100644
--- a/hosts/lemur/disko.nix
+++ b/hosts/lemur/disko.nix
@@ -1,21 +1,36 @@
 {
   disko.devices = {
     disk = {
-      one = {
+      nvme0n1 = {
         type = "disk";
         device = "/dev/nvme0n1";
         content = {
           type = "gpt";
           partitions = {
             boot = {
+              name = "boot";
+              size = "1M";
+              type = "EF02";
+            };
+            ESP = {
+              priority = 1;
               size = "1G";
               type = "EF00";
               content = {
-                type = "mdraid";
-                name = "boot";
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ 
+                 "defaults"
+                 "umask=0077" 
+                ];
+                extraArgs = [
+                  "-n"
+                  "BOOT"
+                ];
               };
             };
-            primary = {
+            lvm = {
               size = "100%";
               content = {
                 type = "lvm_pv";
@@ -25,20 +40,12 @@
           };
         };
       };
-      two = {
+      nvme1n1 = {
         type = "disk";
         device = "/dev/nvme1n1";
         content = {
           type = "gpt";
           partitions = {
-            boot = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "mdraid";
-                name = "boot";
-              };
-            };
             primary = {
               size = "100%";
               content = {
@@ -50,26 +57,12 @@
         };
       };
     };
-    mdadm = {
-      boot = {
-        type = "mdadm";
-        level = 1;
-        metadata = "1.0";
-        content = {
-          type = "filesystem";
-          format = "vfat";
-          mountpoint = "/boot";
-          mountOptions = [ "umask=0077" ];
-        };
-      };
-    };
     lvm_vg = {
       pool = {
         type = "lvm_vg";
         lvs = {
           swap = {
             size = "45G";
-            lvm_type = "mirror";
             content = {
               type = "swap";
               discardPolicy = "both";
@@ -82,7 +75,6 @@
           };
           root = {
             size = "400G";
-            lvm_type = "mirror";
             content = {
               type = "filesystem";
               format = "ext4";
@@ -92,13 +84,12 @@
               ];
               extraArgs = [
                 "-L"
-                "HOME"
+                "ROOT"
               ];
             };
           };
           home = {
-            size = "500G";
-            lvm_type = "raid0";
+            size = "100%FREE";
             content = {
               type = "filesystem";
               format = "ext4";
@@ -109,19 +100,6 @@
               ];
             };
           };
-          data = {
-            size = "100%FREE";
-            lvm_type = "raid0";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/data";
-              extraArgs = [
-                "-L"
-                "DATA"
-              ];
-            };
-          };
         };
       };
     };