update lemur
This commit is contained in:
parent
a3c8ae4124
commit
fb78c160e7
4 changed files with 28 additions and 61 deletions
|
|
@ -1,9 +1,7 @@
|
||||||
keys:
|
keys:
|
||||||
- &pickwick age13cfe8fhp4m978qlcur46vkkxepsl93ggwe53kmhue9xtpgr5zu5q4y6ln2
|
- &pickwick age13cfe8fhp4m978qlcur46vkkxepsl93ggwe53kmhue9xtpgr5zu5q4y6ln2
|
||||||
- &lemur age18cwckktnpxsg835kz8g55fdp7k7jqvglhykjuqhp8keajeldedqqzp2pvl
|
|
||||||
creation_rules:
|
creation_rules:
|
||||||
- path_regex: home/email/secrets.yaml$
|
- path_regex: home/email/secrets.yaml$
|
||||||
key_groups:
|
key_groups:
|
||||||
- age:
|
- age:
|
||||||
- *pickwick
|
- *pickwick
|
||||||
- *lemur
|
|
||||||
|
|
|
||||||
|
|
@ -407,7 +407,7 @@
|
||||||
:commands (ace-window)
|
:commands (ace-window)
|
||||||
:bind ("C-x C-o" . ace-window))
|
:bind ("C-x C-o" . ace-window))
|
||||||
|
|
||||||
(use-package compat)
|
;; (use-package compat)
|
||||||
(use-package transient)
|
(use-package transient)
|
||||||
|
|
||||||
(use-package compile-angel
|
(use-package compile-angel
|
||||||
|
|
|
||||||
|
|
@ -9,20 +9,11 @@ sops:
|
||||||
- recipient: age13cfe8fhp4m978qlcur46vkkxepsl93ggwe53kmhue9xtpgr5zu5q4y6ln2
|
- recipient: age13cfe8fhp4m978qlcur46vkkxepsl93ggwe53kmhue9xtpgr5zu5q4y6ln2
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBicUpzVUtabEJQbXF5c2g4
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBndjF2VHhoK2J5clFZQzRa
|
||||||
V2tWQUNuYXlYNGVZZGU2OVNTZXBNdDcreHpjCmtiemlqa0xiYm5zMG1IcXh5VC9F
|
SHZYajgvTWNET3dUbzN2Z0hmVFlNaWZVQlhrCkFZSm1RT2ZIZXhNaGVTVHhhQWQz
|
||||||
OUhmVFJWd3B1ZG10REdORHo3ek44bDgKLS0tIHBIT0NxK3BqZTB1czRmN3BJTUJy
|
L3NhV29VTFdyK0ZSTW05cERtQ1kxcjgKLS0tIHAyeld3VUwxZjFuL2l1VVBYMWx0
|
||||||
Qk1vTUVOKzRHcU5ja2JKY3hVYUpPaWMKY+U2YiE2+C6TQn6iqwC8uYOvOm66TdG7
|
UEFwZ1FwbUV6UksrMWgvNlJrYnUxeEUKVTAXJedGS5SUATd7TxNtIb+VPE/jJpew
|
||||||
++jqQLKeqVUBoqSH7KJ3b2/SDqpFZyg9BPE/snZ3dyO3dCMPFMk6Hg==
|
D5eP8zK9SA0fNN36GLZhOqXlZk+7KDMqANO9RMD0XZex3XebdAeLEw==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
- recipient: age18cwckktnpxsg835kz8g55fdp7k7jqvglhykjuqhp8keajeldedqqzp2pvl
|
|
||||||
enc: |
|
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXRkIxcVhxUldIOHlwTlNn
|
|
||||||
d0MydEN1NGpaY1lSY1M3cUh3U2xVT1RkaEIwCnVXNWpVMTJ1cDIycnZBa3VWZVNa
|
|
||||||
dmFFeHlFSDhHalFrcTkyOWRVbDlDVHcKLS0tIFIybXpFWnFjK0ZUOHR2eXE2KzQv
|
|
||||||
VUt5eVJWUEJ6djdPc243bzl2UzZ2Rm8KssGa4dxjXWgf/h3KKkbGyyOioA+rf1yF
|
|
||||||
BUGJgpKmMxpib2OHWfKjusdMwF4Eep5ovqkggn4IB3TuWMNWD3mBkQ==
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-03-04T21:54:28Z"
|
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]
|
mac: ENC[AES256_GCM,data:r+2SOcW7xLHee9kL8369yB6l/Z2XdnzGkeFygSrDgcZVfBfp/fT1xeMvu5tuu8aqsUeJ7lkFD2VKiBue95XSojdlM+5YyTerqdzLyMCRbkRivC3O2xXe90B4hVqm+twE9uu74mIznAQ2e0EO9E0MMlMNBo3EwsEcYA8gyVuB5mc=,iv:plNu3BircQ+kpPaXqlNvYlLAL5V5RX/yiETs+nY1pfw=,tag:7gVuOpzx5YsHtwodIRr4TQ==,type:str]
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,36 @@
|
||||||
{
|
{
|
||||||
disko.devices = {
|
disko.devices = {
|
||||||
disk = {
|
disk = {
|
||||||
one = {
|
nvme0n1 = {
|
||||||
type = "disk";
|
type = "disk";
|
||||||
device = "/dev/nvme0n1";
|
device = "/dev/nvme0n1";
|
||||||
content = {
|
content = {
|
||||||
type = "gpt";
|
type = "gpt";
|
||||||
partitions = {
|
partitions = {
|
||||||
boot = {
|
boot = {
|
||||||
|
name = "boot";
|
||||||
|
size = "1M";
|
||||||
|
type = "EF02";
|
||||||
|
};
|
||||||
|
ESP = {
|
||||||
|
priority = 1;
|
||||||
size = "1G";
|
size = "1G";
|
||||||
type = "EF00";
|
type = "EF00";
|
||||||
content = {
|
content = {
|
||||||
type = "mdraid";
|
type = "filesystem";
|
||||||
name = "boot";
|
format = "vfat";
|
||||||
|
mountpoint = "/boot";
|
||||||
|
mountOptions = [
|
||||||
|
"defaults"
|
||||||
|
"umask=0077"
|
||||||
|
];
|
||||||
|
extraArgs = [
|
||||||
|
"-n"
|
||||||
|
"BOOT"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
primary = {
|
lvm = {
|
||||||
size = "100%";
|
size = "100%";
|
||||||
content = {
|
content = {
|
||||||
type = "lvm_pv";
|
type = "lvm_pv";
|
||||||
|
|
@ -25,20 +40,12 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
two = {
|
nvme1n1 = {
|
||||||
type = "disk";
|
type = "disk";
|
||||||
device = "/dev/nvme1n1";
|
device = "/dev/nvme1n1";
|
||||||
content = {
|
content = {
|
||||||
type = "gpt";
|
type = "gpt";
|
||||||
partitions = {
|
partitions = {
|
||||||
boot = {
|
|
||||||
size = "1G";
|
|
||||||
type = "EF00";
|
|
||||||
content = {
|
|
||||||
type = "mdraid";
|
|
||||||
name = "boot";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
primary = {
|
primary = {
|
||||||
size = "100%";
|
size = "100%";
|
||||||
content = {
|
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 = {
|
lvm_vg = {
|
||||||
pool = {
|
pool = {
|
||||||
type = "lvm_vg";
|
type = "lvm_vg";
|
||||||
lvs = {
|
lvs = {
|
||||||
swap = {
|
swap = {
|
||||||
size = "45G";
|
size = "45G";
|
||||||
lvm_type = "mirror";
|
|
||||||
content = {
|
content = {
|
||||||
type = "swap";
|
type = "swap";
|
||||||
discardPolicy = "both";
|
discardPolicy = "both";
|
||||||
|
|
@ -82,7 +75,6 @@
|
||||||
};
|
};
|
||||||
root = {
|
root = {
|
||||||
size = "400G";
|
size = "400G";
|
||||||
lvm_type = "mirror";
|
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "ext4";
|
format = "ext4";
|
||||||
|
|
@ -92,13 +84,12 @@
|
||||||
];
|
];
|
||||||
extraArgs = [
|
extraArgs = [
|
||||||
"-L"
|
"-L"
|
||||||
"HOME"
|
"ROOT"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
home = {
|
home = {
|
||||||
size = "500G";
|
size = "100%FREE";
|
||||||
lvm_type = "raid0";
|
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "ext4";
|
format = "ext4";
|
||||||
|
|
@ -109,19 +100,6 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
data = {
|
|
||||||
size = "100%FREE";
|
|
||||||
lvm_type = "raid0";
|
|
||||||
content = {
|
|
||||||
type = "filesystem";
|
|
||||||
format = "ext4";
|
|
||||||
mountpoint = "/data";
|
|
||||||
extraArgs = [
|
|
||||||
"-L"
|
|
||||||
"DATA"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue