From 081e1e184f508c60a77ad4a2617734fda0c24a7a Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 16:39:39 +0200 Subject: [PATCH 01/39] Update secret terrier-age.key --- sops/secrets/terrier-age.key/secret | 15 +++++++++++++++ sops/secrets/terrier-age.key/users/pedro | 1 + 2 files changed, 16 insertions(+) create mode 100644 sops/secrets/terrier-age.key/secret create mode 120000 sops/secrets/terrier-age.key/users/pedro diff --git a/sops/secrets/terrier-age.key/secret b/sops/secrets/terrier-age.key/secret new file mode 100644 index 0000000..9d09527 --- /dev/null +++ b/sops/secrets/terrier-age.key/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:GLRUhNPwYU6qV/sQaXfEV02dyB0rUjA1gAQtXrqYsrUspSipYQhWyORSMtOp8IAzYxjIIvY4VIGhY7g7HRi40j1yTMj8w5j4bJ4=,iv:1tfgv3ioEpyuJfjqLksLv4C07krff+jOvA+npMeDg/0=,tag:lLlrEz6XXQxuFbXSyY+WLw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRWWU3aUpzcDdjUUhSbjZo\nUklLdzVDdFdLVitRM09qT2ZHTi9icE5WalRRCld2U0haYTVhZXp6TUNpdmVxUGMz\nSmpHNWNkdVIzNFVHcDdFckxpQW5wZjgKLS0tIHQ1UlVhL2E2cTFZZ1d0Nm15dWxa\nNjZjTTl3d3laS2p6TlpZR0JSVW1NSm8KplXQUxhs2SJRrZRcUGEDCIVm5VZLbJO3\nEHkH13E1iG3Ks1WbgEG6q02lx9PqpGqUEudEK+YiGX/9m0aJPDIrVQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:39:39Z", + "mac": "ENC[AES256_GCM,data:JcwMnkrLgKTJcrmNsOuZzh2oAQfMsLOsN+7ombsVdodNW6AWEabRwC8H+2HojJGtDrV2Wcgxb235WSsmPtfTyVt4PEAqOmfIbsAjOhTCJNw5vZtAuA3b4v78VHE+O8Btve70dRN7mao1WmZJ4kwkKoeIeSg+PtY4rPmdm4XY58A=,iv:FanykSKjHxbiQ0VZpw/HES6abJziv6ShxdNK2M4RIps=,tag:Fpu1YF4jGLOlEBH4bPm7cw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/sops/secrets/terrier-age.key/users/pedro b/sops/secrets/terrier-age.key/users/pedro new file mode 120000 index 0000000..c7b3668 --- /dev/null +++ b/sops/secrets/terrier-age.key/users/pedro @@ -0,0 +1 @@ +../../../users/pedro \ No newline at end of file From 64d6e48d56d2cb6c76e88bc2d7256a59e307b44d Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 16:39:47 +0200 Subject: [PATCH 02/39] Add machine terrier to secrets --- sops/machines/terrier/key.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 sops/machines/terrier/key.json diff --git a/sops/machines/terrier/key.json b/sops/machines/terrier/key.json new file mode 100755 index 0000000..d5070bf --- /dev/null +++ b/sops/machines/terrier/key.json @@ -0,0 +1,6 @@ +[ + { + "publickey": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", + "type": "age" + } +] \ No newline at end of file From c1fc2a18a83f994175a1326f9a944c25192ce55b Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 16:39:53 +0200 Subject: [PATCH 03/39] Update vars via generator mycelium for machine terrier --- vars/per-machine/terrier/mycelium/ip/value | 1 + .../terrier/mycelium/key/machines/terrier | 1 + vars/per-machine/terrier/mycelium/key/secret | 19 +++++++++++++++++++ .../terrier/mycelium/key/users/pedro | 1 + .../per-machine/terrier/mycelium/pubkey/value | 1 + 5 files changed, 23 insertions(+) create mode 100644 vars/per-machine/terrier/mycelium/ip/value create mode 120000 vars/per-machine/terrier/mycelium/key/machines/terrier create mode 100644 vars/per-machine/terrier/mycelium/key/secret create mode 120000 vars/per-machine/terrier/mycelium/key/users/pedro create mode 100644 vars/per-machine/terrier/mycelium/pubkey/value diff --git a/vars/per-machine/terrier/mycelium/ip/value b/vars/per-machine/terrier/mycelium/ip/value new file mode 100644 index 0000000..69b1b88 --- /dev/null +++ b/vars/per-machine/terrier/mycelium/ip/value @@ -0,0 +1 @@ +544:5d19:c117:8cc2:85c6:6a16:e78a:9737 diff --git a/vars/per-machine/terrier/mycelium/key/machines/terrier b/vars/per-machine/terrier/mycelium/key/machines/terrier new file mode 120000 index 0000000..58c49a5 --- /dev/null +++ b/vars/per-machine/terrier/mycelium/key/machines/terrier @@ -0,0 +1 @@ +../../../../../../sops/machines/terrier \ No newline at end of file diff --git a/vars/per-machine/terrier/mycelium/key/secret b/vars/per-machine/terrier/mycelium/key/secret new file mode 100644 index 0000000..c30c84b --- /dev/null +++ b/vars/per-machine/terrier/mycelium/key/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:ikjr/qil5CgNd/TxtbyIISy1+WSIIjXjqqREDU0dScU=,iv:Hjh70ULKScfgV+9VFcfre//4iLj/zEF0AUfrGYITU3k=,tag:fJynZxzJaJTfqlg3crdAGQ==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnWlhWVlNqem84Vi9YZ04v\nRVlKK1pNbnZrV2luZTdaQlh0YVArVDJkQW5VCksvNllMdTJacmdqZW51NS96NkYz\nTzlMdk9UNjVMUGVtN1VDU0ZVV1piVDgKLS0tIDQzTDFza0lZQ2hpc2JYZktRcEhS\nbURRYkJlc2d3S1lINmFxRXIvaFQwc0kKzWp2oUItqE2EBfGhRoq+XSocNMqDy8T0\nLCJaYiF7Rxecq6DdDTQu4DcykJQ6MzamqXEHSppolSX12PqduaSDlg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFT3E2QUpWZVdETmQrMTMv\nWHN2aEVacnZrcjIrS3VZQ0grRms5Uk5xK1FNCkI0dkN0R0tWYnNKeUxOdEdGWlJJ\ndGFyd0JPTjd1WmlELzFBbFAxcTlhdk0KLS0tIGc1YlBYSHFPUy9OM1NVSk95SUtX\neTQ5YlpVSE04eUJmMGl5ZnNxbEIwbFEKPR/VG/YUo2JviDb2X8Pn7bAu4oJtq/UH\ngaFHpYw7UmJa2EC33jm51V+sY+IP9AR6MDiabQw9f6AtiF2KV4mOXg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:39:53Z", + "mac": "ENC[AES256_GCM,data:JClzP/Wovedo2w703SnQeyJTygJzybWDpbLFs4xKNXLcKI4yrzh1DZzyR21mlwxaARIV4+UwO6alkJAcMCPnc4LIaqAOkULbAiptRyXmdzLxx5rIpGmXOYE8N5y5J/m6cZcjCy15o2Me4b/qyfsq844z+NpUTGx/fCCuTPh/eMs=,iv:6uTZvVdW5JUIqRtV7t+iUee2oOLzIZdXijVusPUFMxk=,tag:CKYMgs59GY7cXY8xKnHoXw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/terrier/mycelium/key/users/pedro b/vars/per-machine/terrier/mycelium/key/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/terrier/mycelium/key/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/terrier/mycelium/pubkey/value b/vars/per-machine/terrier/mycelium/pubkey/value new file mode 100644 index 0000000..6f11a19 --- /dev/null +++ b/vars/per-machine/terrier/mycelium/pubkey/value @@ -0,0 +1 @@ +dad91f50e1aaab7389f46eb568960d3ee53bb54b894c964638a42af983a4e613 From c93abc9a548aa1eaac34a6cad0fa34245af3c329 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 16:40:01 +0200 Subject: [PATCH 04/39] Update vars via generator openssh for machine terrier --- .../terrier/openssh/ssh.id_ed25519.pub/value | 1 + .../openssh/ssh.id_ed25519/machines/terrier | 1 + .../terrier/openssh/ssh.id_ed25519/secret | 19 +++++++++++++++++++ .../openssh/ssh.id_ed25519/users/pedro | 1 + 4 files changed, 22 insertions(+) create mode 100644 vars/per-machine/terrier/openssh/ssh.id_ed25519.pub/value create mode 120000 vars/per-machine/terrier/openssh/ssh.id_ed25519/machines/terrier create mode 100644 vars/per-machine/terrier/openssh/ssh.id_ed25519/secret create mode 120000 vars/per-machine/terrier/openssh/ssh.id_ed25519/users/pedro diff --git a/vars/per-machine/terrier/openssh/ssh.id_ed25519.pub/value b/vars/per-machine/terrier/openssh/ssh.id_ed25519.pub/value new file mode 100644 index 0000000..48d92cc --- /dev/null +++ b/vars/per-machine/terrier/openssh/ssh.id_ed25519.pub/value @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICIE2ICkpQb1iAMoouBBKbnQCova2FDzz1C0Bvh/XBzY diff --git a/vars/per-machine/terrier/openssh/ssh.id_ed25519/machines/terrier b/vars/per-machine/terrier/openssh/ssh.id_ed25519/machines/terrier new file mode 120000 index 0000000..58c49a5 --- /dev/null +++ b/vars/per-machine/terrier/openssh/ssh.id_ed25519/machines/terrier @@ -0,0 +1 @@ +../../../../../../sops/machines/terrier \ No newline at end of file diff --git a/vars/per-machine/terrier/openssh/ssh.id_ed25519/secret b/vars/per-machine/terrier/openssh/ssh.id_ed25519/secret new file mode 100644 index 0000000..7c74b0c --- /dev/null +++ b/vars/per-machine/terrier/openssh/ssh.id_ed25519/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:6f2y+qVBC821ZL96BS7WHccd8jigPJcZFK6XAtjTlJVVNAl3pNlmNsFh5NMNrkTE4r2K8CCL+4HS5AtJXNM4QnuvHlvBaqUQIyI4Aq9Lmw22R91u//rgI8wdG7/sxrXWLzd7NpdieX/gwQO13ZmuNE0QyuyVjQAOFVvaE//WXMt7fGCOw4sj59Z7PtbbsIwyYO4pMLz5PfcugCHqqsoVZ0QuGPaLLm9kUTIHJmiRr93wCJKEJwBxasIouzhQcOwHez9ALQZQx2T8w5Js5YkXiNg/0Kt30LHUQDeXorP5fb5CDzv+p5JxevhDvyAFLtgITpK0fd7JBmqLcU8H6/KUK644CgfFA+RER/n6DZI2rj2yhT+zo27tRbME3DAxNgCda/cY8ncWHWjPhfzgJQ291a81mF+QTQS1hQx7R/sZOYh18/rGznS3KmzpjYAcErUgeuPq6dZlJ0WUms45g15dTXY5pzekG6qj3n9DEX126kJQ+Bkx0nXGTUW2/SIGdyrQcTeL,iv:Z+k0gLOmstfVlXVBsT5nvhXxYMlCuW938nt2Ae7nr2c=,tag:JQkcdZi9UUyxNitlZwFoug==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjY3NVTHl3S2JrZmR0d0J4\nekJCd2NSMVNMYlh4T2o5M3FXNWlKSGo3WlE4CnVnWG90YmdCT1hvWTJxZEZ6WkZt\nbjZmUlhyZzBNS1d3STVhMDZQMlFxdzAKLS0tIHMrZFZabEJKRWpzRVBFUWc0Wmhy\nejg3WlN0bVcvOVZRbGpyY3BSRDRJTTQKSdtKFVnKVZJs0j4QW9ZWjQLC8itZJb93\nwYFrbXg359Il4OeeNOpG+EFoh8spgLtONHwGu2Ii1tNA0v7jMFQwjg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNcDRCekRtS2tXMXAvREpx\nNFNJR1lWWHZXM3drUnJqOXVUbHpMLzdNRzEwCjhtYTNoQnZvVkFGM2pIdGx3YXV1\nZ0hqeGRMaExlZFJFYXJBOFpQN3RaUkEKLS0tIDNacDdpSFZrU2wyUmwzVmxodkhT\nYzRCK3hKcnJQa3pNNzduM1dBQ0V0d1EKOkODTXvGhIp9i8a0z19Nr34MBRESY3st\nqIQBHPX3pKW+o8IEknhMM/cPS+9Rtwk5TCy5tfkuI7P237Esu/TCyw==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:40:01Z", + "mac": "ENC[AES256_GCM,data:65a01IWi2KXxWgr8oc64hRlapZ6HN5MPyQsZvHLP4kgPh6sBHjwfTy6HvmcnBIc0iCVysunRFknv6cd8m4FnNJLirQOXb+At/5KMnEW+jikZZzDVX5QRmquDDVNa2d9Y+moMow7EMEEcuNmPrY9p/moUG6RHUpOs4ZA+KDJOJYU=,iv:4/a27gEIffiVMQ0WPn7qprnJ0EQTUfErjOVY2R+qRaQ=,tag:1pQVjNi88WaVcHYOZ2EOmQ==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/terrier/openssh/ssh.id_ed25519/users/pedro b/vars/per-machine/terrier/openssh/ssh.id_ed25519/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/terrier/openssh/ssh.id_ed25519/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From b641b810740963e6ca64994ea21dc1043cf85215 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 16:40:15 +0200 Subject: [PATCH 05/39] Update vars via generator root-password for machine terrier --- .../password-hash/machines/terrier | 1 + .../root-password/password-hash/secret | 19 +++++++++++++++++++ .../root-password/password-hash/users/pedro | 1 + .../terrier/root-password/password/secret | 15 +++++++++++++++ .../root-password/password/users/pedro | 1 + 5 files changed, 37 insertions(+) create mode 120000 vars/per-machine/terrier/root-password/password-hash/machines/terrier create mode 100644 vars/per-machine/terrier/root-password/password-hash/secret create mode 120000 vars/per-machine/terrier/root-password/password-hash/users/pedro create mode 100644 vars/per-machine/terrier/root-password/password/secret create mode 120000 vars/per-machine/terrier/root-password/password/users/pedro diff --git a/vars/per-machine/terrier/root-password/password-hash/machines/terrier b/vars/per-machine/terrier/root-password/password-hash/machines/terrier new file mode 120000 index 0000000..58c49a5 --- /dev/null +++ b/vars/per-machine/terrier/root-password/password-hash/machines/terrier @@ -0,0 +1 @@ +../../../../../../sops/machines/terrier \ No newline at end of file diff --git a/vars/per-machine/terrier/root-password/password-hash/secret b/vars/per-machine/terrier/root-password/password-hash/secret new file mode 100644 index 0000000..942eacd --- /dev/null +++ b/vars/per-machine/terrier/root-password/password-hash/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:ZWNpk2lRQtrKlgB28q9TGdqErJqWc11W9eDRWSxWYm5vb9yEcrB1qfS5EKCWw4n/Tyi7/iqTwnmRZfsjexoWrSMl1mkHwG+BV0jJFW4OKe6k6wH3TXtCKqyT6WIMojSBO5fyqcW2IoOZTw==,iv:lA2zUetHPWrJ7wJKqUWiUxAZ5+8pamOeYMOGrdW06DI=,tag:IB9CfjmxHVA3CrHzUoo7hQ==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRVVpyeFc1SWlZUnBwR3gv\nQkFZYnhiY2YrZm93WHg2Qmk4dUxQenJoY0VjCjF1VXp4TVVpSEFONjBxTzdmdVJa\nbmdrT0RPSFk3SDdveUFSVy8xMnlXQWMKLS0tIGtSVXc2cWJWTEhYU2NsQkdwVzRV\nUStnWkpmMUErRENOYnVkNzFOKzJGdGsKoMMovOYk2Vsz8fXNLwJVCzxdV3/L3iLM\nk56cjrTRzgMkVynUDfz5M42bCrZZZmjcsyYlTLVlHWtLTTNZsXU6xA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkUkxLdllRcXRqb0ozeHRN\nZU9hQmlLZnhqSGVlNlFOZXVUdk9pdyt3VVNJCk93TXFKNlFJc2tLTGRzUEhUV1gy\nbGtOY2JhT3A0V1lEMXNXaldOUjEvdTAKLS0tIHgzblVLUmJ3WnZLWW4wblRMNnhv\nSkRnamp6Y3hmZjRmZkp3SW1Sb3ZiRW8KKcCUKjVmRIVI2e/oyNtRHnjVsxk2xAbh\nOWTMmVPfVTTYVgr1njHD3Dzw+xXNVy1sFpFtyik6JL/7sli4v8vGRA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:40:15Z", + "mac": "ENC[AES256_GCM,data:KqmNuntZtPByrLmsSXGgCX50BR7uuio9aFVfinqjCEUMNJdSVTJAPA2eXHS5dYr1L5HJnlKa/12C11qKxzN2oRNH/be/Rq7q6TO0uFA4XWLT0t3S1GfSqcy4edTdqitwu9gmS1kOKb6/y2pRW8/vv6XKtpQ8Qpzp4vYpfh7korM=,iv:O6dSUV7PCY5w/mh0N2K71wkzZ/vujvcHW0eg3hlI9VM=,tag:+vkeVqzST0fSTogx7hq1Dw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/terrier/root-password/password-hash/users/pedro b/vars/per-machine/terrier/root-password/password-hash/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/terrier/root-password/password-hash/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/terrier/root-password/password/secret b/vars/per-machine/terrier/root-password/password/secret new file mode 100644 index 0000000..87de57d --- /dev/null +++ b/vars/per-machine/terrier/root-password/password/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:ycS8vD/QZatRLWPVkQ==,iv:AcecRa/HqenCUzUxjvApPRkL0zTt596kpQwXdckvAmk=,tag:/7QueNOcBzHu7EWMzFO4aA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBONjErS08xWWFaTzZQdUZR\nR1VpUEg3aGFzUXo0YTFJa2gzQytiQ3Vlc2lRCkx0bUxNTm5nQUFpbTloVWN5Rk40\na2JEOFNKc05HVjZBdzJ4MUFYZ1BFL2MKLS0tIDN1OUwvZlM5UWs5R0NROU1LZGNt\nRjFkN1RmeHdQaFh1MTR0NjJHZDF5dTQKxP3InmIwYpLYUrnQol6c2ZDdj6OHWPEM\nQIgiXxrgGIIncDqMNdffmPfNE6TpI/ZjHdlkqsZSFrpA/A71LW8BUg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:40:15Z", + "mac": "ENC[AES256_GCM,data:MXbzfhw9p+q5G8SKNCuAmUWyARDUOMdElM8JcJi1y8Bqqbno6Txc3/lMIQwATWBRNE4i1ViaeQYTIgOfxJ1VhNvgUfIUnckEyAMfb9a5BW0VpgrXEDH/4vG1qClnc9lvE7kQlkE9ViIdHx0ZmWD1Yu+wT24tH9E2lUaB3xR1sSo=,iv:Q6S8nJbNhPdzkaDR6b8MNTWObo81kVWey7nfOPoDeQ0=,tag:jezzFDa9FMCet+DcN5WkDg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/terrier/root-password/password/users/pedro b/vars/per-machine/terrier/root-password/password/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/terrier/root-password/password/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From 8ce36b5f05e822fbedecb259c5a3bd0a3d068ce9 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 16:40:22 +0200 Subject: [PATCH 06/39] Update vars via generator state-version for machine terrier --- vars/per-machine/terrier/state-version/version/value | 1 + 1 file changed, 1 insertion(+) create mode 100644 vars/per-machine/terrier/state-version/version/value diff --git a/vars/per-machine/terrier/state-version/version/value b/vars/per-machine/terrier/state-version/version/value new file mode 100644 index 0000000..5d54076 --- /dev/null +++ b/vars/per-machine/terrier/state-version/version/value @@ -0,0 +1 @@ +25.05 \ No newline at end of file From 7196abe544e67a99eafe04a2ba086955d6468698 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 16:40:36 +0200 Subject: [PATCH 07/39] Update vars via generator tor_tor for machine terrier --- .../terrier/tor_tor/hostname/machines/terrier | 1 + .../terrier/tor_tor/hostname/secret | 19 +++++++++++++++++++ .../terrier/tor_tor/hostname/users/pedro | 1 + .../hs_ed25519_secret_key/machines/terrier | 1 + .../tor_tor/hs_ed25519_secret_key/secret | 19 +++++++++++++++++++ .../tor_tor/hs_ed25519_secret_key/users/pedro | 1 + 6 files changed, 42 insertions(+) create mode 120000 vars/per-machine/terrier/tor_tor/hostname/machines/terrier create mode 100644 vars/per-machine/terrier/tor_tor/hostname/secret create mode 120000 vars/per-machine/terrier/tor_tor/hostname/users/pedro create mode 120000 vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/machines/terrier create mode 100644 vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/secret create mode 120000 vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/users/pedro diff --git a/vars/per-machine/terrier/tor_tor/hostname/machines/terrier b/vars/per-machine/terrier/tor_tor/hostname/machines/terrier new file mode 120000 index 0000000..58c49a5 --- /dev/null +++ b/vars/per-machine/terrier/tor_tor/hostname/machines/terrier @@ -0,0 +1 @@ +../../../../../../sops/machines/terrier \ No newline at end of file diff --git a/vars/per-machine/terrier/tor_tor/hostname/secret b/vars/per-machine/terrier/tor_tor/hostname/secret new file mode 100644 index 0000000..8f679f5 --- /dev/null +++ b/vars/per-machine/terrier/tor_tor/hostname/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:MuMj6+fa5l4Xgm31vnMfdUe8gajyzPKxHc8Suii3joByFYGDt3FOjVhEsVPFNfnV16kgcLEK5S9ualQ9aWEe,iv:Ifq59WbJjaQ9ckoy8/v5JamP/ZAunVV0hlctOq95wZs=,tag:f9TVwB+M9zheoEYleAuaHg==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnckNnTGRVQzNaYjNCamlP\ndDNQSDFSRFRMZWlMSHFiczRXQUNzM2tuWUYwCldzQ284RFFkWE1oeWV6Y2UxVjBr\ndzgvR2dveWVvZ0dLamJ0Y3FzbURpR3cKLS0tIDVQVHUvQ1pjbEkvNHhjdHhqQXUv\nKzdPOW1Vby9hem0rZ2E5S3ZhcWQwdkEKPMgF48MnCnxgBWiiEizZPZFSB33FS3Zi\nlFfoP8IbK0h5qlrMvfgboT3gS+sN+MBw20PY2/YDZAkROgnEeduMCw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5d2I5SjcwWTZNbGEyZXNs\nem1jWTBTcFdRRXNtZG5QRFk3dHJ4VG5DYkFjCjZQZitLekF2RTk2bEVldWpNTThJ\ndGZtbUtmMitLUHl3eEttVDJhV1hUdU0KLS0tIDlsVm5tZ2tZeVdWaEJGZWpxYlRt\nbUF6RkNQLzNMSVVnSmxCU3FESFprbFkKrj0uvf4STPdWZ5ZaTeP6bdfHM/ethi1Y\n9JaII07nnOaBSA1UgcQRkICETXEAk2FLdbwSX9j/Haft20Os59z2sA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:40:36Z", + "mac": "ENC[AES256_GCM,data:4EIag/ZWLndOX5q8KoV9yInfisrmWFJ0IqkfI6Cs+M94FvpIG7vSm9ThtdPg3J+Z8LAcRCQL0D268sIb636YAZzBMAJLxa2sUG2YbSMPS8xca1sjC5POjFRQ4FNLHAiHFWeqvtPboeH0G8RRfCOtsdfJrme5qbwCG304lg8ETCQ=,iv:geVB1XuOrqYVuwIdPtifLo/Bc4piBd8R1Xa7MIfHTbI=,tag:lRkUmNM9iNXybT0xkQ9YwQ==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/terrier/tor_tor/hostname/users/pedro b/vars/per-machine/terrier/tor_tor/hostname/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/terrier/tor_tor/hostname/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/machines/terrier b/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/machines/terrier new file mode 120000 index 0000000..58c49a5 --- /dev/null +++ b/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/machines/terrier @@ -0,0 +1 @@ +../../../../../../sops/machines/terrier \ No newline at end of file diff --git a/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/secret b/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/secret new file mode 100644 index 0000000..1d4196f --- /dev/null +++ b/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:PZJsSoXBSIUQJG2THAAWWrLOYln3IuPnnvRvRmvYoqAEo07EPuDtTM9coQFVnYm/LZrpn9Jatgkup6hEggmHBoESmKPHO6zYmA0zcnwg60wN7DhIHzwxPZWGqifAQXYD,iv:2NTBZRJ3wLfL4+Bh7TTniq04FpVu/8dh68+11rPR/dk=,tag:O6G769WqJuYKbNoTuHj0KA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKRG1HakV4QXhOOXg1SWpP\nTU9pMGRFaS9JN3ROTmNvOUpsWjZXdkVHQkhFCi90SCtBWmxYeERZaFFMMWJzUFo4\nV0NsaEM4cHdCdW9VR0NMTE01WWxDSGcKLS0tIDA1Z3BkcjJFSFpSNUdNb2ptVGJ6\naisySTBuVWpyOGJHY1VWdWNUVGcxNEkKZKCA+l5lrndXb9TwkAGc2+t+UZB4SNT4\ncvpmVx9aoiwtfswB/orh8pA47mTKVR4xadNvTSv9LgPcbj7PtZsEXA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSQ3dWUWc1d0xHdWcvQ0Vi\nTldhTWUrbCsxTzhVblBBL2VrQXd3bzlsdUdVCisyM0NrZWFrRkFBb1B5bEZiZ290\nQ0wzM0xCRmdxcTVlbHVxM01OcExMNzQKLS0tIDJqZ3M3Z1JmeXhBK043RlFxRms3\nWURQMUtrbHpTK3ZDWnBRZlhYenI5bjAK6rzXM9Kx2R7oBd4Ht8/pZp7fbMl0oNi4\n4ZvywW0vRr6emWcqBrsxJuM7c3utNkOHRVrGc93seNW7UNimXdEIGg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:40:36Z", + "mac": "ENC[AES256_GCM,data:ZE0xcX7IyFNhcnDBMANRvu3zG984iSyfg52mfiOCOFxGby6/vzKKF/q7GFcm3IlRhHvdHbYq9mqKiz0Tb/z+4FtziWjmpd/Os+bwxSvWU9RhV3HkJ/zYACEjVxe3t9QYPRHzg+5MSHsofuruxA03svrIp9JI6eFyOA6yngQhF/s=,iv:DTAWGNraQFl8EWiNB6yEzqJjEw1dLOCtEIUWiN8OwMo=,tag:safKEnj2/TfZbUdmItUKXA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/users/pedro b/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From 34700373746bdced3f397a0d30259b558dfa5e3a Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 16:40:44 +0200 Subject: [PATCH 08/39] Update vars via generator user-password-pedro for machine terrier --- .../user-password-hash/machines/terrier | 1 + .../user-password-hash/secret | 19 +++++++++++++++++++ .../user-password-hash/users/pedro | 1 + .../user-password-pedro/user-password/secret | 15 +++++++++++++++ .../user-password/users/pedro | 1 + 5 files changed, 37 insertions(+) create mode 120000 vars/per-machine/terrier/user-password-pedro/user-password-hash/machines/terrier create mode 100644 vars/per-machine/terrier/user-password-pedro/user-password-hash/secret create mode 120000 vars/per-machine/terrier/user-password-pedro/user-password-hash/users/pedro create mode 100644 vars/per-machine/terrier/user-password-pedro/user-password/secret create mode 120000 vars/per-machine/terrier/user-password-pedro/user-password/users/pedro diff --git a/vars/per-machine/terrier/user-password-pedro/user-password-hash/machines/terrier b/vars/per-machine/terrier/user-password-pedro/user-password-hash/machines/terrier new file mode 120000 index 0000000..58c49a5 --- /dev/null +++ b/vars/per-machine/terrier/user-password-pedro/user-password-hash/machines/terrier @@ -0,0 +1 @@ +../../../../../../sops/machines/terrier \ No newline at end of file diff --git a/vars/per-machine/terrier/user-password-pedro/user-password-hash/secret b/vars/per-machine/terrier/user-password-pedro/user-password-hash/secret new file mode 100644 index 0000000..a58af13 --- /dev/null +++ b/vars/per-machine/terrier/user-password-pedro/user-password-hash/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:/KcnApTQ5uJL/B3zutzZrnaYLj0p0GG95TPOedE+ygDKNz8K+ZVx2+Ff8ot7ZndU2H44brXVJxiKMzJd1PxVbsMcmPSSPjA7jt852XA9g4KOed31oN66PoqBcGwCPNwn/tPmk2L/qJ7nUQ==,iv:EXGc4SDh/yu6XsntGyljjGHQzmB6cVUqEYd9/ulwzwk=,tag:nCikdporPCoJ2voKRo5GOw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRZWdNcDhoczZlTytMWXhH\nb0NNRDh2LzF2MVdKeUlLUmI0SzhvZGxMbkdnCmpZOCs2ZkZqRGE0UjhmQlFUT0ty\naDlCaC9ZdFJUZjdwMEpjeWZhUFkwSVEKLS0tIE9ENmtJSHJSUW84WTVQcUJZYi9a\nSFBvbUJNVU9YbG9IWXgzek4rQ1ZDNlEKBfDztB78JmPDL84X3NvNVcWJaaneOslR\nvG1eA0urmlPYqzrgABqml4H8DlIkWyTOCETNXVrDnr0Pit9f144Nuw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUdEY2TVRZWUpKMkNRaVpH\na1l1TW5PTm5HbW15RkhwN1MvWEFFVFIyQlZjCkIwdFo3bjRiK1BBY3JXWWwrOTho\nNEQwMEVkZ05WVmQyMzhLSDRzd3JHaUUKLS0tIFZMRmIyUlpkVlBoZGZXamIyNlRK\nQTBvUkFwa1JiTFhBRERiM21lNVJHazgKk/7tQ+ixMM7pLOG/b9sm+EVII5AD/28y\nUAD3Scq2KYz1eQD0+PD7sjQNiONw8FlCzSZ759voL5bg6XOfetOO2A==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:40:44Z", + "mac": "ENC[AES256_GCM,data:eH6QjqZxQ+FXxP6Otf44fbm9/T8v8/pwBUf5FMKIHDPLCvXBMJqV6oIaIyRHv+3bT7Tt+yrwwPE9s/E+ZiNZbEdq2MzUKX75fsfbBCl/yEx5lSd2P4wjkRpzmhrP0NnXWMMtlzWaIQXU+6q3a9KEcM5BjFSE6qBzZ/8En+bv0hI=,iv:7wGc0poaXPHR5igXARnsb0el8ctjK9Owhb3QkINaBMI=,tag:YcB4S8qxdYtqy+IIPAqqcw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/terrier/user-password-pedro/user-password-hash/users/pedro b/vars/per-machine/terrier/user-password-pedro/user-password-hash/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/terrier/user-password-pedro/user-password-hash/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/terrier/user-password-pedro/user-password/secret b/vars/per-machine/terrier/user-password-pedro/user-password/secret new file mode 100644 index 0000000..61335a1 --- /dev/null +++ b/vars/per-machine/terrier/user-password-pedro/user-password/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:ph8XYjAfpG5z3614DA==,iv:9SUnlpVIosWig7kKLCyZp/F2s9mO2bhu/q+WuKaTPZg=,tag:nBNDbUZaocvt2pXmahXt8w==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBENk9RVkYydm9tTTRURWJw\nWkdHQUI5WW8vVFhNNW52QlBoNzljQzA1RVRvCnhnZ2JUbGhITW9GODdqYkNCM0V2\nanFnRmhmTE9YZVhzdnNiSTNlL0VWNHMKLS0tIHZndElXNmJ5MkRxeTJ5SlZ6M2Zt\nYVUyc1A2Y2R6TEJLbHExbDB2TVNsdGsKSbyFIBbTpoZ4hZKjiK7KDB9oB7mOiaYN\n3uhwYXg7gmYzHXQNuZu75uKM1MWxKzqHSVuiDvkwiDkKFqFSDWBb/w==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T14:40:43Z", + "mac": "ENC[AES256_GCM,data:hB+5IHAbNz3Uvz0XPIWEi8Od7BgQ5hJyuE28XUc/26Ae/bLR1n9Bv4dzxzpt4yDaUqoJPX9M/D400hVixPiN8gfvW24Rr8YXKHWepkrjDTdIfpX6Tvpax4nY01LUkvjhn84EzV5oAGKon0CJL+yC9ETcRvVbeQKA+Fd/3FVZveQ=,iv:7vHjIt8PEYFf9346tdF1ltzuAsuy5WGsFpT2+DIZdXY=,tag:B3FV8hMtvFpjFbsG8H6TaA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/terrier/user-password-pedro/user-password/users/pedro b/vars/per-machine/terrier/user-password-pedro/user-password/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/terrier/user-password-pedro/user-password/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From 1957853dfd7559dfebe48c1e028983827bbc27df Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 18:07:11 +0200 Subject: [PATCH 09/39] Add key(s) for user pedro to secrets --- sops/secrets/aresix-age.key/secret | 6 +++++- sops/secrets/frues-pc-age.key/secret | 6 +++++- sops/secrets/terrier-age.key/secret | 6 +++++- sops/secrets/tg-ha-door-creds/secret | 8 ++++++-- sops/users/pedro/key.json | 4 ++++ vars/per-machine/aresix/duckdns/token/secret | 8 ++++++-- vars/per-machine/aresix/mycelium/key/secret | 8 ++++++-- vars/per-machine/aresix/openssh/ssh.id_ed25519/secret | 8 ++++++-- .../per-machine/aresix/root-password/password-hash/secret | 8 ++++++-- vars/per-machine/aresix/root-password/password/secret | 6 +++++- .../per-machine/aresix/tg-ha-door/credentials-file/secret | 8 ++++++-- vars/per-machine/aresix/tor_tor/hostname/secret | 8 ++++++-- .../aresix/tor_tor/hs_ed25519_secret_key/secret | 8 ++++++-- .../aresix/user-password-pedro/user-password-hash/secret | 8 ++++++-- .../aresix/user-password-pedro/user-password/secret | 6 +++++- .../aresix/wg-access-server/secrets-file/secret | 8 ++++++-- vars/per-machine/frues-pc/mycelium/key/secret | 8 ++++++-- vars/per-machine/frues-pc/openssh/ssh.id_ed25519/secret | 8 ++++++-- .../frues-pc/root-password/password-hash/secret | 8 ++++++-- vars/per-machine/frues-pc/root-password/password/secret | 6 +++++- vars/per-machine/frues-pc/tor_tor/hostname/secret | 8 ++++++-- .../frues-pc/tor_tor/hs_ed25519_secret_key/secret | 8 ++++++-- .../user-password-pedro/user-password-hash/secret | 8 ++++++-- .../frues-pc/user-password-pedro/user-password/secret | 6 +++++- vars/per-machine/terrier/mycelium/key/secret | 8 ++++++-- vars/per-machine/terrier/openssh/ssh.id_ed25519/secret | 8 ++++++-- .../terrier/root-password/password-hash/secret | 8 ++++++-- vars/per-machine/terrier/root-password/password/secret | 6 +++++- vars/per-machine/terrier/tor_tor/hostname/secret | 8 ++++++-- .../terrier/tor_tor/hs_ed25519_secret_key/secret | 8 ++++++-- .../terrier/user-password-pedro/user-password-hash/secret | 8 ++++++-- .../terrier/user-password-pedro/user-password/secret | 6 +++++- 32 files changed, 181 insertions(+), 53 deletions(-) diff --git a/sops/secrets/aresix-age.key/secret b/sops/secrets/aresix-age.key/secret index fb68779..e3b329c 100644 --- a/sops/secrets/aresix-age.key/secret +++ b/sops/secrets/aresix-age.key/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:Y+D/ZjlWIOweRe6eE41khoEEQNnkhTpJynWKVFM+Rg0aUA3jP4hlxM4RzHk/19dpc0hNFdAAJo0oA/8oabzlSbIt/CxL5Q/cqQ4=,iv:rChEsd3kYIduVK9qQPDO4k4JARqx82u+TXvhCNC7cf8=,tag:icnI+BXH3GD3Hph43+Hmmg==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHbmhvdWZpNmRYb1BRMUtS\nT2Qya2p0elI2ais5ZHlHeDdTekU3R0Q2VFc0CnExRGVtTHRNM2lnN0tEWjM4UDVR\nSitqZTFoZms3RU1lRFUvM0NuajUyUHcKLS0tIFhIYlAzaW1EdkN3SUh0R3JtNVNx\nYkx5TWNlR1R3cXJBSHF1LzVISnhCUzQKZxY328XFJX4UXMEmIm19cx/W9+NrZqpe\nB+tHQtHf83u3aatNX1Lv0cdXWzKeHCH0a3UIZbi1PrcuMe1j3J3tTg==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlaWsralc5OGlmVkFkMlNR\nR2NQWE1OMUNFeFVBVTluWUZUVUZWb3BGdjF3CkpNUGgwS1pnYmc1bWdyUGRybFky\nWXN2b2JIZjFqd01LTnZzamVwbnZMZGcKLS0tIFFTZ3JHSmNab1pmOTJ5T01BeUd3\nRjhXMWlJdkxqb1VyY3BnRTN1WnBxSlUKhh7dRPOK5D0JPjo+7cZbR6t2NSxYo9y2\nQzzVgLh07eCYUkRAEsViRIWwAEIOfXnUzHpK/F+Xc967wapTbxMTPw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKeHJpaDIvZ0NqbkI5Wjd2\nd0VBY2xtTStNSk14ZXlzWnhENXJOZEtLWVZVClR3TXRJeVNHeVRrWmIweUEzaWFL\nbnVjVjdqT0dYVTMxbmViMUtCeGV1RmMKLS0tIFB5Z3BKR25mTkZ2Z21JUUt5T1Jr\ncmQyOUVLTGo3MWY2UThsRUdlbGJwSEkKg7jVrLG4l1Mv9yvVZrvSC1RWptmGaypw\njnPlitDkj9jayP0mG6fp8hgoOY+SYsAe1drm4a5mRcCbnsOfvPajdA==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-08T22:49:28Z", diff --git a/sops/secrets/frues-pc-age.key/secret b/sops/secrets/frues-pc-age.key/secret index ea4cb6c..9377142 100644 --- a/sops/secrets/frues-pc-age.key/secret +++ b/sops/secrets/frues-pc-age.key/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:7pxRNQjp6jXyY6RDKkfRfv7cQKJ84pdXRbey5R0wurFO1i+P4/WRyHVut+wfGGpTU4kStyFbHB+gNxDGJjzI5JvrPtPWL/n0bRs=,iv:E+vqL4Ctdb492/MXJHzGWGtk/aiH/JQcfBWfK6dZ/+w=,tag:tnlnidyHrcYc9rXPcknC0g==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDaTRhUllSZlE0aTdvN3lX\nYVg5TlRmN2R2UUkwcVhwd2hRc251N2xRWmc4ClkvUVpoeXVLQkRmUEMvVVp4cHVR\nazd1U0lWM1M0M0lIcEZ0ZVhYNTF2dk0KLS0tIGh2dit2RnltdnpuM0hnSEJscEFt\nRzVGdUd6YWZmblZZd2tqcW8zVThPdE0KIuWMy7qLADRePIYOzOD7C2jvA90kTzXh\n+jFaYj93EsQohQRnDac0eHiyQfAKaJb3Ing8mxV5KyV8NajnHsn8FA==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsa01maDI4VkJpd05XZi8x\nQ04wSHVzRk9XSUdZanUrVGtmZHFIbWhoWGswCkRESUt5Yk9sc1lRYXV4WUhzQmtN\nc2Ixa3lFd0FxZmdqeVY3K0E2S01IajQKLS0tIERQSkh3cElnTTMzUms4cXUySjcz\nYmhwTlNFeithTm5ZditDR1hRcGNrK2MKgkaGRaw7g0KlBWt1MSTN5CGl8FSDy6QF\n3vjoWLCVk3flO0EukXb9WPxSyauGl4pPHqhlh+GWcHopQ/GLctaPQw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEbTFGUGRsSkc1VmM4WTN0\nS281dVhMdmJYVEJZMlZ6Z3FQaG1FN0FhdnljCkhiaWxRdm03TkRJNC8yUUcrUGNT\nY2E0T01ML0VnV3dTcVZxNTc3UDYyK1UKLS0tIFE2T0RrVk12U1o1dEZNSThjYWR1\nOEpNOGJOTkRZSVlVVjZSWnB6L3ZUL3cKp7Ex7ygGlD7M5rYcXywbPILzthq1QGOw\nITCcnws0eGxto2cPDNoueb30MotgWE35Uo99vWELlFN7SeSG1vnMag==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-30T10:56:00Z", diff --git a/sops/secrets/terrier-age.key/secret b/sops/secrets/terrier-age.key/secret index 9d09527..076fdae 100644 --- a/sops/secrets/terrier-age.key/secret +++ b/sops/secrets/terrier-age.key/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:GLRUhNPwYU6qV/sQaXfEV02dyB0rUjA1gAQtXrqYsrUspSipYQhWyORSMtOp8IAzYxjIIvY4VIGhY7g7HRi40j1yTMj8w5j4bJ4=,iv:1tfgv3ioEpyuJfjqLksLv4C07krff+jOvA+npMeDg/0=,tag:lLlrEz6XXQxuFbXSyY+WLw==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4UklMRGp4N3M4L1U5dDh4\nMTErekVGcm9iVmdCa1ViK1NKQVF4Sy9hVERZCnFpVi9rTXJrU2FBR0U2REI0cHVR\nY3ZkbTFCUE5UTkRBY3ZxSzNzWk1oOFkKLS0tIFU1VmVYZSs1V0g2NThxQ3RCbEV6\nMzEyMUVPd05tMVZDcXEwbDJWNGV0dE0KmqdUgHyd8A6bcNiaUQaaeRaZCMp+PDLn\n5bNh9WjaYrUamN3WUG6Z+kdvcjAp0w/RfVI6PKd3MFx1vDoHWWroZw==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRWWU3aUpzcDdjUUhSbjZo\nUklLdzVDdFdLVitRM09qT2ZHTi9icE5WalRRCld2U0haYTVhZXp6TUNpdmVxUGMz\nSmpHNWNkdVIzNFVHcDdFckxpQW5wZjgKLS0tIHQ1UlVhL2E2cTFZZ1d0Nm15dWxa\nNjZjTTl3d3laS2p6TlpZR0JSVW1NSm8KplXQUxhs2SJRrZRcUGEDCIVm5VZLbJO3\nEHkH13E1iG3Ks1WbgEG6q02lx9PqpGqUEudEK+YiGX/9m0aJPDIrVQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnWFU0SmNzcTlBTjZDcXdD\nbTkrSHY5ZnYwSms5SXlMT1JtUGlTSWhRajNRCmppemh3Ty9aeVBUYnF6ZjlBQXRP\nTmdWcDkzVkxDaVFHeHlieEFzdWFUNFEKLS0tIENUQkF1dldZNGRZRFpuSEVyMkhq\naGNaQTVUVTFFcGlreExGV1hOM0FVWUkKGXLI7Hp9WUpfBeXVtA9lnveG8BnHZsV/\nUVBunkvfcInVVcTaNc8Poj7+zYcFlG7LVFoho1+lIexkiMCGF7/CMg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:39:39Z", diff --git a/sops/secrets/tg-ha-door-creds/secret b/sops/secrets/tg-ha-door-creds/secret index 1707f80..ca62580 100644 --- a/sops/secrets/tg-ha-door-creds/secret +++ b/sops/secrets/tg-ha-door-creds/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:nF3dqb+z1CU/RWaAZmBQItOp2fQrMGDf3qjyvVnC73ERFHGLdeO6L0rI5IT81h7QGbjPf15rXX5TlNRhafAlorH7H5ZWRZgmCkFyOr2Imf4rvBu3Cp9pi5ioe3lv4omZn0puXu1vgsh/k/JLxQl1QjRhVFcBFE6TPs7bi8+AzIlSUfhfUb8ZHzyN/dr5DaxsLXaFsvnjWWUSTLiqujRMzIp/R5w32bvUDvquTsDLE2Pb9VCcwMTxw2+uWem9mA47HUTLpPjks4X1Zghx8LcD8qLfOfmpeZBqESHjFh+iBE9CsOvhpjL8H5hLePmrbYlIIImSVX1dJrbiFRZ7GZZOdKg=,iv:Mp4u/LiIhFm3AXzGL8/l4iUsvslukywG9UyO5gfl8zs=,tag:j4nQ/lJUd0CYFssl5UK2/Q==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLbmJLZ1BkSmo3N1pJMHla\nbGErYVI3UmtNRnB6WUhzNzdlQ0R3bkVlOFNFCjVxVm5wWGlhZXlTbytpZ2dMTlk0\ndU1mYndVODBXUXBjSlVIV2NQcm94a0kKLS0tIHIzdTdnTXJhaU5Nemx1b05wM0tL\ndW9EYjVJRjc3OERxM1BOajhwOHR2Y3MK3uFvDVyA88lqV7pF/X1MXJY+Ghwa4cy5\nKXHT3KHFq6etDOgGz3P4UK2ZOoB0EEjXG6VlWNFSLzcTXSg9keTenw==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXMnVmdGU2RWUra3RvMjQx\nNzFVV1MrUkV5QWZTSFZKZDg1N1VsbVhpcVUwClgwdWdqdklnZUQ5RWJUTHRmMktz\nNVVNaUN5cjQ5cXFpc0syTTEveHF1MlEKLS0tIGVWZGNOQ010ekQyS2Mvck1pVEsv\nNjlBOWtpUnd0eE9pZEczSTlMVDNXS0UKVy8fRJjx1pbDrE4UWDC3ToE7mlRGPX6x\nklEE0V0vNF9K4VTMOPsmX5+kFeJ6BzuZ8sDcEbhrgPJiOq1iB1Jq6Q==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCa0JFbkRVSysrQS8yeUR0\nWkMzQ3pTc2g2QnJ0b2RxSkExZWE4L1lTWUVNCmVLbHFDMTV6RmxQK245cWpIRmtp\nd3ovdU5VNjgwSHljVGozYXpkcmxKMGMKLS0tIFEvQUlkRXk4ay9reEhzOHpKdVhG\nNE9BUUZGdU83Um13VDRnWTBrSTM0L0kKd69Sq5LBn5hhiDAurTqD1JO7wCE2MQAc\nFPHljQR5ZA23pj1HipoKhpqhmPH3oph4tdq4y6sS18FiVhWrLXKRZQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSdkl1K0ZxOXdVYVR1cmNh\neUI2MS9DVUZqdWI4dFFEZ3MybTZ3MTB5RzFjCkhMRDRxWjNFYks3K1ZRQWlpY2FD\nRnExUmNpZEE0WnpPbGhENXlQeGxXaFEKLS0tIHIvdDZvM2NwL2hIT2xqOUJKd09j\nS1ZXOTRnbjkzUUlaQk9nRFYwV0pjVncK3dDkECQGlQKzv8Vhzb0LGy2qDWvTKCrf\nECYs9phEeqY9idfilt6LxkZvPo78To154X11ai9ikizLKO/q5EeWhg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6ZFFNc1poZWlySys3eWk3\nTVdrUDdIWWdqWlk5QUNYM2duQml3ckpmZFZjCk1Ub1E5QlNIRnBTYWQ2RDYzTk14\nZ05QcUlUVW4zYWtmQnpLRUl2aldTdHMKLS0tIDRqaTNQYXJNTVJTQmJaQzRuOUYz\nekxSYTVnL2p4T2t5cHpmZmtndlp4UWsKmvW9tdHmJHP5z6GdbPJHEB783tnhDjBj\nHX++h/r+8bYvsnsVmRpvgV81NZb4NPbXcVSaT6YgHM+t/k3VludIMg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-14T13:07:05Z", diff --git a/sops/users/pedro/key.json b/sops/users/pedro/key.json index 8da0294..a57d5c9 100755 --- a/sops/users/pedro/key.json +++ b/sops/users/pedro/key.json @@ -1,4 +1,8 @@ [ + { + "publickey": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "type": "age" + }, { "publickey": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", "type": "age" diff --git a/vars/per-machine/aresix/duckdns/token/secret b/vars/per-machine/aresix/duckdns/token/secret index 52ee983..d9386cd 100644 --- a/vars/per-machine/aresix/duckdns/token/secret +++ b/vars/per-machine/aresix/duckdns/token/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:W51pdNRamnw8GPmvaXBc4Usn2sNibH9HvgheWcdf8vs/fMhE,iv:aiVHhLbe7zVgKhg7xzE5qEHlD8NVc18aHHzd/NrzAK0=,tag:8z7ICtg8vhXk3454tVKT8g==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTVnpnR3RYZExldWl0ZkEz\nenBKTTdqNDNPT0l6cG1aTW9vczU3aTBsSlZ3CitIRjJVdWxiT20yUWROYUswYk8v\nZExZdU5TTCtmODFEbWc3SFRtcVQwNXcKLS0tIDU2dWQ3WG1YVitMRW9XTG8yRk5F\nYUh2NWhIYU5BZ2NmdVA3L0dMTGxOcXMK0rpSSXvnVtehD0zdvzeS3b1mnSIMhaQv\nGe0IpOT5zDCKkCd/iUAYrb1hwjVDxYkxYlketzLtSy+WGvfqold1jw==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTSEJNTUMveEFkOHJGRGhJ\naUFrTmRHTFFsM1ljUmljcW53amU4Ymc3cEU0CktLNG9WRUVORkF6RDVyOWoxbkE5\nbHd2c2IybVgxNDBKa2hPcWN5K1M5MmcKLS0tIDVBUVdWTncva3VVOFNFZ3hPWkpK\nUllSM3FtRisrUFMxRFd1M0s3Sm9ORm8K5ktz+YLzsOj63lP1KWyqa6EiFLfm3miz\naib7kPYuXZ3theWsEw8hc0VzbAJurzrb9vryhQCAxuv5tobQoi5MnQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHMnlCZEVxa0F2ckZlMStn\nTWVtbkVncUwxQVFtTXhKaUxHMnJRTkRKZW5VCkFHRlV4UzJpVnZWNE1GV3UwV2R1\neUMrTm9pQ2UxeU56M2NUbWlTNFpyQmMKLS0tIEJtdk1keE5JKzNYenpzb2pFWXhk\nWmI0anROWEtHRjZjSXkxc1ZIaG5pYW8Kbb5DaABXMa9AsvltqwSp4+XIhL0tvVTQ\nZq6XTGHGXV/xCywF7+BENskm8gwOYMeL+7xoXHkqpLvPWDN19i6AhQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1Zk96SnVZcXJPZkJwa0xV\nWkNGckt5RDB2RDNsNVI4MFNwRndWRXJvcFFJCmo1dllOWnhhSTNWUkkxMWhPVFRp\nazJuMHREbGFoVG0vSm1qZytEQWh4dFEKLS0tIGJWNjBTTE94cGV1M0Z6dXEvYjNV\nK08wd3JDS0VpbnpqVWRhODhENWdpVk0KYScevJZLmnQq3aj5Swh/b5saxMVuOS97\nff7KJkJc9eDTHCDNUz9dZUmtAJrlQ3Vxcjr/fNHKkbpIRX8henlgfw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaSHQ0N0Fzcm5GU1BZUGZz\nN2FKWVNMcVR1MlBlTTFmbDkvZDVwY0hDSWtRCkNlSHBpSkIxTHF4NDM1enduK25n\ncGJjbElqZGZNZFlqT3o1aDJqNGsxcFkKLS0tIDMwbXkyV2hSM1B4TmkyNHI5aTEw\nbjVpRmlHeGRuK1haeko3djI3aVZsdVkKgCCrDxAsglkj4gu9eOlkSXCvfGS7baPu\nRGm41+6dE9Ckrj/clPbf761rEM3GSPUZqYl16n+vqFdX8PG03f5++Q==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-21T11:15:34Z", diff --git a/vars/per-machine/aresix/mycelium/key/secret b/vars/per-machine/aresix/mycelium/key/secret index 2dcf5e2..b49c9f4 100644 --- a/vars/per-machine/aresix/mycelium/key/secret +++ b/vars/per-machine/aresix/mycelium/key/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:PCTNnzxIB/ShPbK2g0wjJj4qIvsVK5UkTsG5RnepvTQ=,iv:f/EseTuoZr8c/x2lpT+gu/MMuPvNXK8UVVQdjHWas3Y=,tag:wwfpNyiUpvWi6htcbDXTvA==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhVDFhN2FURGYxMkw1RFg0\na3EzM1oyeHZrSzdTY0RsUDVvNTdNL0V5bVhrClIzVzhlUFgzVCtPdHhsZ3lWRG56\ncjVhc3d0a2t1U29na0poamczVUNXNVkKLS0tIE1lb0ZZN0F0OWV0MlBHNlFrYzhn\nanJESkVTZUloc0hnbnRYRVBmNFU0Z28KKbTdozjvQVkjVhPxYQjhUoDEgzBUsswE\ns1SzJ5SJf3lhai1ggJPnwbsXWBCLB8sgep/6cBBIED/UHJGndaEFoQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEZmh2czY2MWR2aTJ4NVAx\na0wvQ3Aydm9JMkpRYjk5WE1COE01MkxEaUFBClRxa3RtcTJPbm9kR2ZJems2Znh5\nT2RhaldCRjR0YTJ1dC9oZXRWazlyZUkKLS0tIDBKY0VycW9EYWUyR0szU0dLeUVm\nMVhDOUdSdFN4VCtrMDduOTR3bkd1Mk0KFrpuzMcUYdhezacHJo7oV7tXcOfu5Ejc\n0nMkAFwfscKF5nCLw0SEX+yNayYZnv44oWxQetsEGywivJcyDe4N/w==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzckRmdEZVeUlFdkdWTUZB\nNVFLbEJKcTQzZ2tEZmxqUTNvcEM2cklCUGpZCmZQQnhnWlBSV1VRVnhQdnRkWGlh\nYUI4Y1h5ZitRNDdIMDRwSWNrdXYwQmsKLS0tIHhmd1NvL2paUU9WMDlvZUdjOVBn\nMXZVUFFWVXhTdmxNVy84UlcrNGpVRVUK7bmyVHleAYWg+vtWB5dfUbS9IMLWgOPv\nZgTjauyYSkh2u29DXVvC3+VrsD0Fjd9bILwvC3E67NJGYWK5w2ZaLQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYT1B5VWkyNWUvZ2cwNXE5\nZXRoQXZnWUpXZlorcktzelpNTHBhY3VEVHk0CnI4bXFiUFp2VmlFSGtidVZleWlM\nT0VScENzRk5oOE5oMXdwS3lOekJoUWcKLS0tIFpJc0pzWi9IZ1g5SU04RGhQekJ5\nOHdaQWV1YVpOcklHT3lhbVVBZlJVMHMKiAukZfGyl/F2JL9CohIbdfZrb6OSRcHt\n/AeO8s9ETdgWO4nI4q8gnoxD8AG/Ayv3lRjHcc/pYCLyVWTbT4TK0w==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxZ1dYZkNHc2owUUluanY3\nNmdDcCt1emxsaDFnK1BsbktWY0w1bFRBd21JCncyMU10d2NLdFF2elZ2WGVmSmNK\nZUd2OGNvUDZKeXFVclE5TW5HVUtNNGcKLS0tIHFMZy9xOWZtS0YyQmVmNkRsbHBa\ndVlsdzZnazlWQ2RON3FPSU53cWtOTEEKGvrEGcSs/o6++YfXRdwP0oonnWXRIUYe\ntUMhQSrM/P4ejdJR0J2I7sOJtPRqSFNsoo+SM9Oq5u4UfxTeRYV3/Q==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-08T22:49:46Z", diff --git a/vars/per-machine/aresix/openssh/ssh.id_ed25519/secret b/vars/per-machine/aresix/openssh/ssh.id_ed25519/secret index 5677f9d..a1f0cfc 100644 --- a/vars/per-machine/aresix/openssh/ssh.id_ed25519/secret +++ b/vars/per-machine/aresix/openssh/ssh.id_ed25519/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:60/tgOL8YHAoqBTnXSBniqrBSWKMOvrK31BJwf7bJtZJTiz1trx/GxKwns2v9TJrHSyZTvpGTHS+lwaZu31dxwnTsQXVvwsYo3sH5sPBAc0Q/SbckeNjRIKmLLqmqXU6AzhcNlOHXCTVhr+KimoM+8T06ETrgPqU554SK8Up7CTxjlhREjg4Zlr4JlLCjU/A5hPiDeMbk+MB2n1WKIZLZpw93eHBFyDnqOTxjJlIUX7SQvUIGisnmqHwkyHcCXcZa7fu848uPDlZRiyaR4892MfeJ7yaOF+F35YKjfXW7YvhrUVGGdnmf3fvooRBD8vewfpmQefuCDxKQJS04uiWXpFd3pQRrTtFc10yva4ZPUb8tFV0DTV4t1gPuHl8jesfUpsXNU5DRa9NrYhbOaDtKhBl4UHsULjWcesGxIqh+t+RrRla1cEYIF2sjy1pxBSTWMqn+bvw4k6h8jN6mmx220MfHH2Ej9ULt7qIJJIuN+Runns5fw8kXV8v5cKNQNzCGvhS,iv:i6OnF43gZvJzuGcUt5R1HOTP53Q/8G/MXI/++Jwk5EI=,tag:8RwwJ6x2QSZ0Dpwa1abAfw==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvaThBbjVyZXlhY294THcz\neVlsMTZ4S1l4LzF2elVUdEp2RDdhaWEzZWxNCk14RklxcTJPbWJhWGZkbWcvRWxi\nTEZlWWZTUmdoU0xjY0Vrb29WZXE2NzQKLS0tIFloWVhla2RzYUkxdHhIS2d3UXVR\nREkvMXd1aWJKZjNHVEtkOW1waUJ1ZjQKIc4y0Ib9r3ad7J8Dk9wKejZ6sTswu8EO\nlL/+MPlBEQHsxNKyvMz1stOXYQPypG+jqdn0BKyo49fFnslUxKcJ6w==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4NzV5QXJDa0ZEandRZWV3\nQnJrZ0VOT1hicndZS3l5SGtVOEI4N1dNUFgwClR3SHRQN2JiRWM3V2xwbi9SMFNS\nNzA1eExuY3MvcGFFQ2MvQTMyU2RBTzAKLS0tIFl4bDR4Vitma1NnWnFIZW9hZnpO\nMU0ybElaejZBMFFCVkwvUk9xbWtkTGsKIki92LrbgZxitjOQ0fXxgDvD/xlzjB2f\nLiGCHARnGMv506KxAahJyNaWvAbjUnwJxwPN6FofrqrcxcsZRagcxg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmN1Jud0ZxN2hBdEZFbG5B\ndUFNWFlzVVVEaVhjVjVHcXkrQWhQZXo4Tno4CkF2cWxETytWZTA2U2VybHNDV2pI\ncEwxbkVaZ1U5TFV1U3h2OTdJaVllL2sKLS0tIHBNUmpocFlBbkJzVjdudW0wSHA2\nTWNMT1RETDhFRzhEdDlmeUJmNzk3TkUK1r8VQuGrfdbCdqS/DQzpXOrjO72PGGue\n/K+gFWIR8KWYSY5x2gpbxZjNyBkqRhS/GZRixKNy4PdxIpnQ6hflbQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzTnpjKzc5UUVwN0J3YzZ4\nY28zdlVJTExYdGZ3S2Z0bEFyNmJPYTlQL2tzCkVxcGFvaHpUYmZQTXVlQy9hYjZL\nbHB1bk9tdHNxYXZvY0ZRMnF4c3p4N0UKLS0tIEluUjBwVXlrT1QrcFZsbzFCdEVj\nSGEyNHpuQUxoZUNqZ25WZlJKZEdQdHcKUFkDex398+hNM20K19lwM2G+lpRH6cBP\nUqfL8u+8R8LpHPItfJwdYA6yKRpigCO6EmO9ehEEnWlPV2wJKq4gBg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHbFJpcTR4aVhvR1Nra2tN\nczdWRE9FMzcxWjI3ei80aU1xTVhNNXZLTjJNCk5ob0s1Rmlqb21ySmdIdEhUVHMw\ndHlhZXl2d25pb0p5eEtkNVkyWXdkckkKLS0tIGFmVkNjd2VBeFJhNzNpWEJPaml4\nZzF1TmQ0TnhDT1RVdzdBZGlXMisvL3MKSUI5bmUCFXNHfChG3yvSIEJ17ilMBLd9\nrhWvXaucMWmn+kJY9WBBEmzYNmrFH5qOTNPuVV8kCA/es4po5E9THw==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-08T22:49:54Z", diff --git a/vars/per-machine/aresix/root-password/password-hash/secret b/vars/per-machine/aresix/root-password/password-hash/secret index 06dc06e..e1905d6 100644 --- a/vars/per-machine/aresix/root-password/password-hash/secret +++ b/vars/per-machine/aresix/root-password/password-hash/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:hCvuPMFbMFi/qVYiyaxYAaw3O+qUGHNBqtpiweg4cCKWRK+q6g++ymzOMRKWridrChflSKd+2NKUpMGZyE5YYUFzJgBn+N0UHxhNmq730NcYEpTss3a8w+XZ1EUCkdsetC0LTa/jz0VHrw==,iv:Pfe9RwQVblFN4jWxhV1IaavuQO5LGwjH+9HI275kVe0=,tag:4esE23vgrzH9/X7St760dQ==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3N2xwU05qdzJSNVNab1lB\nYzlHN3dTWWo4QllUREthNjdaemg1dG1UbWo0CnR2U3NDQ0xFdXV2Y0trYVpwWW9L\nbzBSR1pncWVkSUxYWE9FMW9ob3Bmd28KLS0tIDhrbm5rQVh6ckpIelNnR2FiMEhZ\nejVQSlRRUjJ4YlBGdmprZWxnQURwWGcKHAxBtuLcK0mspL01uP9iYaa9NQxwC4Xc\nz64p9kuiuZFTweN87JfAYwCY+dArbP0c2JcAOy0RrXKgF/WwoZoD6w==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsZk1OZDgybWY5WENMcVVJ\na3ZlK2ZKdHJkTFNxS2o5bEF4MjdrTzd6cnpZCnozNW5TdXpvL2JlU1VkMTRwZWdD\nc2J3c2ZxYXpseVBKc2lhVDM1YXh0dUEKLS0tIElMM0ZlODlJWGxhdUM2WVRJMllB\nbjZTV0VyRUd3RjJIOFc4TWdWU3NiUmcKOzbfE8TcqQJi4t3MaTxD+hJa5fqfLfdv\nvJCj6YYzB6YjTM97t4h7raa/8pX+aqjL4kxeuLJY9b0fNQtlcWAUKw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvd2hETTBxN0tKSzZFOGVC\nYzNmVmdPanljei9jSkNERXBIYnFyb2tFaDBVCmxnSmVqK2xMM25yZmo5YXJ0R0Ft\ndnFYZllXMFV0ZHQzbXZQM2hFYTZHSWcKLS0tIFkxR2hPc2taZkJxMEFZWjZVV1I3\nSzJ0TThkK2R3WE9KTnRmTzZib2J6TUEK2Aznb+kwawt/W9c6JprRXxnRsP+aSh7/\n/J8M4hQ2+q52PLiR3IsPr7ErLfhKI8XpjMfQf96QOsSDjYrLPlomDA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3UVdoL2EvdlFLRkx4WnMz\nN1lYeE1HUUE0N2hFcm4yRkRxZzA5dDhBWlRnCjVLQ1ZIWWJ3dklpcTUrNDhkdXBE\nRzZlKzFzNUt3OS95bVdkMHZ6dUhvM00KLS0tIHoxMjhEd0QxQlJPVXhXUGQ1bkwv\nMmRORDBpMkQ2RXAwZnh0TmxNcFQ0QmsK00YoxTCkzDYwLBco2N0kqL0X7UCj43ME\nL6noOT+LrcrLHXZL+W9pKpYQTJqrl+sQ8atz1r/rJfWRKTOh3MPDcA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXQUZuZUNxT1BuWVBzU0hu\nMGdybFFZRjk3ZGRkU2FxRFNOKzlsbUFQUVZFClIvUzdHL1liK2Vxb05sYkNJTEFW\nd25JTDNIMllqSFF1M2M3YVlBNTRNdzgKLS0tIG1Hd1o4K3RPZEs2R29uWmJvMDJP\nSlhhbXRPWThDSlpzV2FpYll2SHJjaVkK2oHirIYhmIbVL4e1yMMjYcRyN3yB8bj0\nUdcaBc9KcwktgaC1ivQhr/5dUz9PqycjeYTOtv8kUneEuNKZMmr5zw==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-08T22:50:01Z", diff --git a/vars/per-machine/aresix/root-password/password/secret b/vars/per-machine/aresix/root-password/password/secret index 5e1103c..f4e87df 100644 --- a/vars/per-machine/aresix/root-password/password/secret +++ b/vars/per-machine/aresix/root-password/password/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:Wcil1eco3vHUOI99mhZqGm3ctwlyuzw+xeHtLRL39ohjisdd/7K5Fku9WxCQ,iv:z2mYI5lMeML9KG+sS05CZmfSQqbAcg7UuWqQuMtgvFs=,tag:3QK5TKHprTZzlE1yg8eBpQ==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkZXFoay95OHd5VVBDSVRo\nNWF2bndObmgxVjZFczAwa054YkhoeTlGSUZrCm92akhKdEpFU2VQdGxYVGVVamMy\nckYrUVZ6S2tRdlQ2cHh6L3Q3SUFtTkEKLS0tIDVybTRoQy9MMHJXbWo5MlRMUzJL\na0RXODZ0eXRxcDRkcTM1bllla1pqZFkKrHZ7Zy+tyBGCWBaYYOgezVDDjcXv0oQ6\nmb4zQyX3+OE/EpNdEt0yRcdaNBl95ERxhdcgec8fscIJvZWzmgMp7A==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZenJwb3llbmVzUWRIZnJq\nVk9NUkxZRVFVTit0MXlRMk5ZbmdjSHpXbmhNCnFSY1RDTnM3ai8yLzJlamt2VmpK\nelZmVEczQWprVXdFUDVYWTFLbzRzMUUKLS0tIG52dlErUHVaV29aQmN6ZkNWaXph\nTVNtK3BXREdXYWh4ZExuTzFIQWdxKzQKY9rGBbVbUHKrKnNwF54+8pDEagCUpZ4E\nmz2lel8T/so2mq1ckk2pBVMdKepr4n9GLDtHEXk/G0amZVtBVj8ACw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlSmFiKzNpU1dnRlFYUisy\nQlFNMmt5VzI1b3FSR21XcE91aExlVnNGUG1nCjNJVkpvYW8vQ3A4cEdVUGJTTXZJ\nazdhNm5ydFBiL0toQ1o3WHJOV1NTc1EKLS0tIDdQN2JpTnRpZ3NzY0hUVFVtcGRH\nOTlESW9KSFRmMk53eU1ybG9IM3BRbUUKRE3IdANeD+N8Y5QPzcqKIAqKSx05fq6u\nSLOwdvkWOK/bbmGxoRUmG/p2p2YVaCXBLX2QutOGHbI/TV4e/HCo7g==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-08T22:50:00Z", diff --git a/vars/per-machine/aresix/tg-ha-door/credentials-file/secret b/vars/per-machine/aresix/tg-ha-door/credentials-file/secret index b02093c..3081983 100644 --- a/vars/per-machine/aresix/tg-ha-door/credentials-file/secret +++ b/vars/per-machine/aresix/tg-ha-door/credentials-file/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:u8Qp6QJ65xRl9qaOeN4ubFitmmWejYHum0i3/B2IOvobJQFFHkS6kjDOzlP22oj1uTBzXfG4NhktujyeTXz5KdDNSiUsL0IGJ78W8hBYrEUXK/cF4CkqajW1e4OWaxYECbIHOJpFpHVxSNnr1iREHzxrxBkUbVGTxTKCfrYUMihP86HuEEiQSE/CIkdnOiXtHxgBmI4zHC00EdmZSwUv+SH/u0wz/F0uDLknuxdmrJzERSuBzadry6o7BQ/2A3gIQpU/1+CL9gxhV1bWwOK4yb5zSyTIVYCHn+PWUJUNUzrY1UUPb16TC9kG40e8xn8n/f2/0rpK39Mw65hLKInhv5A=,iv:iYcjJqCp2FVqDDynDesenQ+19lSHPOj4PGnbWt8471g=,tag:bgCVCOofqPv5cE+1yqoPSQ==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSU1c4SEdjSkpLSGZ2dnNt\neHllK1JzamZXS1VrOHNkTWtUUkFZcEM4c1JFCk9mN3NmTjMyVVQ4cmQvTUkxS01X\nK0tEOTR0c3ZKdWNvRWliVW1ZTXBXMFUKLS0tIFNpRUZlZEd5TXdMRmpNTHd2emZI\ndzJucTFhRW5aS2syWU0wNjJjR3BIc0EKE9lxrbY46EEsI/dJSjfXhd07he4SXkPR\nOVibYt1vOqcPV9PdkV5UONV5MnrpMgmnqY1gS40PSfH5agLH+rY39Q==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtZUlaYlVWUHY0alZSOXow\nY1Axai9NYXl4KzVXeW1Hc1drdFIwL1hDelI4CmVSeHQxckNLRFlWWXAydWM0NXpr\nOGZGOHBSZ08zYXI2a1pWVE54aEpVcEEKLS0tIFdvenFKL2N3MVpYd1B4RGl0eWFZ\nWlRTemNyYklnV0duaVpLNTVycnlVMkUKqRUlWiG1WZ3frvEpzrFpJKAX7SYhqBaJ\nYVPZarzqMJ6zYz3rvsx/u9kQlnlS4mhBRzH34bFgmy9rJu9VFl2W1w==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpQ0NuM0NYOGlabk9vY2Qr\ndUF4NUVXMiszcHNkenMzVGRJalJkZHBoSm5NCnJiQzludHZrNFFITXNOSzI4SmRs\nb1BUMXJTaUdsLy9wbmJGZkExMGIxTjAKLS0tICtCRUxMb2dNenZIQ2J0SVdhbC9F\nT0RPdmgyNjN1cVNTUG9mcm90L0VYdkUK/LvXmlY+TWe3BEdmIkVW8SQ+XGVSlPDe\nh34AVRR1CvkdhPgo7FL6QSB3EwFuW1N0zsyH0C1aPf3W00Nd0gpekw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXcWdaOFdCMXNjZG90Q1Rh\nTHhYY2dDc1RlS3R3ek13d0dleDVZZ2pONlZFCklkQWUrWmNOYU50bnIyL1lRQWpG\na0dTeXAwZUVLOFNGR1p0MTIySkVVQXcKLS0tIDRDNTNyZERqN29nWmxoWHFiaEhY\nWkRieEVMb1pnL1hHWjBtVmoxRU9FVm8KfsOw1InaJLLXagSibhJ5accgV+k2Lz9v\nFPXchmZ4h3hY6JrSG88ihaO48Fvw0R0ic675aP0HUZhqAiDBHQItjQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVbE9TZEY4V1pHNWNtdlVS\nellhYWNQbGJOY0tqejdxbFlWUU80VXNxV2lJCjhHaXFvQm5HWEZIUEZTMHZ5b1l5\neUxJMGgvWUlQU1hjTEdIa1p1bGJsbTgKLS0tIGJCK0JtTmFTRkZ1dHJLTDRtRU9G\neW9vL1MxTnVWMTFreDQ1dTI3NlRmb1kKcx2UmguMxYwDTJuj2lK23/GhC7vk2EDf\nIA9hWuildJ1x2kQExb2ydpCzFVgMfAff53WfdP2m9ZrGJkH3q4UoIQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-28T09:17:44Z", diff --git a/vars/per-machine/aresix/tor_tor/hostname/secret b/vars/per-machine/aresix/tor_tor/hostname/secret index ccd9b23..39a78d2 100644 --- a/vars/per-machine/aresix/tor_tor/hostname/secret +++ b/vars/per-machine/aresix/tor_tor/hostname/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:5ULwA0e+RgzZf4EnAAGERfAX/ISc3ySSjAET+ysVjRv0QdIWGcpCvWyhe6ylmkjb7sL3yUN/xIZM+9YuSWxy,iv:hZT3LYk5GkenIm8MN88xRKX+1uShh8EG15Rp+/P13AM=,tag:PtPDU6InsGiLeakSt+RlGg==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzd200N202Nkl5SzAyVHRv\ncWs0WXBzUENnNll6amkrSVFiUFNPTTc0aVY0CkpRR3Y3SWRGNEVCWTZ1VXJHcndL\nM3Y0NTlsREdqY1ZSVnFEVlFTYmRlM2sKLS0tIG82K3pIYmJWUHdRdGQ4djVPQ3hB\ndlZuKzBrQ2ZwY3dtMW11TzFQdXR2MFkKHxOWJIprCS5ldwHZDkOV3+J+dCzIRaPD\nyIPeL1KzsNt+J/VP2XbpgYX7uoHPK+I8xBswKXbGeQmc4CgDsWYWuQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBreHFUNjBPOFJ0d281YTN4\nUFpMdk1hOVlhV3lKRmNFa2RmaUh6ZHNDMW1FCk93YXRJcDBUT3RidmE2Ui9vTnhu\nc09jUFN0T2xVZXRrZ2VUYVBrbFJaQ3cKLS0tIHo0bGp4OHoyRm1rb0s0K29BYnFj\nWjA2T0NWdDE3elltM0c0aWIzNzhNb1UKYtaUL7//G9zRTVu4w/gq/SK/T+SU3ajO\nP6HXVsZluQoXYSs+epUSqoD44OGKqLeFvU60I6AGbDwuvM6/bFfBgA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuNU9KVEhKNmUrVitzMzVS\nb0FjU1FVTzVQeGFTeTdzMTdFUVZUQk9mcVhrCld2bUkwR3VyVlZSYkZMUXlKZUhp\nOU5xNS9lUy9uRklOaXpFR0Nnbll0bVEKLS0tIHQ5OHJWSUJpRjhyRzNQalVLRnJ1\nUmdBU3dPWWF2UkVWK0p3V3g1MnZQdnMKKiMFafm6MXaigLto7GQn680Fj99nnzR8\nIbfSEERHM66968S3ia5PjrOUv+hCSJKow6auBfE5DONNzES9rbkkHQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAySFNGWkdPeHhQWldIcDk5\nVUxCTHNwRThzbmgwK0N5TFY2RmJ4YzFiMlNzCjJzSkpmZlVoVVc5Q1FCWmQwRndN\nYnB0cm45QzZjb3VUNk9vSXREQzNEMHcKLS0tICtnOGNCcTNzYlF4S2prOEp6b1Zu\ncHZTc0F6QTY0UHd3cGhESkhnblY4TlEKKEHGxQyUOvJBGpopkeCRuby0+RacaV/4\nXyyCED/jni9GtqZGtFJGIN9ujfXmbBnB6VEeENH7xOGzZujOKLrJDw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1YTNocURJWlpvc3VXMUs2\nd2Vic3ZBMVRpZmM2dXZYQlUrSFlLNnBMS2t3CmwvVktQL3oxcFR4ZCt4QjFIUVlE\nbFpjVFFjTFBEc0RmTEdaQmJrcWpqSk0KLS0tIFgvc0dKeHU3ZytUSDdrd0orY3Rv\nY1oxZWgzeTJ5aHNLVkxjbkpJdzhjVkkKcnFGo0wpSiKx2vVJN4ry7ltDHCZe7x63\n9IjS8a6XofftrSpb4uSnq/OUp9NeGNR+lLaPpwkeqlMHAQrNEcPnkg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-06T18:14:48Z", diff --git a/vars/per-machine/aresix/tor_tor/hs_ed25519_secret_key/secret b/vars/per-machine/aresix/tor_tor/hs_ed25519_secret_key/secret index 01c3943..19f7fbd 100644 --- a/vars/per-machine/aresix/tor_tor/hs_ed25519_secret_key/secret +++ b/vars/per-machine/aresix/tor_tor/hs_ed25519_secret_key/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:6LI/75OIdKbi5xSBfs2m6GrpZgyz8qmQU+f3CFfoakvwiA+XSYpHZeu1sFpBgfNf5RBNjfUHe+aQQU1kpXpSPY8AEJINTkxXSq/4hkXorEQQDYK2r9fKt83mBIokyq5Y,iv:NixWGdqNqRK1PUGHlBrw3B+FXUIDRZePjqf3pNq9yh0=,tag:1HhQHF+q1KZlKx2G1lcnbg==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsbDZLcTNDcllrUVJEcDVy\ncVNCc3RWOFVwL1AxbHJiRDQ1b0ZPRnhPUURBCkhMblJsaXZKK3ppWkFaTzd5VytM\nd3NGcEJidEE3YkhIbmphaUF0K3YxZEUKLS0tIFQvenBJOVVaSm14NEFxK0pTWnFJ\ndWZRc01JRHVOQWFqT0tOaTRwdU9zOEEKbN5OBbRrSf6ZknM5gvLo3KgpK7TpAQeQ\nWeuA2VzSg4mnFjxbK/7uC7siSr3jXGGXCoKmz/FCKriy2QcdHuEzVA==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1QkxLbzVTVjM5QXBPQXJ2\ndU5KdzVoY1FGc2hoZytrSkJOVzZJc0REVkNBCitRb1JmSlBlZHNxVVJzY0E4ZEt5\nUE5tclBXam9kN0JoNnJuZFQzaWdQS2cKLS0tIDVicFgwTjBrcGlqK0VnUmhScW1I\nM0FvdXFMbHBvREtXRjMvTEFHRWUvV28KYu61K71HcxcXDk6RrU31d76ZZn/9aIov\n5zRPSymed/3vJQBVJBZy5MpMk+bAicwu4AHLcgJ5cdm10q3+Jt9+WQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkZ0wzMU84QlNXVnhUT2Z5\nNDl0cDYvOVBkNXg5UEorRk85aFlHeWVXQVR3ClVISFRybVgwcTE0WHBtZUNrbG5R\neFZUTHJLVVlmUnAxd09iRWJkdkhWL1EKLS0tIHNSUURsV01uSThRcjFkZWNRV1FG\nMG0xakZmd0F1UjRrdDE0NGpHOEpmcGsKGi+imzYdXmY8jirUAzqrbbsFm4XsWWUl\nv8L3SnXgqAwtWO71VagwuTdV2UK/X4NZkRBEccnEC8doi/ZVXKaDpQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZVTlmVHAvYnVoV3NtQmRn\nL1ZkNmtydk1hWW9EYWNVT1ppS0UvUjl1Z0N3CmRJVlErVXcxOThLVHI3WVRMOTBz\nUExHaGxTODlCYzNCS0VMSjZGWUxUVzQKLS0tIDZ2ZjArSUZLVk45QWFHV0JqdWN6\nd05WSUZMQ2J1WEp3ckhPeVQzWjBRcGcKzBJbAulJ3u4yEk1AFINkD5HgSTlo6JYc\nfSylgrNWzJgmpACqeWzOklZP7BNdMqpopPLCNtA38Bq945St7wZp1Q==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxWitxY3k4Q0RMbjVVL295\nTy9iVXdGeG14bVdVMHhiUVBaZ0QyYUJhSFM0Cml3UmF0bnRtZzdsRWgxdFFtdm9h\nUGlmU1NYd3RKcmRTdzE2UFV3TENzT1UKLS0tIG1qc3VoWFpmSUt4R2VadDlQWFAy\nWUFTUHQrL2xTTW5jSGduQThQbGo3L0UKmcm03HAOu83cMKejfo+aBfGjGJ8zqdU+\neIKjQ+8L5ZaAxf+Puxg+0DmtU86Uw0J+DOBJa4Gvy/dwgIroU9W8Wg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-06T18:14:48Z", diff --git a/vars/per-machine/aresix/user-password-pedro/user-password-hash/secret b/vars/per-machine/aresix/user-password-pedro/user-password-hash/secret index 08d5062..f3103fb 100644 --- a/vars/per-machine/aresix/user-password-pedro/user-password-hash/secret +++ b/vars/per-machine/aresix/user-password-pedro/user-password-hash/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:nqEH157P7/bBLGcn+xdliLEE4lA9pzVDzbOSfJ1+Y17oLQfX+o7ATQSxsp/FMGtRkUVbeFlhN9mvm5hIZrnqV1mNy6SBhIHxZ33ZXu62BzSJOitn7WRquaDJD5Xvayw+sV7ZpLWMXMkK2w==,iv:L30HTx/tYeDFH9KHGzSqAmHWfgRCNvdHR/Vlu3oQP48=,tag:LI9jtTOtH0VI9K/Pf5J/rw==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0QTYwVmJ2TlJLWEVQY2h3\ncGNwR1hLZFFCYW5XNStVSHRST0ZaVW9sR0RFCnkrMjBrcWc4TUx1VHhQVEgvRnEr\nU0diTkVaZndjZWd6bmhpeTNnbkhXM1kKLS0tIFo1MVdZd1IyYWp2MDh6Y0c5OE54\nRTA4d0VleDljdkdGdDVVRkNnQXM0VFkKLbT2Se3WRxRbc5TGF1fmtQizxHOm8tme\n6leZE0OlpzQ4jeBxSzq9lEYEkP6yZUQ4ComMPO4k0rnRNkXLliMQEg==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyVVkzS0pOZFZlcU5wZlla\nNThjTVg1SzQzZnF3M0pSUkRYM3k3Z3JPUTIwCk5NQjhiaGl0cmtEb2QwVXNJL2kz\nTnZFQm5SWG5OL2xrNjZ5ejFERnZQMFUKLS0tIFk1b2ZFVTd6Vkh4bTY1bXhWSi91\nc3Mvb3drRjcyZWxBdVI0ZlpXYzRRVTgKDsuN1gMSGl23eNSVPPMSezBC568OQT+d\nclgtzY9khbl5liITiYAULR+PMjFrPLioM6fpHJtHxXkfXNYvOQ7tXQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvTjEvVGN0ZWJqTGgyMEJQ\nTG5tV0hvZ1VPbkIvSEZ1cWJ3RFNhMVVneFg4CkxrNmJwT0JGUjBzY0lkSktTM1Vk\nZ2s5QWRjQThzaGFmSi91K3lOc01ILzQKLS0tIERGams4ck9QUEVvNnNQUXBPWkFu\nbktlMTJleHJTNFk0R2hCcWZKZFYwU1EKBmbccL9tdGbav7vh6NwJ4Srft1SNRAXV\nZ9yMYjMysGM7m4OCxSJgfcnVNuIYzK1kk6k3l/20sMIj9wU2UsQa2g==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwcjg5Q29OZi90MzJJam5u\nTEJpOUpOTVc2M1ZiNHZzZk5aV1FSUVFKZ0RZCkpaMnpmTVhqRWU0MkMvTEMyOCtK\nVTRwQzlsSEFQR1NYN3RGcHBNTlhXQ1kKLS0tIE9pTUxxMDZ4c0hUaDU3Z09SZFN3\nRFhiSHEwTVc1Rk5WTkJaU01aU0NvYmMKXA2e9JWgMAxs6zMc7IZVW3h4w443NYKm\nMhw+atRLspI3xALRi82LZpOc6i9rAlp5Wn29WbrWyeIbXdf1PikkDw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1d3R4bWRWQjJ1WTBUcm4r\nRDViZDg1WVhyTzBscHlwenB2VVhWQXpqOEM0CktVR0dtVlJycWx1OGJub0laVDhx\nSHV2a1I5VHNrcW4wbUxIbWFDbHFXTFUKLS0tIGFRL0VuWjl5WHN4RUFZR25VcmVO\ndFZ2TmRGekY2KzlqendpWDM5Yk90YTAKn1LWD36/aF6/D7p1oincKg2PxOzWLp5W\nb5cpV3Eub0SJ5Fejui5oY+8kHiJNT6w0vwOC+o75f/aVkDbvFJ2TAg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-08T22:50:11Z", diff --git a/vars/per-machine/aresix/user-password-pedro/user-password/secret b/vars/per-machine/aresix/user-password-pedro/user-password/secret index fafb2e5..e0c25fd 100644 --- a/vars/per-machine/aresix/user-password-pedro/user-password/secret +++ b/vars/per-machine/aresix/user-password-pedro/user-password/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:J2hJuo9bN0gxVnNXcw==,iv:ON4CuUUdxn8uCEyvHJiVuHfxBVs44jyI6diltBxokuQ=,tag:C280a7SdcoYsHC45zmRI/g==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3UWl1WnhBcHNCQ1ZIZDFJ\nSXZseUYwZHREbFlyRDVGb09PbDAzVmtLQ0hZCkgvWTlJbWpWc053TitBcjBsdmxO\nN3hHeVRrbVZVNHMxWlJRWFVuSzVnQVkKLS0tIFJYcXh6Nmk5eEZZcjZJc09icjlD\nK3pENlR4TUhBa21UbUptY25sUE15S1UKPBT8M0OOB8UEOEvkSqgY/fxltWQgoeFg\nwWx3FpvNJk5OUCjPtaSCNfBR7AFgK3vYsaOL2ygQf6qJBSaDzoszGA==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBabXVxTkdDVDhLbS9UTjBD\nVjhqUG5hMVJ0MmtvMmh1T0JmZmhucGo1cFJBClR6TlJhZHFIS1FtTVNseWhzYmYv\nK0xlckswdVJ6aGRIQmJjbHRSbjI2a0EKLS0tIFIxYjUxaTc0cHBtTjBUVkMycE9n\nbDZ6R1VXM1F3bzVhcE9wVklNTDRIcHMKPCc8PyfHzNvQWXHOg3uYKofR/qKIoUxH\nfdLhq3C/PDQK+heNmPwbQUgWVKco5crLMhuzU7s3vJXble1HDJIv/A==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaYVlYOFRqUENSaHI5TW9E\nb3Irdktxb04wZlkvbC9BZGowTkhlZ1FSWlRFCmdsL1h3Qm5YNTU2QThpUU9ELzZh\nSnNyTzZTanBzYVlVekd4TUtFcUgzaWsKLS0tIElPdDhJb0IrY213UXpyWEJMbElO\nYnBqS3lpNnVXSjBUL0FoVnRyWDgwL3cKPw77X1fthMYUZIPkiWZCZv52VsZjFz4X\nezgalhibMmzvJFeJ+Nfpe/tHkp6YGPT1lJV2/Ih9onj4lBS+A0xOwA==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-08T22:50:11Z", diff --git a/vars/per-machine/aresix/wg-access-server/secrets-file/secret b/vars/per-machine/aresix/wg-access-server/secrets-file/secret index 1392bad..74cb568 100644 --- a/vars/per-machine/aresix/wg-access-server/secrets-file/secret +++ b/vars/per-machine/aresix/wg-access-server/secrets-file/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:xWim7rJWQoBmobM7XTH6RkHNHlu3LBvm+V5Y5BU+lCc79/UtENMqHl6Q+xec6VNQTPcOEo+Nq9nLN50YmKn9P8DH/EeT7do7Om90BY22X8BbMdrg0ibt99LuQgmXKcWE7+YQug==,iv:ScD/Ij+u1294JSXglLep3V41TCz61VQnmH10Sq3R3HM=,tag:6KIgpIA0bzIwOJaNn2+6wg==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEMHYraHRXcVRkWTZxR1BO\nMEI1d1JtUVNkUVRpVlRES1hQdXN2VUJMYXowCkpFMVJTaVJlVnk5MkNIYkJod1JO\najBFTGhFa29hRHBLbDJFL0lXcUZjbTgKLS0tIEdmazBsSUcrekRUbGN5dnljeTZ4\nc1BqV1Y0ajk4YVpIZEp3dkxZYzVkcTAK+EXXXo7GhI6w7rS1P1wIriRLR4zvWzp0\nEInwYDAbHlMZ/sxLR+ZSmz/HUZqmHGSmbpvYtH9ouI2DoaiEDRo6Bw==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12dw69nvfyqype23gmn4cy7wccr6ct3luj05hat4g65kzwqz9rpzs7z4jpe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtZ0hyMmRxMDZVcmtQaTl0\nVHJGdmFXcVFSYVJ6VFI4UUU5VDBMSjNMVVNBCkRZNk9LTjZ5R3J1MXBTdEc4bXFl\ncXdSdUJicllic1FVN0lpVkFqK2kvdkkKLS0tIFdUQU44UGU3a2x4QTl5ZjkwVExC\nWGJVNHVsdkQ0MlpRNnRBckYyWFFyOU0K1sXvQXdHc8U+Djwj/N6h0Wn0z3qPkA4n\nPTnA5Uwlx9LKOBOfPl3cvIPVUXbP0w9q1Q3iCt6z2kcpeqEN6tginQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4dml6Z28xUk9KOWFUWmh3\nQjcvMmpaNVp6dnhpSXVQa0NJaUdsTnhQY1VjCjk2azhPckhobHZlaWxwazlXazBa\nK3FlbWlrUG83RE5aZVdaMSt0eFVlRFUKLS0tIFVqR3NIdXhMY3p5UzQzQTJyMXRO\nT1dKY3RYM1IwMXc0WWxTOXJyODhTWWcKogq02AzUw9KxgaQCIo6yelUfpkk91iY1\np4yulME4rrC1YFqRFFVL7otXDNtoEcjK+/9eiYnLE/8axJt6Q06Pmw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVSDZwZVdWZWRLZ1lYQVJv\nU3pNSmc5SW5wbGN1bnlVTVRGZkVDWUNRc1FFCnZuTWEzZWhrUnI4TnY1ZFk2WDB1\ndmtZYVh0Uk5sOG1PKzZKWVNQQWZNZWsKLS0tIDU4bm90VThZYVBPdmVVbzlsMkc4\neStVNTRObHcydnRhV2lBai9JcVVXRGcKnRCjk+S4+xp4eZ14NEOEYRhQ+Ed6JYmw\nOsB4bFMcGJyKHXXp7eYeb64yft/hS87r4koMq6QiYlgTCTZJGQXgTg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5aDJ0bG5xSkUyRVgyK0Nv\nazl1eFpMaEdlbUYzSlplTTlpdkN0cnBpbXhBCisrK0wvSG5HbThkNFh0RXpkTUVL\nWS9pYnJJaEVqMHBUdUU1dFZ0NFI2MmMKLS0tIGVKajF6SENoUW1WTEN5S0dSR3Ur\ndkd0R1VpY1BzSytSaGdHQThsNFY4RDAKLwUBjdEXuG0SZhYgB61yMmI0bMFyDhr6\nBf5JalvB+ytusGHHw/Svfp8V0/OTEuUzPDCh+pi6OBLgtyb3C+M+Vw==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-28T09:13:53Z", diff --git a/vars/per-machine/frues-pc/mycelium/key/secret b/vars/per-machine/frues-pc/mycelium/key/secret index a5e6b23..62ebb75 100644 --- a/vars/per-machine/frues-pc/mycelium/key/secret +++ b/vars/per-machine/frues-pc/mycelium/key/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:rLaL/rfH/D16QFR3Wf5bZ3ak9O0kW2nJsDwtiPdBx3Q=,iv:ef5Lq0XLFl9fwUR/cjnkC+n64qImIU30AKiM7HvFnqw=,tag:97q2RVBTMpcTglclEcI4HQ==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBocFBkTVBQRVlsZ1RTWlA0\nMmtVaGZXNW0zdzNleHNMRVNwbGpxR0o1V3hzCjVRVGNNcUk1ZDNjWEZKdHdiOHZ5\nT0RyZ2IyZm9kYzhDNG8zSG9UNnM4MmsKLS0tIFZKRDNrTlkxZkJzdlFOaGFnaFlK\naEcvNU9jVVdUdGVkdFZBVDlqYWY5UlUKZLwYFeuag7B8ZWYcSb+H5Eo3D6Fo7cZ9\n8BOmvw4VSP+3M8QSng4yg931cxpJ3bARoxg9rXx7R4+qXX8W0pL+gQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age17pu3mvhwlvlffhvu2p4ut4wx60j6srdmjtk3889t9cs7jp60ws5qsc8myu", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTdkw1WVgrSFRlQThNSWhO\neGhHTEV3MlpVREplbFErVWc4azREU2pYZjI4CjVVV0tHNzRReXo3dTR6OWhQbzh1\nZUgycWxta2VBTkNRK2luVVo4SE5peWsKLS0tIDRCdldnUW1mLzdqZ2JsRE94RlNF\nNmtPZVpML3pZTGh3K0FvMDI0RWVMSWsK+J7PWCSxnVH3ntFVWPQ4iUhJUrAri2Ze\nTAhL8/4zgKhrHzCDSHONLyblENml17N6yAYU7X3Bug8staN8uDRDog==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrZklWbjl1UXR2TjJrS2Nu\nTElsd0FDaGFNQlgwTVNWRmpjUlVUNmtsREFzClBOYUlvQk5BbUdFdk1jdUMxczJO\nZS9vcVI1MWJpWXNtMXF1ZUNQQ3dOWW8KLS0tIHBVaGZQdWt1TmlMSUppaGZtRjZP\na2t2ek1nbmdML21iZjhXZkN0MEgxeG8KGOm47P+SAEBoS/LzAoa073ruNi9t50Fu\nX2Rv3z/X1L3LnowQ5TtRxPMaNmH4bwXE1w/WNTzrlP3NkjOx/o7Olg==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSZFVZWDIyT1dOcUxKVU9Y\ncStCNy9iLzhFN2JVRjNvaW0xaEtjMm9QQXhRCjNqeUc3eGlQQklGejBid010Skl2\nVTZmWDY2ZUFFbkpwWUk2a1hJUVlmalUKLS0tIEtXRlMrVVpBVXk1aFE0eTlzaDdV\nTHJMWXVKY040d0JYL3QxaGJkeTg2azQK5+WBTnZ6T5E/VPeyES+ETX0FrS4SQ9PS\n/cYyB0VYsSwxsTN8bGgHnhruDLf0f5l7ndJ5Zz9Oj8NbR98USpJZ2Q==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5WnRZdnRRaVlBZDJJeUZz\ndUd4eklNMFByYVljcFZNaEprNTNkQStwMUNvCkxUQ2VFQ3AvcFBSbnR1Qk5lc0R6\nOStXY0NhcTFLdHVDUWRuTGVGaUR4eG8KLS0tIFpjSzloRWZpWDhhTG1CUEJ6QWxF\nUXpTYTVISklqUHoyenZwZEVxVnJwZXcKILuX/JPH6iYLvmv/Jii+AQ0G7qMf35Sj\nP3xJcQh3qhdPHoorismZEEXMQSOh9rPs9u136n4xEBqZddTuDTuIHA==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-30T10:56:35Z", diff --git a/vars/per-machine/frues-pc/openssh/ssh.id_ed25519/secret b/vars/per-machine/frues-pc/openssh/ssh.id_ed25519/secret index 662e5e6..9139699 100644 --- a/vars/per-machine/frues-pc/openssh/ssh.id_ed25519/secret +++ b/vars/per-machine/frues-pc/openssh/ssh.id_ed25519/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:BH09S5oUlrqdwhr6GqLqV/Pd6uywtNHfYvixAgNxVjtfEq1Rt+mJIyj9N/n+RxvZY2q/s9sWrz7h9NKeiK1WBOFno9N4GMUFeSl+vaI25D6UnRC6uFzcC0L5/DH2ZwSGg+fxr26Es7Q3e838XzvGgNtOd8s/S+BkXh4iSY5nqYngYdeF1H7BqMAqJcAU9NAZa7O/fVZi8np3HujlgJqKjWCOP9NMwasZc7BvK/UZvRe+F5vCoGhwuOrBTcnGdsIUJBtMzY7HrjzK1jfC2KsRdVkuX+Dqpg5b889YUUfmqIbwR3z9cNy5JXXumGe9+BNJtAbNDjZmOJK69E1VmgRl4C98S1hD2oNcYNuk44823HLho5uJfcykqdBcfp77z7sg396r+qf5dCdV6/i5Zmxqv8mCr4alEA90ME0j74wzm5ShvcS08uH47ZIBrhzeEgkyAJjLfugD4P78jluSOOvJVGuId0U8cbhH62osDOlllOstXNaLj3HRVTfPBvFESRQwQLaA,iv:6B926X6N7UsC//E/7JsT5PvG5rJ+4a6WS2NiD/kJSu0=,tag:mpyDiz7OqAlnmRJOGcOl+Q==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIc1hyRnpYTTNJam9mQ0JL\nNzJoYUljL2FydGhtWGlhTW1QWVZSKzZvSWtBCk0yRno5Z2xMSXZKU0YrZDYyeUZq\nUDJrSlZtYnhtV0tjWjdBaEg1Mk05aWsKLS0tIFhvOE9BR1lYUW0rN0R6VG00R09y\nUTl4aG9GNnlWT3BBVkJkS1JHVDBRM28KyhV6ZA9j1TXgzI77qDFcwovGFEwSgqXr\nNkyA4L9AkwOvMypWRBoK+kIGDcXnTvR+waWa2hQHx9GZDs+cpLXkvA==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age17pu3mvhwlvlffhvu2p4ut4wx60j6srdmjtk3889t9cs7jp60ws5qsc8myu", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxMUN0UTNLb2YvYmg3ZCsx\nblhFRzBVQWhOMCtkUWFEMk05QmV2UmVIWFR3CnZUQ2x3dmR5eDh0L2s2anRsc091\nRzdKVXFwNU9meVU5ZGk4ZjFMR2t0em8KLS0tIFV6U01idVJJNzNFV2ZpRkk1UXF4\nQXNSTzdCU0Q3ZmovSjk4d1d3WVBiNU0K8OXljuQkB0UpeKUmGPtnZxMBCyZAm6uf\nBBJigP6+TwuX8qJyvAM0I2uajgjY9+uZcAo64POA5zWjkC7jg/33dQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvaDh5SkZ6NFlleWdCSUNJ\nT0JsbCt4aDlueXU1KzZ0TnhvdTZDT3RUaUdVCmx2OVJ5STJUK3VldkxMcU42U2Ez\nSVU5SWFPRU9CbitFWCs1eGUzRENoMVkKLS0tIGZVaUpZaExEaDczeVNqVHN3UXB5\naW4wRG9zcjhTY0ZOTnBTNW02bFJieTAKQ8uQQIGT83yssAtSAzG4QTT6TSYlWp4q\n31ICXKvAgofeph367bxMD7pkWLNkouaoWOSe/dQx7BVciGM4n435Ww==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4YzYzYmRxQVNsZ2JOU0Ix\nNmV3angwcmxYVDkrWS95emMyc3BCU1JIaFE4CnE0TXlkajNNWis4QkFhRm1UaXFi\nQ21HSFFRanF2MklrN3ExZ2xqcDJXcXcKLS0tICt3TDMzYTVnVnJDeCtwNWVBTEJq\nR280OXFPYXJyWFdSZGNJT1IwOUp0c2cKETjuiHYHqtvT5gU1Hw0A2NBn4S4vnvM3\nlTmLZfl4/pAP+1VsekgaeBh6RQM7mr3XAfL0nqFF6b1t444CwTy/Tg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0NnZPNGZSVjRKZkt4YkJx\nU1I1ZzlRNDBqZlF0R0IydTlwd1dnc2RSU3dvCm9QS1BWM2ZUQXVFYXhlUGI4Ri9R\nWUw1RWVqRFZ1eE9Fbjcza0NyTmNiNUkKLS0tIElVRnNHL1NoNndDZ3pSOXBYYUZ5\nSmkzQ3Y4SkF3UkgrZnNkOCtpenREeU0K20lT0VJtiqL37vLG3t2wcrtlhq+wpqWi\nwmB6Mu4vhZMVfEDp55iqNIE0cpHhrSs6kYQqVe0Iugf9D6MnMm4Atg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-30T10:56:44Z", diff --git a/vars/per-machine/frues-pc/root-password/password-hash/secret b/vars/per-machine/frues-pc/root-password/password-hash/secret index 6155a8d..b477772 100644 --- a/vars/per-machine/frues-pc/root-password/password-hash/secret +++ b/vars/per-machine/frues-pc/root-password/password-hash/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:5IOq2exuuLgqt54oJ4vWPTjupSmJjQHuDUnycJciePH2JApjVY4gruhk0E0qONARB4jslYJltIUeSVrONM9GSSJ3ON8Jq8o++N/b3CUFGx+Yre/upzFNk0SiCUgyCMdz87pyp64SZimYgA==,iv:OpXLp8IEar8eZtUzyZgK3vXZCPbr/B6ej4x521Jtc9o=,tag:A/aEvKR1dwmsDkDVkJUsDw==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwNHl2T25mc0hza2hCWm5r\nbFlaRUhQRG1heXNTM1g4V1JsRjZyUlFFQlVnCmRLaHN0b2R1MVM1Tit5VzZ1ZEEy\nWGo0bWVZdnpWQ1ZUMEVNckZ1RzVwTHMKLS0tIFZiOWE0RW9TOEZkQ3J3aUwwTVRI\nUjRKa1dvbXJGZCsvZ3lHc0tVTHd3ajAKDNugD57Z4abKq4FFLE+B1Wls/EHiXP+S\n/aRIhKm5jLTAXdxTja7S+ekAuXaq6FCsttzDfVUzHOTh8Lq6Tp1Y6Q==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age17pu3mvhwlvlffhvu2p4ut4wx60j6srdmjtk3889t9cs7jp60ws5qsc8myu", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1SDVlbS9pR0JkK2pFTklV\nZ2FtRWZOL09jdmlteUZENENYY3REcEVHamdRClM3bldxTnM0UnJ4TjZLRHNwc1g1\nR3IyRURGWFY1bG52c1h0UDQ3VVBmWTQKLS0tIDFwS29aNTVGOFhpVUdIc0ZDZ3lQ\nMDVVbWk5UDVzQzdYV0FxV1cwQUc2dmcKUJ0sINSsG5f58MGyee4E+OzafBXEzCyc\nRbqBjNX+8hxttwZd7Q4iAt/s66Uh9AoDDf5FITDMZv/Ngkapo3kOJg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLUWlqUW4yZnNhVVNPVkpw\nV054YjFMaWhhZWQ1UmJuaWVXTEhOYmFQRnpZClIxY2V2NXBRcHpsRXhoQmRJZmRz\nQ2pURFhSTDVmRTlXbU5FNzJWN1QyaE0KLS0tIGt5dGMxSkNVVUZwT1BhaW4rY1Aw\nNXArUW0wTDlCWGhTcWJvdWJZYno3alUKx4qC6jjK1tcQ4n1RljBNbk1yU2+MtHdk\nmlsZuTdvMuHtPHCTfOh4T3CmHy0dk8Hlxya3mjqiT+XV7q14dxQVsA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4S3ZibUN5QWY2dG51NjJJ\nVkVFODNRWFpDaDc2RHE4WncwWGdhVm5RZVdRCnhRZkg3blBHSXFFZUhNalhmbGR2\nclFabEZqVmsyWjM5aW5GRlQwc2ZlN0EKLS0tIDNvRUJiV1hSbjgyMWpnaU9JUzR6\nZml5L1EzUFUwV1QyWlRKaE1WVTY1Y2cKgtlOFwNtyT+aonN4nyj9RmwjPNDE/6u4\n96gVe+Vi2it3UmDtvjBc/hDWoPjgka53aKO0rMpn2v6bvfDpcWHfAw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4bGhwMk9WdjgxT0FkdWVT\ncU9weHI1RkQwZFZJS0VrZlYxaDh1TWFhaHlNCmNhSENDN1JTd0RVSjNtczdDVVZS\nSHordi9mWWNNTlc5YlN6b0ZyR0ZXNTAKLS0tIE4wdWVSS2lZeHNLeUVvTkJSQm82\nZGd1VTlZaVVTbHBzQWxBbG4wc05lNnMKdfEaLDaxT+Y08V2aqZvYLtEnvEYTe8Xn\nVM/u8ECKsoOlMM3M3Yr7WQkciNqBkhlUeCfM38uw+BDEUoVrrwXQ7A==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-30T10:56:56Z", diff --git a/vars/per-machine/frues-pc/root-password/password/secret b/vars/per-machine/frues-pc/root-password/password/secret index 47ebee0..2ac8fd7 100644 --- a/vars/per-machine/frues-pc/root-password/password/secret +++ b/vars/per-machine/frues-pc/root-password/password/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:vNF+TkmYK6B+SQ28,iv:K3ymYK711jWgAk2oFND4KjfA0Lqf/gHzD/6E7O1Ouao=,tag:jAo4kcUpilmhkjgP6SJv4Q==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmSjYrbUFZck9idytFa0l5\nVGRwOGVuaW9QS3puajlDSTFsT0tJQkw1M0RNCnNpZGI1cGFZUzYxN1JTQnF1TEJj\ndmdoK1hqK2d4V0dOK2E1Nk1sbTU1c3MKLS0tIDZYWW45ZDNkQWFwSy9aayt5VHdF\nVW9TVDcvdW0wVHJ6cEdmblIvTStRUXMK0jHyVOqYTMuodRMc4f8PwIEEXOYMFdLC\nrNWtB7Hjq+72vRDrJZTbw2BUyCsG5ki4ppZvWlpI/h3L9KySpha4zg==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGcU9vNkRIWHJxTStZSGR4\ndG92czk1N2QwMXVxSFk3RGtZNEhWMEhOUEEwCkxUcjltSkxZOTNCZjRiTUZqa3g2\nd1FJZ2tHSGhYNkpXMVkyc3VIU0ZVSFkKLS0tIFJpL3ZVRXB6MlQxZG1VNXd5WU5a\nQ0lMSDJERzFLWitJZjljQWMvZVBSQzAKhAUocumAMbQ0EAKjF2FqpPBM9dC4Qy4E\n9NsoyaoHTOLtaTdVBXQGt5SRzQjnnGSsLyTzmLOeLHQgC7BUvZiTow==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLM0UzdmpBMjYwUmdTSHIr\na1BKTWpoQ0dkaGxhQW1HWmlhYjZtZGNYYUdVCkl0TVNHL1dJTmpuWWc1cGVKQU9w\nWlNETGFEMWVoR09yUXdSeGhUdlVLTDAKLS0tIG43WTNqTHdRNkRyREUwM1FPVUNv\nQUIwMmFMc0xFQUVoZ1RiaGxSdTdOd1EKnMi4HlEs5RRi1Nt6f2TLxSFXMIQsgKRm\nQEkLm5p7gEHLnX9Eh1Hnzay6Qk8QlHVuUE7hFMgtwZ6oSwkNGJvuww==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-30T10:56:56Z", diff --git a/vars/per-machine/frues-pc/tor_tor/hostname/secret b/vars/per-machine/frues-pc/tor_tor/hostname/secret index 7910e93..1f79326 100644 --- a/vars/per-machine/frues-pc/tor_tor/hostname/secret +++ b/vars/per-machine/frues-pc/tor_tor/hostname/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:2ia7fBXPyvWpIeOACsRuaNbFpY9A5EEK5quR224EZh4xusBcadfDvEc2rFDsGO/hmTy/fRetcOkBVLBz7jIb,iv:ZzF4FxNzczaGK7Y/99VgZwAKnWeOgCcHWF7DPxjoKfo=,tag:m0zZZ/HJaCSkllYdhovgTw==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiY2hSZHRFSmFZMksxWG1s\nZE9qL1FjanBGVThlRUpEcXA3NHJCOUxaNFdvCnZsRUV0MXdkZkI2U2ZnTmRzK1Vr\nVlMyQTdRdjZodUIzUE9NV1BMMmtsdzgKLS0tIGUxM3hQSDB4OWlzUmZpQ2JJWmF5\nYkw4YzArdk04Y1NCYlhqZTVFTDhTbncKL/+nqRtg61oqJV0foCl7ECAXBAJhWT5F\ntt8vxiIHjXafAODDmm4Xy/0ajCNNmLoLxQWC8NQgZH9ONdXhSU7XKg==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age17pu3mvhwlvlffhvu2p4ut4wx60j6srdmjtk3889t9cs7jp60ws5qsc8myu", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhWFNpRGZQcEY1anBMZUpK\nazd1U0JaOWtFc0g1SzFRNElHUkEreXF4d0FVCklWUkQ4UGFSd2hSeTBEWk1XbWdl\neEtWellDVlFMU0VZUGlYcEVTcG0xZzQKLS0tIC9YK2h4YzJMTVd4VUFxVkZEMHVh\nVGpCdjI5am51c2lNRS85akRYa3ovWkEKjTc4mGwW06jb8ZB250sMAEWj5vqjwXEU\nai/rlApd3X4sUXQhHhdlpZV0/Tal/mSHCqBkHzef/JLEIBZqHlMeWw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxaWF2bC9Sd2pYaGRnNXFT\nVVBCcEhYcnEzZksvWXNRQ3N5dTlIanlRbVdVCkorSmhOTnVSRW5mSjRvcjNzNkxM\nVjhqUFV4TTFaNkRSbkhtQUFuc1lnbVUKLS0tIG1GeWdjRE5iMmdBOWNDajZPQndG\nKzNCWncvNHR0VGRXWm4yUTFEVEFmMGMK1hBbY509oSozDO3SyVki1n2alqXABlI6\nUGvWCYKgxAyNB/q59N2NCKxaxQNkvaV9joE4W/RKWGY+exr+Kj6iUA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHQkNYT3N2aHVvb21mR2hQ\nalVyM1pOcTZBUVNiKytzbG03YVZEaEQzdlNnCmtrd25oaGV4RjVpby9qQTh1eVF1\nTGVPY3Zwcm54OWx6a3JyOTJMb2RhWHcKLS0tIFMrRjNicDQvcFpHS1d5M0lKdmZa\ncUxyektmOXFoUi81QVlkRGZ0dDJhM2sKepu5HjfuD/CFwNkStqP+v2/S7AtGQAjt\nxyHUTKlWM+VOrVWh7Mta1FIe6+Ig6QikG9Ev4OFV8tF5T9XDrodKqQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLa0g1MEZZcmxhYjdDRFR6\nVUlrT0FUcWFWaWdaY3ZaT3NFbTg2SzdNdDFFCkp3czF2L1BaeDJLMnFvYlh1RXBD\neDdtK2pGdjBzS1FVMkdVZWlTeWRmYUEKLS0tICtJdWFnVkVoTUxIVFg4ZFd4YVFo\nSkQvT1ZETHRuNW1sZTBrSjdHcVducFEKdMTK9nfVK0dGnudz+TVGrp93sbGe8EeJ\nlsZUtQe0m6AS3SP146wObplYoUagC9/NHKJ2lIQcdsvLrO6PgugETA==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-06T21:22:25Z", diff --git a/vars/per-machine/frues-pc/tor_tor/hs_ed25519_secret_key/secret b/vars/per-machine/frues-pc/tor_tor/hs_ed25519_secret_key/secret index daa42d3..bf6fad3 100644 --- a/vars/per-machine/frues-pc/tor_tor/hs_ed25519_secret_key/secret +++ b/vars/per-machine/frues-pc/tor_tor/hs_ed25519_secret_key/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:gE1RN2GQ1EAHK16Gz9J8SHMpbmHyFEDNA7r/DSUcp+QkxBELDieJKO+t1FA736A50gVRapR0+qui7XrUfjfu5aqVJUYQPtGCUf8ZXgYpLid9+DDKqekKDdNZhQXBhi3/,iv:hcj5+TRje7o3vW85hGOlTCGA6Gh2EcXms41a9Vx/VHo=,tag:4cNJw55hGfx2xlSUmHwTxw==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjNkc5VVdwNzZSQlh2QU9L\nd0c3OU4yQVA5QjdmTjcxdTZybTU5SjNYT1NRCnd2SUdRNmdGYUxTQ2cvbE1IRUhy\neFFBbFNxZ2Y2M0oycXZIWlFyeHd3VVUKLS0tIDYvcU5LdnVoZVJscWxKVmNxbkJ1\nbnZsWCtTWkxaM2Rhc1ZUNTIyR3VFY00KDI/3mi24TZyE7orRCpcBKn835Yp/VEDK\n1LgzwXQMU5n2uBkyuwAHbH0rNwg8WbyWiawpPl/hcKtFHXu98p2qJQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age17pu3mvhwlvlffhvu2p4ut4wx60j6srdmjtk3889t9cs7jp60ws5qsc8myu", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUTHVTcWltWlNnOU5sbndD\nSnZ1T1l5OVpDK2NDSHBKSmFGSVhockJIM1NjCmY1NzUrazNYWHM4ajJ4L1hJUm1W\nUHlQUVFBVFVYNzlReWhVL0RRdHB1TU0KLS0tIDN1dit5bHdleXJxTnJpM1Q2cmFV\nVC8xNU4vZXZ1bjNCc09GLzRBVFRPdzAKn3FacqY2a+mdcCauGrfPOfoggEkPKwiM\nu8fkNgUgEIVXf5omcutT8mAydRTRUGar6cFy4CHUakv2HvxJ6Jg4vw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBQndob1hXZTdjbUZrUmxT\nRDBxQ1hWSTJOdktnUWRIQzBKK0FWdFVLdjB3CkhRdHJ1SG5pcnFVLzhERnA1V2RE\naFg4cGRSL2xIS2w0dDh5aGU5dzdCcDAKLS0tIFR5ZTdjZXk2Y2c4Zk1mWUpYbWFo\nVjFWMmhzK3JJQU9GcGVwTXFGTnpjQVEKed1NM+Jg+TYKFPTDd84jy3Ro4EQkf5Eu\nI/aHXKDaoE1+g4oFvBbtfWeg0HlTJxSYviMsQ6Xv2fOVxSP7C+V+YQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWZHFOdER1SStCc3dzVnlp\nRm9Qd1ZmYXhxM0VqT1VCRmF4NmErUVlSWENZCng2M2pOT3VDc0ord1J1bkI5OEV6\nYiszYU94OHJpQVZqaHhONEtwNkJxSFEKLS0tIEZZWHRwMDhzdXRxckR6WTgrQUtR\nNlEvZGJDUDE4eHlIWmppM05XM0Erc00KVYftdzj6yA6CABi5EP6BPnuGZLDmeszM\nhyP7YsyPlUxsxMkvIK/usY9OqaRShvr7a0dRfqh7K7T+pfBgMJq1Qw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnTXVhSU9jdTFRTHFZRE5V\nZnc5b0pqWjVyaXl3cFNQYW8zSmNEM3VpSVdnCnNpZzRFb3ppT1RDN2txV0piUlhJ\nR2ZFaWtHNGQxT1RxTllQNGl5eHpwVWMKLS0tIFJBUmFZMjRYTXJrS1poWXl4NTRa\naEtFd0JVNVpnMlgyMG1OSi8vdUZyNUEKrsx6lUsouS69ryAKQZ256V9xg5QZ7jr4\n8B/vNUNAQPcL4+ZWZJU64xOehHvLW8emThz6I+9vt1MSptIZ0i10bQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-06T21:22:25Z", diff --git a/vars/per-machine/frues-pc/user-password-pedro/user-password-hash/secret b/vars/per-machine/frues-pc/user-password-pedro/user-password-hash/secret index 07648fa..c255d24 100644 --- a/vars/per-machine/frues-pc/user-password-pedro/user-password-hash/secret +++ b/vars/per-machine/frues-pc/user-password-pedro/user-password-hash/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:c41oClgy7T+PPK1BJ2yo6iDyPNiAZzvVOPp4B0E8XOQLoWBZ1NNbxQcnGUvVtTgDVRF1hnZEJHVeRks0+RSJ0sPBHr5J5Zd2Cneq13i9l65ld6tAxgoDERdtJxVbFlpEVmv+bxh3LqGjjA==,iv:wASqoZnY5teiznOuBFvviKdtchYvYzCLw8rW+Ow2NA0=,tag:iuhPuO538HV/DJ/xEeT5Og==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0Yks3Y0dnNDcrUjlsMDJI\nNk5qSU9PYVJpZlVuUlVYUHlTZjdBdzdHaUNvCmhPYU8xangxakl0OHdVYTk0TVdI\nTUNlT3ZuOGs2dzd3ODRFY2FEUllDNFUKLS0tIFB2NUdiUG03OUc3bktzaFJFUHp2\nd3RzN0xSWWNZcTlIYklXMU85bFZZZjQKsFX9adonx59wLKKN1fsKVorEayWbYjKk\nGBmbB8sureZfjE3n7mTPm8qD6ratVkN9Fg18Je4Y1j9HkqT7lXBP+w==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age17pu3mvhwlvlffhvu2p4ut4wx60j6srdmjtk3889t9cs7jp60ws5qsc8myu", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDUHpKbFdDVjZpTUJ0Nkpw\na3U4S28zWCtkVjBUVG4zTmRoRFk2Y3B4bUZnCjM2RFBwUGl1a0FoTE5pR3Y5eEF2\nalZVdGF4WTl1UjhiVTk0ckFCN3Y5bzQKLS0tIElNdzBjVVBpZGlFcjVoakZUalMw\ndUFOWTRZM0pSa0MxWHc3TG0xOSt6TWcK1uPGeT/SCvfWn4FjrMDtW/HWOZkAh3mw\nVFtBSUKaK9d4z9inEeQmRCDo6X1z47gBonzhTqvC6CHVSM5aVPbluQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3NUpsVUZyY1BQeWhVUjdo\nb3hpVzZHYUZFZTNlb1FlajdOWGNyeEFNa1dNCkI1aHhMVCtHRmh2Z0tNK2Jqcy9M\nQlRhQ0lVeE1OaGdoZGVwVmV5WXlZRWcKLS0tIGhGVG92VzBWNVY1NzZ1N3VTNUtH\najBLMUYzOUJYemd4TmtVeTdCR3RTUmMKeN2r2x1T12v40r9daWzuXxN917+Vinj5\nNqh3Uk9hWCEMzMbkIIwZ13vFhot95H1+BpdyDGUJLJXQYhh0CpQq9Q==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqa2lSSGdrbVpjK3BTcE1R\nQWFaR2ZONm45bHNvNDc2UEFTci9UM2JVNEFRCllLNHpnOFBTZlpNek0vcUZKS3NO\nQm82MWhyaHlRa2JhY0JzeEVFTjd5b0kKLS0tIGQwd3lIMFZ2L24wL2pLVVl5QW1J\nUWNVT1ZNd1ErZGJnSlpEWGxjbDUwRXcKXVqbxdJUsDsQYSgpg0Z/b1PEF5vSNmR9\nm8jKCMZXVEIs/Paec3kG92R3/m6xH7SMEEh+0tEQPkYKUeNkZYM5Hg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1ODAxS2JVU2RZOGlmNnh4\nQVpOd1pzeUppTVEzR3IyRXQ2Q2pxZ2xkb2xRCkZOcG1nV2svZzZlZFRUcmtQbGhh\nZW5RRFhvVXgrcktTUDUvUTFBVWNyWG8KLS0tIHRNVzR2N0RjNERHVHQ3Wnl6ZVp1\nUVJVQ3k0aE0rZm9IYk0zUkxtMHdreTQKxJf6E4a0mo7L0eJrq8yECOxBDZ+VWTcM\nAHlGtGXwra9uuw75PRZx84pChqqpilQc956YvZuEp5qb/HK+ReArKg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-30T10:57:11Z", diff --git a/vars/per-machine/frues-pc/user-password-pedro/user-password/secret b/vars/per-machine/frues-pc/user-password-pedro/user-password/secret index a6f3a1d..9172777 100644 --- a/vars/per-machine/frues-pc/user-password-pedro/user-password/secret +++ b/vars/per-machine/frues-pc/user-password-pedro/user-password/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:7VZtCsLJlYzRhtmJ,iv:d2IQ1xmCxPeEcFb/yEvo7vQ3/yWxCGDO/FKY4VYU4fw=,tag:NzRP4JyYloseBX/GhquSng==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqQ3k3RzJaeGpRS1FFSU1K\nM0wxR01JOFlCNlloQ05XdDArdENBOC9XTUFFCnB3eG1jUWtqUW50ZlBZS3hXSjl3\nOWhxUnNPQmx1YzV0MHBiSzVva0ZhSXMKLS0tIHlLVFdSZ1ViYWxrWXVBaVVzVStW\nYXl4SHpUUEREU3Z5eUxiM0FEMVExdFUKKae4xel1k9lTt/2w+kJMStV6pk87h5Ql\nyFVaJAMpJA5FfZDupqpnguQk6jO3vNfaurFEg/gCtNYpUx1Wc3+kAQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJMCt0dmlIbStuTDU3aXVK\nN0JrSjJudWhHcWFpWVR5QVc2eEdhR05ta3hzCk8wMUFzVUNjRy9OcldtNjVCdXYz\nZ2pRcWlPZml3ZVNMVzRDRmM2SGVxek0KLS0tIEdRWkZKcVJYYlArYU9hWE1yVlpP\ndWs1ZDhTd2NaVEowNjZpc3RxVWw4YkEKEHTQnnoNzy9wZRC29kDgn2WPQCIxF853\nHsOv4uohIC8hySc4D/cryIMOVlaBEc+3O0JeBMvEhBNdNlqtqHavOg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiU0F1UENuZFRNQjJMNGFZ\nZHpJbEg1RHZtVW9UQXdVQ2h3TExoR3lUVVE4CkpSL0dvbXIvYXFLdHpodXZjTmpi\nM1RVS1UwUzZJRk1rdW42WmNTeHZBaEUKLS0tIHdKS2g1SG5mTk9MaEJJTVhmV3Bw\nZ29xTE1rZkpNZTB6NzdsSXNxUlN5QTAKqtI5jZi23z9UHurutRp0TVi65IfGzFam\ngTBHud+jrCAth5dFFYbkxF07jUXaS/kcFGAIyaP7ZFCqHG6jRdim5A==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-08-30T10:57:11Z", diff --git a/vars/per-machine/terrier/mycelium/key/secret b/vars/per-machine/terrier/mycelium/key/secret index c30c84b..92b6f2e 100644 --- a/vars/per-machine/terrier/mycelium/key/secret +++ b/vars/per-machine/terrier/mycelium/key/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:ikjr/qil5CgNd/TxtbyIISy1+WSIIjXjqqREDU0dScU=,iv:Hjh70ULKScfgV+9VFcfre//4iLj/zEF0AUfrGYITU3k=,tag:fJynZxzJaJTfqlg3crdAGQ==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4emZHK1g0a2c5ck9BdGgr\nZWVvNjJxQXZHVkVCQUdVZFlzQzZ5NXJyQURZCnRzZU9OY1ZnOUQ4ckR2bk1OdTc0\nZ3ZuWEpWZDVuWFR0SjlHVnNwcXE2YzgKLS0tIHozWjZxb3kxTWd0NjNLcE51cDlq\nK1A5RGxobU1XQnNYZ3ViNldDZTd4VzgKBq7KzTn50VxE0RFwyS62DmUh/65YB5Gb\nlOkWKzW5Dw9TUBs5D3AIqUBJx6WrMtsMrlGbqWSZrvW9Hro7qYYGSA==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnWlhWVlNqem84Vi9YZ04v\nRVlKK1pNbnZrV2luZTdaQlh0YVArVDJkQW5VCksvNllMdTJacmdqZW51NS96NkYz\nTzlMdk9UNjVMUGVtN1VDU0ZVV1piVDgKLS0tIDQzTDFza0lZQ2hpc2JYZktRcEhS\nbURRYkJlc2d3S1lINmFxRXIvaFQwc0kKzWp2oUItqE2EBfGhRoq+XSocNMqDy8T0\nLCJaYiF7Rxecq6DdDTQu4DcykJQ6MzamqXEHSppolSX12PqduaSDlg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3ekdvTnhJL2Z5UFIxczND\nUkFDczIxQTY5aFFuLzhmM1RncTdlZnZxZkhFCmNqRDU1ZjIzTVJtelVvSGVEZ0xD\nWFlycDdpTkcydy9UQTBHdy9OOU1yancKLS0tIDBYYm5KTWhhUFVDMGZCNW9yZFB3\na3BvWnYvTXVCSkd1RHVTajJUZU5GZEkKc/1GECiX4n05yGkFnYsRzROk6lt3jK6q\n/GTIhK0ORuoK8LZQRe5q3M56IpJ9BhFsH7LkJ0LlrjAzyOoNtBlrZw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFT3E2QUpWZVdETmQrMTMv\nWHN2aEVacnZrcjIrS3VZQ0grRms5Uk5xK1FNCkI0dkN0R0tWYnNKeUxOdEdGWlJJ\ndGFyd0JPTjd1WmlELzFBbFAxcTlhdk0KLS0tIGc1YlBYSHFPUy9OM1NVSk95SUtX\neTQ5YlpVSE04eUJmMGl5ZnNxbEIwbFEKPR/VG/YUo2JviDb2X8Pn7bAu4oJtq/UH\ngaFHpYw7UmJa2EC33jm51V+sY+IP9AR6MDiabQw9f6AtiF2KV4mOXg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBubCt2N3h1dDNSYVQ5cWRC\ncjVCMzlIbHZtS05lR3R1ckhxMFN5cm1nMWx3ClVZaTVtZktLbFMvcnNKUS9FNW9s\nSDFHT3RMOU9mRXBKZEtDbVFFa21qMTgKLS0tIFlEVmtJN2RUMkl0MkpKMDNSazE5\nZ2lpcWZUOE10cHJXWjF4QURubEs5a2cK3TTOygFKVkQG5GoOQ+/PuTkX0kLRSjyt\ngA988KRfnyZwofS383M9/qpDsRblKofkl0KkCvH3D3RYX3jeiWx58w==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:39:53Z", diff --git a/vars/per-machine/terrier/openssh/ssh.id_ed25519/secret b/vars/per-machine/terrier/openssh/ssh.id_ed25519/secret index 7c74b0c..e2808da 100644 --- a/vars/per-machine/terrier/openssh/ssh.id_ed25519/secret +++ b/vars/per-machine/terrier/openssh/ssh.id_ed25519/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:6f2y+qVBC821ZL96BS7WHccd8jigPJcZFK6XAtjTlJVVNAl3pNlmNsFh5NMNrkTE4r2K8CCL+4HS5AtJXNM4QnuvHlvBaqUQIyI4Aq9Lmw22R91u//rgI8wdG7/sxrXWLzd7NpdieX/gwQO13ZmuNE0QyuyVjQAOFVvaE//WXMt7fGCOw4sj59Z7PtbbsIwyYO4pMLz5PfcugCHqqsoVZ0QuGPaLLm9kUTIHJmiRr93wCJKEJwBxasIouzhQcOwHez9ALQZQx2T8w5Js5YkXiNg/0Kt30LHUQDeXorP5fb5CDzv+p5JxevhDvyAFLtgITpK0fd7JBmqLcU8H6/KUK644CgfFA+RER/n6DZI2rj2yhT+zo27tRbME3DAxNgCda/cY8ncWHWjPhfzgJQ291a81mF+QTQS1hQx7R/sZOYh18/rGznS3KmzpjYAcErUgeuPq6dZlJ0WUms45g15dTXY5pzekG6qj3n9DEX126kJQ+Bkx0nXGTUW2/SIGdyrQcTeL,iv:Z+k0gLOmstfVlXVBsT5nvhXxYMlCuW938nt2Ae7nr2c=,tag:JQkcdZi9UUyxNitlZwFoug==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4V2tTTWJHMnRsb3ZxenU3\nWlJNbXJMMGNKaldMcE8vb2tIeURZS1JHdDFJCndDem1CQnJ1d1NxL1FMeHZ2aG12\nTTBpVUpmenZnOUltcTBDSjhNbzRXa2sKLS0tIFVaK3ZLUXpRcm9DalBvY2F3UEwx\nYnFtREZtWUp6RVlGV0laNlNPbFJGaWMK242oQgZ9fhatSwk7A+0QBAgcpHYauxog\nE9bv3tdLaEzmoeld7KMhSPrkOVyypB6H+VLazRZc8R4oaQecZrdgSQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjY3NVTHl3S2JrZmR0d0J4\nekJCd2NSMVNMYlh4T2o5M3FXNWlKSGo3WlE4CnVnWG90YmdCT1hvWTJxZEZ6WkZt\nbjZmUlhyZzBNS1d3STVhMDZQMlFxdzAKLS0tIHMrZFZabEJKRWpzRVBFUWc0Wmhy\nejg3WlN0bVcvOVZRbGpyY3BSRDRJTTQKSdtKFVnKVZJs0j4QW9ZWjQLC8itZJb93\nwYFrbXg359Il4OeeNOpG+EFoh8spgLtONHwGu2Ii1tNA0v7jMFQwjg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTVlRXaFFSOU80ZHVUOWdX\nWVRtZnNEb0ZPZVp1aGROTG5NeFRjTjV2U1hNCitjSUNrVnEvbFJ0M1FWMmJXdlFw\nVTZQdlZSeExFaGprZkYvN2tiZlZkcVEKLS0tIFhBWEFKTmxtblR3SURlTTVac0k5\nS0x3SklOanY0aGNCUlFIZlpaZkZDRlkKTgAea8QKTMV+k5eIcJMRtFRfWaO6bc9U\n1CQd0QR2sYudDCy5DquU/tntfuQmTb1ny/sUoMZGg/fL3M7ekouJMA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNcDRCekRtS2tXMXAvREpx\nNFNJR1lWWHZXM3drUnJqOXVUbHpMLzdNRzEwCjhtYTNoQnZvVkFGM2pIdGx3YXV1\nZ0hqeGRMaExlZFJFYXJBOFpQN3RaUkEKLS0tIDNacDdpSFZrU2wyUmwzVmxodkhT\nYzRCK3hKcnJQa3pNNzduM1dBQ0V0d1EKOkODTXvGhIp9i8a0z19Nr34MBRESY3st\nqIQBHPX3pKW+o8IEknhMM/cPS+9Rtwk5TCy5tfkuI7P237Esu/TCyw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxWFAzRlNvMndqV1V1anFK\nRE9IVnZ6U0J2S0U0RkJzeTRETGp0dEt2QlNzCjBUR0VHUWNQMU41WXBMRTUrTzFy\nbE16aVpFRjRmQ3NkOHlYcjhrZWkyYVEKLS0tIHVSakhtbUZHdU5TOURCNldyNC9k\nWWxUaUFBbjB2UjVKbU1vWnpIMmJGdWMKyc33WvLfqHv9CkYgVbwtidZf6VdHUaYE\n862neb9u6eJyASH+PbIMvJMpWbAKdODNqUi10nZcRLyWGlL9RYDA/Q==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:40:01Z", diff --git a/vars/per-machine/terrier/root-password/password-hash/secret b/vars/per-machine/terrier/root-password/password-hash/secret index 942eacd..b2b24e5 100644 --- a/vars/per-machine/terrier/root-password/password-hash/secret +++ b/vars/per-machine/terrier/root-password/password-hash/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:ZWNpk2lRQtrKlgB28q9TGdqErJqWc11W9eDRWSxWYm5vb9yEcrB1qfS5EKCWw4n/Tyi7/iqTwnmRZfsjexoWrSMl1mkHwG+BV0jJFW4OKe6k6wH3TXtCKqyT6WIMojSBO5fyqcW2IoOZTw==,iv:lA2zUetHPWrJ7wJKqUWiUxAZ5+8pamOeYMOGrdW06DI=,tag:IB9CfjmxHVA3CrHzUoo7hQ==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5ZWZlWVREd0UvTjh6MXNJ\nRUllOTBoL0FZS0lZYVNUV0xSMkU5WjRTaEdNCmFEY0QwRjY0TFd0M0I0MlpGS0NB\nVnFtSjUxVGpGcjhKVFc3SVB4S1dOQUEKLS0tIHQwOFJ2L1c3QkRwd2x4TGZnTWhT\nZHh3djRnaW44eGZQYUxaSkZyV3llU2sKJGmEvFN3UqT3U9S6X/zbdhmUhufAUc+r\nt0tX2IT//0nhue+5SVr5M55XyrjaE5MYoRGwlFJlcyp4JHLNVIVCEw==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRVVpyeFc1SWlZUnBwR3gv\nQkFZYnhiY2YrZm93WHg2Qmk4dUxQenJoY0VjCjF1VXp4TVVpSEFONjBxTzdmdVJa\nbmdrT0RPSFk3SDdveUFSVy8xMnlXQWMKLS0tIGtSVXc2cWJWTEhYU2NsQkdwVzRV\nUStnWkpmMUErRENOYnVkNzFOKzJGdGsKoMMovOYk2Vsz8fXNLwJVCzxdV3/L3iLM\nk56cjrTRzgMkVynUDfz5M42bCrZZZmjcsyYlTLVlHWtLTTNZsXU6xA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYR3Z3S1IrVXFGSnJjQURC\nQWdtbUcyNk92alJqZ2VwbVlaTzgxYi84U0hzCjZoZGVyZDBuMkMvZmd5MDBNWWND\nZktRMUdRbWRSaGdaV0pxS0oyNkhoMmsKLS0tIEkyYngzWVNxekVIWFlFL05Ed2FK\nYkVqVmZtUm5SS3JiQ1lKN3R0MGl2UU0Kc5e4C0nL7EvWOaP20X1EHpp5CmyV/RDc\nhhCpZPwg0g36CEm8AobXtB0NU6Ds4h/YZ/YpPIPaQmEV75BlWMbTHQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkUkxLdllRcXRqb0ozeHRN\nZU9hQmlLZnhqSGVlNlFOZXVUdk9pdyt3VVNJCk93TXFKNlFJc2tLTGRzUEhUV1gy\nbGtOY2JhT3A0V1lEMXNXaldOUjEvdTAKLS0tIHgzblVLUmJ3WnZLWW4wblRMNnhv\nSkRnamp6Y3hmZjRmZkp3SW1Sb3ZiRW8KKcCUKjVmRIVI2e/oyNtRHnjVsxk2xAbh\nOWTMmVPfVTTYVgr1njHD3Dzw+xXNVy1sFpFtyik6JL/7sli4v8vGRA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2OWRUSzVQRkJOSVhzNTJE\nakg2ai9BalJOU0VxNURXZmo2a1dLWWVvVm5JCkNnN3A2TVVrN2FUOUJXWGxqU3Vu\ndXlIYnRsc2hGWTJRUSsxRUlyb1pSNlkKLS0tIEpkODhKVlBiS2xQLytYZUQwbFJW\nRUQzaEk5K0xrSnRoQ1pYK0czVEQrQncKVkhtjvlP83BKubfKMua3EVyD32sqeTzv\nGpQoef3X3q2LWaZW+mK9YCImegaHEQMiy4PBtA24+We9RFC5rVT9eg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:40:15Z", diff --git a/vars/per-machine/terrier/root-password/password/secret b/vars/per-machine/terrier/root-password/password/secret index 87de57d..a4ab3f7 100644 --- a/vars/per-machine/terrier/root-password/password/secret +++ b/vars/per-machine/terrier/root-password/password/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:ycS8vD/QZatRLWPVkQ==,iv:AcecRa/HqenCUzUxjvApPRkL0zTt596kpQwXdckvAmk=,tag:/7QueNOcBzHu7EWMzFO4aA==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZTjYrcFVlbDYxeXZrNkhp\nSGEwZnhmZCtuMnNWSEhaZkRRTkJ3MUVvcW5RCnEzcjl2dk9GdVNzc1NuUzQ4ZE1v\nWTB6Q3FXT0hCZTF2QzliQVg1M2Y3RFkKLS0tIHdvZUsxb0dSMDRrekxPcXArbENo\nb29wMDBKUy9aNkxYbldaOUNhbk52QWcKQAhcTyZ0H+1lZXQjPa0rc3kPvmOg8gVz\ntOspPKoSDotE3MdmnzLOJ6W3WxxBOQKyLTj4w8M3svDtNFJpKkbTOw==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBONjErS08xWWFaTzZQdUZR\nR1VpUEg3aGFzUXo0YTFJa2gzQytiQ3Vlc2lRCkx0bUxNTm5nQUFpbTloVWN5Rk40\na2JEOFNKc05HVjZBdzJ4MUFYZ1BFL2MKLS0tIDN1OUwvZlM5UWs5R0NROU1LZGNt\nRjFkN1RmeHdQaFh1MTR0NjJHZDF5dTQKxP3InmIwYpLYUrnQol6c2ZDdj6OHWPEM\nQIgiXxrgGIIncDqMNdffmPfNE6TpI/ZjHdlkqsZSFrpA/A71LW8BUg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDSUZGQmtLdEZueGpJK0Y2\nbzlkT0YyKzZoTmZDaFJnZG4wbkJBaHFDaVcwCkpTakRZZUlzUUJjdDdEdGJ3Y2h4\nUEtCcnN0TlVtOSswNWk2RGNUTzEzeXMKLS0tIEJWb3VLTUlTc3R0MExyUDBpNkxI\nK0NHdkxqNldwa1phZlJjKzNLWmZ3MVEKMsqniuM0edfSA8jeWkXiO1JudGUr4lVS\nEolp4VZFoyCdDSS5aaZhee2zGEPT8dMysOTFp/3fnomGCmB7o+pMNw==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:40:15Z", diff --git a/vars/per-machine/terrier/tor_tor/hostname/secret b/vars/per-machine/terrier/tor_tor/hostname/secret index 8f679f5..1be8d27 100644 --- a/vars/per-machine/terrier/tor_tor/hostname/secret +++ b/vars/per-machine/terrier/tor_tor/hostname/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:MuMj6+fa5l4Xgm31vnMfdUe8gajyzPKxHc8Suii3joByFYGDt3FOjVhEsVPFNfnV16kgcLEK5S9ualQ9aWEe,iv:Ifq59WbJjaQ9ckoy8/v5JamP/ZAunVV0hlctOq95wZs=,tag:f9TVwB+M9zheoEYleAuaHg==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxcENIVGs4THhWQXlDdXQw\nMmdJbHU4Z0dkSTZjeDcydGUyWWlObTFtMzN3CnVGM0Jkdys0aldGbHVZZlJjWklR\nZWNnRUVURHhmUnFSUndmUkRmcnl3WWMKLS0tIDdFL05VN243VFFXOExKc2ErVnF3\nWHJnS2t3TldQSW8weTBkZTRMc0NhcXMKPc1+BFPMc/PQrqR7MJX7Qz4CZpBQ2EmG\nctUCNis//dVwhtFSw5Yjrj/yLoK7LO8J1UncGIH7d1hTyY4d2jW6fg==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnckNnTGRVQzNaYjNCamlP\ndDNQSDFSRFRMZWlMSHFiczRXQUNzM2tuWUYwCldzQ284RFFkWE1oeWV6Y2UxVjBr\ndzgvR2dveWVvZ0dLamJ0Y3FzbURpR3cKLS0tIDVQVHUvQ1pjbEkvNHhjdHhqQXUv\nKzdPOW1Vby9hem0rZ2E5S3ZhcWQwdkEKPMgF48MnCnxgBWiiEizZPZFSB33FS3Zi\nlFfoP8IbK0h5qlrMvfgboT3gS+sN+MBw20PY2/YDZAkROgnEeduMCw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXd0I5QUZnQ0E0cEs5dGNY\na0Y5M080eXM5SExZYlg2amR4R3NDUzJha0NVCkJ3NzE3UFRGTVFSN2xFVWdmRVhn\nQW5KY0NtMDVBRkJoTm9aN2IvSkdzcEkKLS0tIDdMUG8vUnVEWTVFVm0rekZWM3Bq\nUzZqL1Vna0FOazA0Y2hrV2l6ai9yUmcKY68kqchdwxUiTuDWQGemdGtoL+0DwbBG\npjwxdHs1kvgoDBEqUpFBNxJ/dDvbwvF32ti4h85VDupR27HiS5GfPQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5d2I5SjcwWTZNbGEyZXNs\nem1jWTBTcFdRRXNtZG5QRFk3dHJ4VG5DYkFjCjZQZitLekF2RTk2bEVldWpNTThJ\ndGZtbUtmMitLUHl3eEttVDJhV1hUdU0KLS0tIDlsVm5tZ2tZeVdWaEJGZWpxYlRt\nbUF6RkNQLzNMSVVnSmxCU3FESFprbFkKrj0uvf4STPdWZ5ZaTeP6bdfHM/ethi1Y\n9JaII07nnOaBSA1UgcQRkICETXEAk2FLdbwSX9j/Haft20Os59z2sA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtcGJWa01DamZxWDBla3Br\nbGI5MlRNOVFHS3VMUDcrZEZQWTFHeThFR3hBCmQ2ZUxnTk52UHIvaDFld05POExx\nSGJZbmhBSW1BeUV6eDl3MHZLYTByRjgKLS0tIGRtcFFsMnYyRDl3Uk9IWVV2TEVs\nY3BtTjlHcElzTEN2VUlrTXdIb1VXR3MKuwEoizpgZlTqakIAYF/r3/B2x755uQPc\nx+uxeGO1LvsT0I4CHJiEa2CpLdjoAqlLMe6EPKkLFbUdib8QkW4l+A==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:40:36Z", diff --git a/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/secret b/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/secret index 1d4196f..d512449 100644 --- a/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/secret +++ b/vars/per-machine/terrier/tor_tor/hs_ed25519_secret_key/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:PZJsSoXBSIUQJG2THAAWWrLOYln3IuPnnvRvRmvYoqAEo07EPuDtTM9coQFVnYm/LZrpn9Jatgkup6hEggmHBoESmKPHO6zYmA0zcnwg60wN7DhIHzwxPZWGqifAQXYD,iv:2NTBZRJ3wLfL4+Bh7TTniq04FpVu/8dh68+11rPR/dk=,tag:O6G769WqJuYKbNoTuHj0KA==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKRHoreUdkbFYzaytDb3Zm\nVlVOaXV2UDUyMlp3ek0vNjFFOFJmYjVYRW44CnFKaS9mMXora3VjWlFzQkZaUDNJ\nRmw1a25SNHFoMGJ4U0dKTE95aWJMZGsKLS0tIEpLaDZsNnEyVmdMUkVoMldod29i\nK09pV1NGWkJVT25INEliQm8yMmlJUmsKe2JvdCsgPKgPIDRCDuBXs8lqGiFHUnak\nGVmvksqk5cyAJaNi0pBm4Idlb2DPkVgkaOUcYEy2hQMgm6wdjqOK7g==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKRG1HakV4QXhOOXg1SWpP\nTU9pMGRFaS9JN3ROTmNvOUpsWjZXdkVHQkhFCi90SCtBWmxYeERZaFFMMWJzUFo4\nV0NsaEM4cHdCdW9VR0NMTE01WWxDSGcKLS0tIDA1Z3BkcjJFSFpSNUdNb2ptVGJ6\naisySTBuVWpyOGJHY1VWdWNUVGcxNEkKZKCA+l5lrndXb9TwkAGc2+t+UZB4SNT4\ncvpmVx9aoiwtfswB/orh8pA47mTKVR4xadNvTSv9LgPcbj7PtZsEXA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBITEVmK3hIN1pRVFVZWjBv\nWm5EclpSbkdLZ0lmOFV3Z3RSeFREb1grUDMwCmsxeWVjbVRHdzhWbjk3Tm5PQ0Mr\nRVY2cVVCVTV0L3FWNWYvMEYyakRRK00KLS0tIEkwMDd3cTUwRElUZ0YzWkJkTHoz\neWFMdERBY0R2cUZhUkptUVRralRYK3MKgWLR+qgFZ+EDVQxXGAnEsd1TdtYL8ten\n4HiI10rl6gsV9FazLkBeP1ZwyaW3UhqqlYgvDPKPxsIIDWiTDmF0Gg==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSQ3dWUWc1d0xHdWcvQ0Vi\nTldhTWUrbCsxTzhVblBBL2VrQXd3bzlsdUdVCisyM0NrZWFrRkFBb1B5bEZiZ290\nQ0wzM0xCRmdxcTVlbHVxM01OcExMNzQKLS0tIDJqZ3M3Z1JmeXhBK043RlFxRms3\nWURQMUtrbHpTK3ZDWnBRZlhYenI5bjAK6rzXM9Kx2R7oBd4Ht8/pZp7fbMl0oNi4\n4ZvywW0vRr6emWcqBrsxJuM7c3utNkOHRVrGc93seNW7UNimXdEIGg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHQTZSUm9td3BWU0ExZXRP\nTCt1QWJ4cXJIVXEwdmU0UXhlcURaeWhGalVjClFFS2pqTlQ1L00zTENsYlQzZmx5\nR2JmUXJnMXI3ZGIzKzBpQ0tBdTVjNFkKLS0tIFhtblBibFlKUHlkZmNzT2Z5Zml1\nbkRPME92NmsrM2tTNENyalVDcEdTMlEKXvItIFRll6mEpynse8Y910G7eEXNUjd6\nWo1G+/hUTw+AnVv2njPPhvbeTeT2z66LQ2p8jE0Ds8YK1Cdk6+k6Og==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:40:36Z", diff --git a/vars/per-machine/terrier/user-password-pedro/user-password-hash/secret b/vars/per-machine/terrier/user-password-pedro/user-password-hash/secret index a58af13..2a09a53 100644 --- a/vars/per-machine/terrier/user-password-pedro/user-password-hash/secret +++ b/vars/per-machine/terrier/user-password-pedro/user-password-hash/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:/KcnApTQ5uJL/B3zutzZrnaYLj0p0GG95TPOedE+ygDKNz8K+ZVx2+Ff8ot7ZndU2H44brXVJxiKMzJd1PxVbsMcmPSSPjA7jt852XA9g4KOed31oN66PoqBcGwCPNwn/tPmk2L/qJ7nUQ==,iv:EXGc4SDh/yu6XsntGyljjGHQzmB6cVUqEYd9/ulwzwk=,tag:nCikdporPCoJ2voKRo5GOw==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2NC9OM0hGZiswemcyTk9P\nTnhUTU9pUldvSlMxVjlETnlWOUN6bGVRcEFnCmJJYkRndTNlZmt0NUQ1UE5NUEpU\nWVFmUlVFTVRpay85cURhclJSN2F4RjAKLS0tIEJDUWNGLzV4QkZEOFllUEZrbkZy\nU3VBY1FFWFB1azQ2QzFla0lJM3g4KzAKXHbnH0Hr4CG8bFgmNs2VwQHTwoyzpAba\nyIu9S2WFLp5BnUQ4mx8nqsLxlwkUkQcGDOXwHMoYMnnBJQXIsxCh3A==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1lu9nh7x906g906wxx8luze68ae44772mkx0n3wsd58pvtzrex9gqs09f9z", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRZWdNcDhoczZlTytMWXhH\nb0NNRDh2LzF2MVdKeUlLUmI0SzhvZGxMbkdnCmpZOCs2ZkZqRGE0UjhmQlFUT0ty\naDlCaC9ZdFJUZjdwMEpjeWZhUFkwSVEKLS0tIE9ENmtJSHJSUW84WTVQcUJZYi9a\nSFBvbUJNVU9YbG9IWXgzek4rQ1ZDNlEKBfDztB78JmPDL84X3NvNVcWJaaneOslR\nvG1eA0urmlPYqzrgABqml4H8DlIkWyTOCETNXVrDnr0Pit9f144Nuw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLRFk3Z0c3eXVnanF2VHNK\nYXptN0VVbzNwTk5yYkNlTU4zTkZOeWRJMXgwCmtsU1R2R0JXUzNiNFo2L1hnUjZp\namczdXRWays4ZW00U0NZUiswb2tnV2MKLS0tIE5qLzdOemo2eENZWVFXTzUrRlR6\nSWFNd1RkeUswY0IxaEtxNmNpbWkyNEEKzQNQyFsyNxfqBfNlSaUJ6TDuU7AjfOEg\n163gTGj/D5XGqwTpHNtl4peZCxDIck7hHchNla3f/8KaKavd/gA/UA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUdEY2TVRZWUpKMkNRaVpH\na1l1TW5PTm5HbW15RkhwN1MvWEFFVFIyQlZjCkIwdFo3bjRiK1BBY3JXWWwrOTho\nNEQwMEVkZ05WVmQyMzhLSDRzd3JHaUUKLS0tIFZMRmIyUlpkVlBoZGZXamIyNlRK\nQTBvUkFwa1JiTFhBRERiM21lNVJHazgKk/7tQ+ixMM7pLOG/b9sm+EVII5AD/28y\nUAD3Scq2KYz1eQD0+PD7sjQNiONw8FlCzSZ759voL5bg6XOfetOO2A==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIVm9TZDB2WTlZYmpJTTcv\nWkl5QU9VOHJUT1VkeThOVjErWnYvdUtVQTNjClp5N0tKdWlyQTNXcW5VT2FxT0lx\nTnZGMDhRTlMzREpEeU5KK2NTdUNqSEkKLS0tIDcrUkREVjRIcTQ0MFBlZS9lajRO\nNzBydTBFV3llcy9OSDh2RlM5MTF1QlEKuVU3uCX/T5h309w+yWpbgBOh9r/cInjm\n3PkfplmDmv7ZHmmat7UcVYtJSg3KvXu5Bcr8UplHkk7xYgPE5nQnCw==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:40:44Z", diff --git a/vars/per-machine/terrier/user-password-pedro/user-password/secret b/vars/per-machine/terrier/user-password-pedro/user-password/secret index 61335a1..faf1a54 100644 --- a/vars/per-machine/terrier/user-password-pedro/user-password/secret +++ b/vars/per-machine/terrier/user-password-pedro/user-password/secret @@ -2,9 +2,13 @@ "data": "ENC[AES256_GCM,data:ph8XYjAfpG5z3614DA==,iv:9SUnlpVIosWig7kKLCyZp/F2s9mO2bhu/q+WuKaTPZg=,tag:nBNDbUZaocvt2pXmahXt8w==,type:str]", "sops": { "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjQU1XcnV2b0FhVkFUeFJN\nVjlrcitURkxSdThTYW1FTGRsN25SeWtsbTBJCll1ZjlNbXFwUjFuOFk1ZFZMNGRj\nc0tUMjFFcHJvcGh0V1NBcFVOVWpQbTAKLS0tIFV2MUZrVEFvVmVwcnRxOFppZWNU\nNC8yYU9JenU0RkNnOW0wSnBUZzZBekkKoTPsndYvQ61sM+QF7DoYU8WLAjFDbwSJ\nRnmDCm3cFY4IP+wLrxrfgAilErZf0IbEEljBasJd6SO7Xu+0jXz4eg==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBENk9RVkYydm9tTTRURWJw\nWkdHQUI5WW8vVFhNNW52QlBoNzljQzA1RVRvCnhnZ2JUbGhITW9GODdqYkNCM0V2\nanFnRmhmTE9YZVhzdnNiSTNlL0VWNHMKLS0tIHZndElXNmJ5MkRxeTJ5SlZ6M2Zt\nYVUyc1A2Y2R6TEJLbHExbDB2TVNsdGsKSbyFIBbTpoZ4hZKjiK7KDB9oB7mOiaYN\n3uhwYXg7gmYzHXQNuZu75uKM1MWxKzqHSVuiDvkwiDkKFqFSDWBb/w==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBU3JNUUtVTlk0OUZ4OFc2\nMVZCWVJabUQrcTFzWlVPdS9GZTl1WnhTcWlzCjFNTWl5UFMyOXNNeUZFTml0N28x\nOGllRlZtd3VHTjBPdHFIVG14RDROYmMKLS0tIEtZZ253b2JENjk1UVRPQjRiQWYv\nRDJHVW5XRzQ5Z09rdXY3eVYvaGRKYVkKsEDiigBrz6sIo5fdnK1DE9rzKQcx0qZV\nDeRYwWFywyFGkHvxWj3UIGROPq4JNVlm6SLVdVqmc0zGHJv2y1EA3g==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-09-17T14:40:43Z", From 9edd4dfbdf08d8c0d0af5116645c0bd7b63218ee Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:20:01 +0200 Subject: [PATCH 10/39] new machine: terrier --- clan.nix | 3 + machines/terrier/configuration.nix | 33 + machines/terrier/facter.json | 1576 ++++++++++++++++++++++++++++ 3 files changed, 1612 insertions(+) create mode 100644 machines/terrier/configuration.nix create mode 100644 machines/terrier/facter.json diff --git a/clan.nix b/clan.nix index fd4937f..17cdbcf 100644 --- a/clan.nix +++ b/clan.nix @@ -8,6 +8,9 @@ frues-pc = { tags = ["desktop" "spain" "gaming"]; }; + terrier = { + tags = ["server" "headless" "raspberry"]; + }; }; # Docs: See https://docs.clan.lol/reference/clanServices diff --git a/machines/terrier/configuration.nix b/machines/terrier/configuration.nix new file mode 100644 index 0000000..e3f066a --- /dev/null +++ b/machines/terrier/configuration.nix @@ -0,0 +1,33 @@ +{ + config, + pkgs, + lib, + ... +}: { + nixpkgs.hostPlatform = "aarch64-linux"; + + boot.initrd.systemd.tpm2.enable = false; # https://github.com/NixOS/nixpkgs/issues/344963 + boot = { + kernelPackages = pkgs.linuxKernel.packages.linux_rpi4; + initrd.availableKernelModules = ["xhci_pci" "usbhid" "usb_storage"]; + loader = { + grub.enable = false; + generic-extlinux-compatible.enable = true; + }; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + options = ["noatime"]; + }; + }; + + environment.systemPackages = with pkgs; [ + libraspberrypi + raspberrypi-eeprom + ]; + + hardware.enableRedistributableFirmware = true; +} diff --git a/machines/terrier/facter.json b/machines/terrier/facter.json new file mode 100644 index 0000000..7e21f75 --- /dev/null +++ b/machines/terrier/facter.json @@ -0,0 +1,1576 @@ +{ + "version": 1, + "system": "aarch64-linux", + "virtualisation": "none", + "hardware": { + "bridge": [ + { + "index": 8, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "14e4", + "name": "Broadcom", + "value": 5348 + }, + "device": { + "hex": "2711", + "value": 10001 + }, + "revision": { + "hex": "0010", + "value": 16 + }, + "model": "Broadcom PCI bridge", + "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0", + "sysfs_bus_id": "0000:00:00.0", + "resources": [ + { + "type": "irq", + "base": 26, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 0, + "command": 6, + "header_type": 1, + "secondary_bus": 1, + "irq": 26, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v000014E4d00002711sv00000000sd00000000bc06sc04i00" + } + ], + "cpu": [ + { + "architecture": "aarch64", + "vendor_name": "ARM Limited", + "family": 0, + "model": 3, + "stepping": 0, + "features": [ + "fp", + "asimd", + "evtstrm", + "crc32", + "cpuid" + ], + "bogo": 108, + "physical_id": 0, + "fpu": false, + "fpu_exception": false, + "write_protect": false, + "address_sizes": { + "physical": "0x0", + "virtual": "0x0" + } + } + ], + "disk": [ + { + "index": 15, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram2", + "unix_device_name": "/dev/ram2", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 2, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram2" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 16, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram0", + "unix_device_name": "/dev/ram0", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 0, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram0" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 17, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram9", + "unix_device_name": "/dev/ram9", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 9, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram9" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 18, + "attached_to": 10, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "serial": "0xdab60614", + "model": "Disk", + "sysfs_id": "/class/block/mmcblk0", + "sysfs_bus_id": "mmc0:5048", + "sysfs_device_link": "/devices/platform/emmc2bus/fe340000.mmc/mmc_host/mmc0/mmc0:5048", + "unix_device_name": "/dev/mmcblk0", + "unix_device_number": { + "type": 98, + "major": 179, + "minor": 0, + "range": 32 + }, + "unix_device_names": [ + "/dev/disk/by-id/mmc-SD16G_0xdab60614", + "/dev/disk/by-path/platform-fe340000.mmc", + "/dev/mmcblk0" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 472576, + "heads": 4, + "sectors": 16, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 30244864, + "value_2": 512 + } + ], + "driver": "sdhci-iproc", + "drivers": [ + "mmcblk", + "sdhci-iproc" + ] + }, + { + "index": 19, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram14", + "unix_device_name": "/dev/ram14", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 14, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram14" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 20, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram7", + "unix_device_name": "/dev/ram7", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 7, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram7" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 21, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram12", + "unix_device_name": "/dev/ram12", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 12, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram12" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 22, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram5", + "unix_device_name": "/dev/ram5", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 5, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram5" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 23, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram10", + "unix_device_name": "/dev/ram10", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 10, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram10" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 24, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram3", + "unix_device_name": "/dev/ram3", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 3, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram3" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 25, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram1", + "unix_device_name": "/dev/ram1", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 1, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram1" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 26, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram15", + "unix_device_name": "/dev/ram15", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 15, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram15" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 27, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram8", + "unix_device_name": "/dev/ram8", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 8, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram8" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 28, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram13", + "unix_device_name": "/dev/ram13", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 13, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram13" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 29, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram6", + "unix_device_name": "/dev/ram6", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 6, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram6" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 30, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram11", + "unix_device_name": "/dev/ram11", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 11, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram11" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 31, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram4", + "unix_device_name": "/dev/ram4", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 4, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram4" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + } + ], + "hub": [ + { + "index": 32, + "attached_to": 7, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d6b", + "name": "Linux 6.6.51 xhci-hcd", + "value": 7531 + }, + "device": { + "hex": "0002", + "name": "xHCI Host Controller", + "value": 2 + }, + "revision": { + "hex": "0000", + "name": "6.06", + "value": 0 + }, + "serial": "0000:01:00.0", + "model": "Linux 6.6.51 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-0:1.0", + "sysfs_bus_id": "1-0:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 1, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 33, + "attached_to": 32, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "2109", + "value": 8457 + }, + "device": { + "hex": "3431", + "name": "USB2.0 Hub", + "value": 13361 + }, + "revision": { + "hex": "0000", + "name": "4.21", + "value": 0 + }, + "model": "USB2.0 Hub", + "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-1/1-1:1.0", + "sysfs_bus_id": "1-1:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 1, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v2109p3431d0421dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 34, + "attached_to": 7, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d6b", + "name": "Linux 6.6.51 xhci-hcd", + "value": 7531 + }, + "device": { + "hex": "0003", + "name": "xHCI Host Controller", + "value": 3 + }, + "revision": { + "hex": "0000", + "name": "6.06", + "value": 0 + }, + "serial": "0000:01:00.0", + "model": "Linux 6.6.51 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-0:1.0", + "sysfs_bus_id": "2-0:1.0", + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" + } + ], + "memory": [ + { + "index": 6, + "attached_to": 0, + "class_list": [ + "memory" + ], + "base_class": { + "hex": "0101", + "name": "Internally Used Class", + "value": 257 + }, + "sub_class": { + "hex": "0002", + "name": "Main Memory", + "value": 2 + }, + "model": "Main Memory", + "resources": [ + { + "type": "mem", + "base": 0, + "range": 3963936768, + "enabled": true, + "access": "read_write", + "prefetch": "unknown" + }, + { + "type": "phys_mem", + "range": 4026531840 + } + ] + } + ], + "mmc_controller": [ + { + "index": 10, + "attached_to": 0, + "class_list": [ + "mmc_controller" + ], + "bus_type": { + "hex": "0093", + "name": "MMC", + "value": 147 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0117", + "name": "MMC Controller", + "value": 279 + }, + "vendor": "", + "device": "SD Controller 0", + "model": "SD Controller 0", + "sysfs_id": "/devices/platform/emmc2bus/fe340000.mmc/mmc_host/mmc0/mmc0:5048", + "sysfs_bus_id": "mmc0:5048", + "driver": "mmcblk", + "drivers": [ + "mmcblk" + ] + }, + { + "index": 11, + "attached_to": 0, + "class_list": [ + "mmc_controller" + ], + "bus_type": { + "hex": "0093", + "name": "MMC", + "value": 147 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "hex": "0117", + "name": "MMC Controller", + "value": 279 + }, + "vendor": "", + "device": "SDIO Controller 1", + "model": "SDIO Controller 1", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001", + "sysfs_bus_id": "mmc1:0001" + } + ], + "network_controller": [ + { + "index": 9, + "attached_to": 0, + "class_list": [ + "network_controller", + "wlan_card" + ], + "base_class": { + "hex": "0002", + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "hex": "0082", + "name": "WLAN controller", + "value": 130 + }, + "device": { + "hex": "0000", + "name": "ARM Ethernet controller", + "value": 0 + }, + "model": "ARM Ethernet controller", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1", + "sysfs_bus_id": "mmc1:0001:1", + "unix_device_name": "wlan0", + "unix_device_names": [ + "wlan0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 100 + }, + { + "type": "phwaddr", + "address": 100 + }, + { + "type": "wlan", + "channels": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "36", + "40", + "44", + "48", + "52", + "56", + "60", + "64", + "100", + "104", + "108", + "112", + "116", + "120", + "124", + "128", + "132", + "136", + "140", + "144", + "149" + ], + "frequencies": [ + "2.412", + "2.417", + "2.422", + "2.427", + "2.432", + "2.437", + "2.442", + "2.447", + "2.452", + "2.457", + "2.462", + "5.18", + "5.2", + "5.22", + "5.24", + "5.26", + "5.28", + "5.3", + "5.32", + "5.5", + "5.52", + "5.54", + "5.56", + "5.58", + "5.6", + "5.62", + "5.64", + "5.66", + "5.68", + "5.7", + "5.72", + "5.745" + ], + "auth_modes": [ + "open", + "sharedkey", + "wpa-psk", + "wpa-eap" + ], + "enc_modes": [ + "WEP40", + "WEP104", + "TKIP", + "CCMP" + ] + } + ], + "driver": "brcmfmac", + "driver_module": "brcmfmac", + "drivers": [ + "brcmfmac" + ], + "driver_modules": [ + "brcmfmac", + "brcmfmac", + "brcmfmac" + ], + "module_alias": "of:NmmcnrT(null)Cbrcm,bcm2835-mmcCbrcm,bcm2835-sdhci" + }, + { + "index": 13, + "attached_to": 11, + "class_list": [ + "network_controller" + ], + "bus_type": { + "hex": "0094", + "name": "SDIO", + "value": 148 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0002", + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "hex": "0080", + "name": "Network controller", + "value": 128 + }, + "vendor": { + "hex": "02d0", + "name": "Broadcom Corp.", + "value": 720 + }, + "device": { + "hex": "a9a6", + "name": "BCM43430 WLAN card", + "value": 43430 + }, + "model": "Broadcom BCM43430 WLAN card", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1", + "sysfs_bus_id": "mmc1:0001:1", + "driver": "brcmfmac", + "driver_module": "brcmfmac", + "drivers": [ + "brcmfmac" + ], + "driver_modules": [ + "brcmfmac", + "brcmfmac", + "brcmfmac" + ], + "module_alias": "sdio:c00v02D0dA9A6" + } + ], + "network_interface": [ + { + "index": 36, + "attached_to": 0, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0000", + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + }, + { + "index": 37, + "attached_to": 0, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0001", + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/end0", + "sysfs_device_link": "/devices/platform/scb/fd580000.ethernet", + "unix_device_name": "end0", + "unix_device_names": [ + "end0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 100 + }, + { + "type": "phwaddr", + "address": 100 + } + ], + "driver": "bcmgenet", + "drivers": [ + "bcmgenet" + ] + }, + { + "index": 38, + "attached_to": 9, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "000a", + "name": "WLAN", + "value": 10 + }, + "model": "WLAN network interface", + "sysfs_id": "/class/net/wlan0", + "sysfs_device_link": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1", + "unix_device_name": "wlan0", + "unix_device_names": [ + "wlan0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 100 + }, + { + "type": "phwaddr", + "address": 100 + } + ], + "driver": "brcmfmac", + "driver_module": "brcmfmac", + "drivers": [ + "brcmfmac" + ], + "driver_modules": [ + "brcmfmac", + "brcmfmac", + "brcmfmac" + ] + } + ], + "system": {}, + "unknown": [ + { + "index": 12, + "attached_to": 11, + "class_list": [ + "unknown" + ], + "bus_type": { + "hex": "0094", + "name": "SDIO", + "value": 148 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "02d0", + "name": "Broadcom Corp.", + "value": 720 + }, + "device": { + "hex": "a9a6", + "name": "BCM43430 WLAN card", + "value": 43430 + }, + "model": "Broadcom BCM43430 WLAN card", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:3", + "sysfs_bus_id": "mmc1:0001:3", + "module_alias": "sdio:c02v02D0dA9A6" + }, + { + "index": 14, + "attached_to": 11, + "class_list": [ + "unknown" + ], + "bus_type": { + "hex": "0094", + "name": "SDIO", + "value": 148 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "02d0", + "name": "Broadcom Corp.", + "value": 720 + }, + "device": { + "hex": "a9a6", + "name": "BCM43430 WLAN card", + "value": 43430 + }, + "model": "Broadcom BCM43430 WLAN card", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:2", + "sysfs_bus_id": "mmc1:0001:2", + "driver": "brcmfmac", + "driver_module": "brcmfmac", + "drivers": [ + "brcmfmac" + ], + "driver_modules": [ + "brcmfmac", + "brcmfmac", + "brcmfmac" + ], + "module_alias": "sdio:c00v02D0dA9A6" + } + ], + "usb_controller": [ + { + "index": 7, + "attached_to": 8, + "class_list": [ + "usb_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0003", + "name": "USB Controller", + "value": 3 + }, + "pci_interface": { + "hex": "0030", + "value": 48 + }, + "vendor": { + "hex": "1106", + "value": 4358 + }, + "sub_vendor": { + "hex": "1106", + "value": 4358 + }, + "device": { + "hex": "3483", + "value": 13443 + }, + "sub_device": { + "hex": "3483", + "value": 13443 + }, + "revision": { + "hex": "0001", + "value": 1 + }, + "model": "USB Controller", + "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0", + "sysfs_bus_id": "0000:01:00.0", + "resources": [ + { + "type": "irq", + "base": 37, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 25769803776, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 37, + "prog_if": 48 + }, + "driver": "xhci_hcd", + "driver_module": "xhci_pci", + "drivers": [ + "xhci_hcd" + ], + "driver_modules": [ + "xhci_pci" + ], + "module_alias": "pci:v00001106d00003483sv00001106sd00003483bc0Csc03i30" + } + ] + }, + "smbios": {} +} \ No newline at end of file From 1f712ec9e147a652a18882a05ec91312bae79ded Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:37:56 +0200 Subject: [PATCH 11/39] Update secret frues-port-age.key --- sops/secrets/frues-port-age.key/secret | 19 +++++++++++++++++++ sops/secrets/frues-port-age.key/users/pedro | 1 + 2 files changed, 20 insertions(+) create mode 100644 sops/secrets/frues-port-age.key/secret create mode 120000 sops/secrets/frues-port-age.key/users/pedro diff --git a/sops/secrets/frues-port-age.key/secret b/sops/secrets/frues-port-age.key/secret new file mode 100644 index 0000000..aabce28 --- /dev/null +++ b/sops/secrets/frues-port-age.key/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:tnd5xKKkw65dGmNgi6921SPCoM05knyXjt3ErIdZjmH2X8+7I+c5GDwTCGXZoAyLZHzuoS4JlRMOj99o0fnTXq+blYMRGqVvHWg=,iv:CesiE6jAFTDTiCe4TE+wNCQmJJ6Hi+d8BRoq9gt8V84=,tag:KnWlJxnSI/VaceZrPKlGAQ==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2dmlXWmJaQTRRVTNFVVF0\nOEpEV0lrV05GNEFIbWJNdVYwWmFyVHF1Z1hRCnR0Mk1qOE94TElpREVQUU5pM1BU\nZGJ5alVka2ZXWmhSZVd0c0g3WFZzSE0KLS0tIEQvbnFValpHdTQwNVh2SklQanRv\nZ2lYckxrbXRIWGxrd05vSDZhVnExL2cKs/V6EFlAtPcCC0Z4Uz84eBsy4F07/DoJ\nrWUOxqa5R23FP6Z2w/I1oZzsuIIOgX4sI42AcSxu9Vg7XrAcL4vyAQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnUzdTYkwxdnY5QlEwL3Bm\neGtBMUtVZ21zdHMyUW1KdHIvakVCOHhtVjNzCmNCa2RxVjhFcWhQTUc4UUM1ZUpy\nWlpvU0hHN21ZNnMrYTY5VERucDI0T2MKLS0tIE9NWFlXdmRHK2dXeWdqdTlDY0NF\nQzRGclQrbDh2bWdSS09OK09XWFhhazQKVzvb5qzHHzPR0FhLd7OVTYKjQb+iQcxH\ngs4RLKoXzfrkKRgSinDq3O5ZmIbVN4IZAMILfjE+bkzh1iPeWb7Yjg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:37:56Z", + "mac": "ENC[AES256_GCM,data:pV5VTv4DHoWqcb4SjBf8gyLfyQ5sJNRyMWoycI1GVRGCCFrzNbQgZuspIOACmqcgTfMPnKSjTljk9aZow8PtDnpSQJjPh3pEav7uFrrcU2ERzsXGn2s3SCEq8W3BO6n8AQDP0lUjzKIj/Kk6a26CNZUMg6VG1z6oO1L6a/FBPOI=,iv:2S960BoQPxs/DOWg688y9fRUwuzk5G9aDNUDTUIvQs0=,tag:rAlGlAIkjCkCYELOtt4K1w==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/sops/secrets/frues-port-age.key/users/pedro b/sops/secrets/frues-port-age.key/users/pedro new file mode 120000 index 0000000..c7b3668 --- /dev/null +++ b/sops/secrets/frues-port-age.key/users/pedro @@ -0,0 +1 @@ +../../../users/pedro \ No newline at end of file From 615a2a85355c2e3b5367fe3495344fe1a4298986 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:38:01 +0200 Subject: [PATCH 12/39] Add machine frues-port to secrets --- sops/machines/frues-port/key.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 sops/machines/frues-port/key.json diff --git a/sops/machines/frues-port/key.json b/sops/machines/frues-port/key.json new file mode 100755 index 0000000..db702ee --- /dev/null +++ b/sops/machines/frues-port/key.json @@ -0,0 +1,6 @@ +[ + { + "publickey": "age19grcgxeu95xnjtpaakcek36rjd9kzr5aqlak5m5gzmstwayglpmqyvhl87", + "type": "age" + } +] \ No newline at end of file From 905c455b8c9ae8a6a58bbf7b275bf6602d238426 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:38:05 +0200 Subject: [PATCH 13/39] Update vars via generator mycelium for machine frues-port --- vars/per-machine/frues-port/mycelium/ip/value | 1 + .../mycelium/key/machines/frues-port | 1 + .../frues-port/mycelium/key/secret | 23 +++++++++++++++++++ .../frues-port/mycelium/key/users/pedro | 1 + .../frues-port/mycelium/pubkey/value | 1 + 5 files changed, 27 insertions(+) create mode 100644 vars/per-machine/frues-port/mycelium/ip/value create mode 120000 vars/per-machine/frues-port/mycelium/key/machines/frues-port create mode 100644 vars/per-machine/frues-port/mycelium/key/secret create mode 120000 vars/per-machine/frues-port/mycelium/key/users/pedro create mode 100644 vars/per-machine/frues-port/mycelium/pubkey/value diff --git a/vars/per-machine/frues-port/mycelium/ip/value b/vars/per-machine/frues-port/mycelium/ip/value new file mode 100644 index 0000000..b1ecfba --- /dev/null +++ b/vars/per-machine/frues-port/mycelium/ip/value @@ -0,0 +1 @@ +51d:37e9:6bab:597d:c6b5:3c3f:6866:dba8 diff --git a/vars/per-machine/frues-port/mycelium/key/machines/frues-port b/vars/per-machine/frues-port/mycelium/key/machines/frues-port new file mode 120000 index 0000000..a686d31 --- /dev/null +++ b/vars/per-machine/frues-port/mycelium/key/machines/frues-port @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-port \ No newline at end of file diff --git a/vars/per-machine/frues-port/mycelium/key/secret b/vars/per-machine/frues-port/mycelium/key/secret new file mode 100644 index 0000000..66ad36a --- /dev/null +++ b/vars/per-machine/frues-port/mycelium/key/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:OudQBSOydxgn0MDoEiyPN2GCz0MPrArblYcWq+e0kwM=,iv:A0QArlOjnpLSrvld380SsgnAQh4T7gAysvxSckRI7Hk=,tag:jTvOniD6WvOC6PueLeT05g==,type:str]", + "sops": { + "age": [ + { + "recipient": "age19grcgxeu95xnjtpaakcek36rjd9kzr5aqlak5m5gzmstwayglpmqyvhl87", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0TFBpank4L01zdzhZWmtp\nbG4rM3p4aHoyOHY4L2dmaHhIY3NYZ3IxdEJJCjd0aExXZk96eWl4V3F6bVQ4d0E5\nZTdmWW9xOWFDd1VqeWx1YmRtZUhkSGcKLS0tIFBnUGprVk80MjJBN0N2MGVGM1R2\nVGw2S2pZTjQwZ3ArOXZiMHF3SktybDgKAPHFeHce+u7hokVgy8Fxbjv853cXdlOO\n9tP6tAwTId1ftDl6W7TmyJuibG81pSt7bcBNXOw8Sc5IcMRiqJQnmA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2RzBOenZuOWM3WTZ1dXgz\naDFXT0p2OGZFS2h5VHpHTlJHdUgvWUFDY0dZCnB0dzRXTTN5K1F6NGdtWi9NQ09W\nNkFvNnIxWjdscmdzKzJIKzRmaXBvZlkKLS0tIEtPdTZxd1JaMGNMNlR2ODdjNWE4\nVytoSEplODkxWUdNUy90NUVjU0xaTDgKkOaDTpVxoBZBr9eSBq2tBcmOe9H1zrs4\nWcbL2GwMLh7tCGSQheTkrFoLya0Vl5DF15VeTUO/4HSYjvdILatKHg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5bW5TYkticGNkRFZWQ1du\nSi9BZXpDVkhjYWwvdGkvM2pOdzhlOFNZSHg0CmpkRWJtbnlrZGdyVXhZcVJMazB6\nR2xmVEQ2Y2o4NEVOcHBqd3R1V3FwM3MKLS0tIFhWdHAyb0V1NVphQVdYcStFL1U5\nT0dva0FsRys4dFNQZkNvSmViR2xHRFEKAABVUXSKUrxgGWhPRQEBthQ0XNKm2yu+\nSm1srDR4Zm1BzBj1j+xXN+x/2sv81VHYIA03oWj6ey75JbXXu7vbEQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:38:05Z", + "mac": "ENC[AES256_GCM,data:TOjHOw2vxN87tE2z6InyYcoe08Zwwf/rWQ+dKb7Fk3Np/llMLoqnN3+CBrCI+H3gTZOwbHYPWzngJLTDasHB0qDlUKFJokVomEdu0WXIzhYPYb4vYnTtkiyGVWOR1Mx8xb/ZH5PWXx99GZ2/+Vn4IwnKQ2cjkeO9Tn9ZrZjGhjM=,iv:GaTKZvSFdfnzoO18SBjwtpbaue4xVMGZRllLYq7Yqyg=,tag:FmO4gmXiZyMrGTXyJ8KsNw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-port/mycelium/key/users/pedro b/vars/per-machine/frues-port/mycelium/key/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-port/mycelium/key/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/frues-port/mycelium/pubkey/value b/vars/per-machine/frues-port/mycelium/pubkey/value new file mode 100644 index 0000000..02b8429 --- /dev/null +++ b/vars/per-machine/frues-port/mycelium/pubkey/value @@ -0,0 +1 @@ +d3955c3c284ef6c414d282fea0119a696372c59ebf5d853aee840bd58e0cf649 From af90b6d93b56d159ab7cceb2ccb60877fadb3cb4 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:38:11 +0200 Subject: [PATCH 14/39] Update vars via generator openssh for machine frues-port --- .../openssh/ssh.id_ed25519.pub/value | 1 + .../ssh.id_ed25519/machines/frues-port | 1 + .../frues-port/openssh/ssh.id_ed25519/secret | 23 +++++++++++++++++++ .../openssh/ssh.id_ed25519/users/pedro | 1 + 4 files changed, 26 insertions(+) create mode 100644 vars/per-machine/frues-port/openssh/ssh.id_ed25519.pub/value create mode 120000 vars/per-machine/frues-port/openssh/ssh.id_ed25519/machines/frues-port create mode 100644 vars/per-machine/frues-port/openssh/ssh.id_ed25519/secret create mode 120000 vars/per-machine/frues-port/openssh/ssh.id_ed25519/users/pedro diff --git a/vars/per-machine/frues-port/openssh/ssh.id_ed25519.pub/value b/vars/per-machine/frues-port/openssh/ssh.id_ed25519.pub/value new file mode 100644 index 0000000..430fe0f --- /dev/null +++ b/vars/per-machine/frues-port/openssh/ssh.id_ed25519.pub/value @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAo+sBCIZf07IOj9VtmBkkWOYh6y0AZ3hkxyBNU7VNXC diff --git a/vars/per-machine/frues-port/openssh/ssh.id_ed25519/machines/frues-port b/vars/per-machine/frues-port/openssh/ssh.id_ed25519/machines/frues-port new file mode 120000 index 0000000..a686d31 --- /dev/null +++ b/vars/per-machine/frues-port/openssh/ssh.id_ed25519/machines/frues-port @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-port \ No newline at end of file diff --git a/vars/per-machine/frues-port/openssh/ssh.id_ed25519/secret b/vars/per-machine/frues-port/openssh/ssh.id_ed25519/secret new file mode 100644 index 0000000..74b1eeb --- /dev/null +++ b/vars/per-machine/frues-port/openssh/ssh.id_ed25519/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:JBq3eDnPe4Nnu0GZI8lXyTAVQi42mwFEHHgWnEx86baAixILXkATT9YnQMJDoehOTHKjAaNn9CGyT5YLEDMvzp2uEVsp08mTTkB3B7T+O+ezZrzX1HHIcIRXmDr7Ntdizf2kcG8h1W/YTqZ94knD0zlPK5cwW0De9GWGu6KfZuJIH+FXVHfIREINLMMdtsNo//AsVDhzbZbskamWtAz6xF7EQZyDVPuGGfrGBGqxCvCyz8xlW1920IPIYurfwy/8C9/8BGZwlIP1pOXf2laAgsLUpM933pC4j/3d18Pix9NN8PamXHuHyc/pg5hgtefLnhpwHFpEHX4MftfD3Ih/4knGJXDrqj9cyb6B5D1hZsppaX9Qc+RiNCD8/y/5/Gup0WDNv1r0yN7Afox4vWdEC/2nN7QGdRbWo0FtyVIzZFXghs5Ln8bgVAG8PVRGpZqKs+gUAtVzXKsHa/wuO9oS+XfJIaBPv0KZc1e1REiEFt1bG6Wno2bfgWBExLFp3xJM5SEf,iv:eCVPEuJCWKJPqQM/mp4n+ZEdHBcguqEJ5jYTyLCS3bg=,tag:oaItUKatgHGf3orltEZoYQ==,type:str]", + "sops": { + "age": [ + { + "recipient": "age19grcgxeu95xnjtpaakcek36rjd9kzr5aqlak5m5gzmstwayglpmqyvhl87", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZNUxRL1NXMkcwdjRVNkE5\nc0FQOUR6MWlOc2QyZldyT3M3MkgxWXRPRWpVClV0cjZ4NUpNM1ZWaUdRR1VkUzIz\ndEk2MDQ0SE9WeXBLL25INStFRFpaREEKLS0tIFYzd29FSnBtWTZydUQwc1hDa0Nt\nUlRBeThaU2RzSklHaUt1ZFlGdjJnSDQKiogdt6aAbOtS0Warsdb4tAhNShvKtJ5s\n5qc4TZy2V69O7gbjzQJLWt9HLfKM1UcvkmW9itTTI0WQxigsS4vLcg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiZVNLMmJ4dkZQTXBscnVU\nUTJpMW8zWlFNRk5BTzNRd0x5ZUp4Kyt3OTNRCnNNR2lZM3FvMFp4a0l6THh5dHZO\neGprRjZ0M2llRHlWVXc1SmkvUEEvUkUKLS0tIHU4RGdaQzJFU0hxTEVaQXVCMis2\na1RxZVRxOFZFMVZRTGtuaXBHWUROelUKCCsccQ25g653tzAZJtyZ5FsihuwLQufO\ntK/Q7gIFTYoC/iwSGZOZdkIO1fC4xqJXR1N0pnPS9QPPvvzExcrACQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIckhGRWdRUmV3QTc2M2tN\nUTJjOFpqUkFuQ3EvM0JTZEh0bmFkSkE4OVJRCjJ6MGw2UklnVENuUVhxT0hCTkJy\nMXY5dHphZmdnbjNTRlZXQUI3MTlkeWsKLS0tIERDK2w4dEtOQTkxQmdTUTVIWSs2\nUTk0WVFZNmcweTVlTjFYVFRObE1aNDQKKr2MLR5ARyaL69pmXYMFKpHRFMUY3MIp\nkYpqqBQZfFic5xg8veKB26reiF2o1nhFXVw9Vlo45QE7MZLsaDYTJA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:38:11Z", + "mac": "ENC[AES256_GCM,data:GkMnz+OEGgO4MZw7Mi1hzj9fh23pALzxTq2a5NCQ++HixWReCVzwjmsqIWPtmhlCm+SBH/U7ROZWSFdFsM9vbPQEvdcS9fxUTIQsbdAKiL5FYc7Uw7xIDZNb19O9KOnwa5CiVRK2Lo2eIXkPjAdjRMgk6FDueFbqc4ZGSPv14B4=,iv:c9bQS4yvv/L7pn+vRmr9svl8d3MSSTC6yT/zXEwYGXM=,tag:SNdmSMeELJ1Tr7tGkLaXdg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-port/openssh/ssh.id_ed25519/users/pedro b/vars/per-machine/frues-port/openssh/ssh.id_ed25519/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-port/openssh/ssh.id_ed25519/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From c34ad96f7ac1e278f4ce811fcbeac965579b39d9 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:38:18 +0200 Subject: [PATCH 15/39] Update vars via generator root-password for machine frues-port --- .../password-hash/machines/frues-port | 1 + .../root-password/password-hash/secret | 23 +++++++++++++++++++ .../root-password/password-hash/users/pedro | 1 + .../frues-port/root-password/password/secret | 19 +++++++++++++++ .../root-password/password/users/pedro | 1 + 5 files changed, 45 insertions(+) create mode 120000 vars/per-machine/frues-port/root-password/password-hash/machines/frues-port create mode 100644 vars/per-machine/frues-port/root-password/password-hash/secret create mode 120000 vars/per-machine/frues-port/root-password/password-hash/users/pedro create mode 100644 vars/per-machine/frues-port/root-password/password/secret create mode 120000 vars/per-machine/frues-port/root-password/password/users/pedro diff --git a/vars/per-machine/frues-port/root-password/password-hash/machines/frues-port b/vars/per-machine/frues-port/root-password/password-hash/machines/frues-port new file mode 120000 index 0000000..a686d31 --- /dev/null +++ b/vars/per-machine/frues-port/root-password/password-hash/machines/frues-port @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-port \ No newline at end of file diff --git a/vars/per-machine/frues-port/root-password/password-hash/secret b/vars/per-machine/frues-port/root-password/password-hash/secret new file mode 100644 index 0000000..f728fc6 --- /dev/null +++ b/vars/per-machine/frues-port/root-password/password-hash/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:CssuJRlUZPN/kekjamtidLcPY9QM+8kG49ypdrlTVlP7+GxMpRxtSN/5ZbYbQI9uQMkJYWi6CwHd3sQrCWKzV/ssUdFJ58oeMq7WDUQx0oMPx2LHW8dROZeIYkGFPDOtlzxYmJNlipr1vg==,iv:xCOHUBsjET10CIC9CA9Jzaa8GwwIBoLE4mzEUp8tMww=,tag:8uH+25RGa9fFbAdtOsjbow==,type:str]", + "sops": { + "age": [ + { + "recipient": "age19grcgxeu95xnjtpaakcek36rjd9kzr5aqlak5m5gzmstwayglpmqyvhl87", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHMEIwMmQzVE9TSjFjSzNW\nQll2NG1Bb05zYlBURlN5dU1NbjhMRmRueUEwCkV4M044Smp4UzA2U0dmOHFGNHBj\nV0c4Z1BUUnhleWxaa2JhMm8xSm9VNlkKLS0tIDQrdXVFaHg5Q0Vpd0pEWUNUUVMz\nRWhJcmwwZXh4SXZPMHdUM2xnOEdGa1kKmGuN+67Olo9z0rC47u3EfZLtQZJMK1X3\nuQ/wKWj3SyEBKdwLHrrNhHxa1KpwvVLNy+ejFz1q7hWeF01E2Equtg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwYWQ4cGlSYW1YY0k3djVh\nclRLRjczMkpqbFM4dzJRUmRrL1J3WWhJR1I4CmlZOWpPRlY5SXpnS2VvNlBHRnBr\nN2tGVmcvbWdTWUF3N1A0ekxUWlZXa0EKLS0tIGtDWG1tK0REWlAxMGZoLzZEcFNC\naGh4L1BEaWRNUDRtdjU2c2NISkI4U2cK2e9DXhcQK+NlqYrvUZz4ovAecnWHb0c1\nQ3KHAxkVwm5TgwU0mp3/01PMTQQiWQB0Poqp/cCGwlAJcB/I8iMm5w==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUUzVZZHBLbWpNUk5ldVcz\nZlI1bDZvWE8yYVhkVW1HcUVGcDYzVHQ0azFjCkhvUm53Rmd4WVVENnRsODVSRWhr\nU0lCNEdoeDNDMzlpZUUvOWI4ODRESUEKLS0tIEl6UzJTZjA2TmI0d3FBbDU5emIy\nRTlzbHJVODBEU1JsdXpFeVRNSUtUQVkKpA2zCN6qLKfrNQsRe6gQhaMSo+8WjgcF\nBKihmTUFpZb8Z63/FsBXCV7g9yjk8cR7LipMJMrc14QqVG2uEDivJg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:38:18Z", + "mac": "ENC[AES256_GCM,data:MIVgqDk5xF52zBLlaUtULC/JcxiGO5LYE0jpqGBAm4oGNwm+bOn859GZbq9CMiP6vO6VIUOaSISO2nnEUzz0S3N6b+wns2ezsTRrnyr1ypW4xgX48mRN/D3h5oL2Ie5ZVkjiCIMnHfLxc4OS/9+eHFybLea2ugYKxw72S+26j6M=,iv:I3zbgndiBLlsusCLXNXwgwrNlHiQSoQqn3CfHMh6FeU=,tag:3hInDhoz6t2Sq64/HSSILw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-port/root-password/password-hash/users/pedro b/vars/per-machine/frues-port/root-password/password-hash/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-port/root-password/password-hash/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/frues-port/root-password/password/secret b/vars/per-machine/frues-port/root-password/password/secret new file mode 100644 index 0000000..73d86f3 --- /dev/null +++ b/vars/per-machine/frues-port/root-password/password/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:yOoeeMw/ziypLLML,iv:S0uoWzdwmI6Jch6+WrSzY5H9MJ8qmr5zoygNhh0MtFQ=,tag:vsQxUeiY9M+GWvnouemU4Q==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2K3FIVEk1V01LaVlFRFYy\nZlFYK1lEbUNUbmpEVDJPY1E4U1hQMWlsRVFNCjNwVjBtMnRlN29jRm96QjdueGVm\nSmdxNnlsaUFncUxkcmtWajBxenM1Y1kKLS0tIHdNMXZPM3VaVFhVN2RqOHg4dGor\nRUFyd0d6T0JrTy9zUEgzNnAySG55WUkKRLBOcWjUjra8OLI3HhuJyOiVSNxeM/eL\nJa8ZoWWg1E/8/Z0e78+sCFnETVyTdcHR7h3lK81Szr4nEUY0+MHoRw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3cVZzamR0bEFocTQ2dzdy\nUmNmOEtzaXR4Z3pSZERINjZNV2dvd1Z4alJZCjQ0dW44eVVMN1B6Sm5yWTFpc0J1\nbCtLbldYUVh5ZlNYcXZYUFpSbkJqM1EKLS0tIE5Ra0ZRZ3l6SDhiY1J0UjU2bWdG\ndW1heEJ4ZEx3dE5nVlJGdEN6UlIrbG8KsnyKTcS3In1c8QQMs8/QAHixEd2LD+0I\n/r7PVU1GWFE/rzPZhVOnd317E2CGoPYV6oqyGBTpgfpeAj2oF+nKuQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:38:18Z", + "mac": "ENC[AES256_GCM,data:JLF8Cww/H4328InJA3LFQ3ob/eCC+2hxjl3zEmYDUeLjGqkqOTkpHXRctVVoEkAFYwEjdzbiwtpcqZmYz7rgoQwNu9WfmUxH/R00qIkAcFAIDL1IdqQdp0R0nRLepMXz6NWa+OjA7o5eNLXCXNKD14jvn+2RXIepi2tPoN/QgB8=,iv:NUXlhPMFiZfyNVc2Mxuyhkr7qvdLAaA4oV/+gu8IAgg=,tag:k543sa7Z2CD/rAV/VGEsUQ==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-port/root-password/password/users/pedro b/vars/per-machine/frues-port/root-password/password/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-port/root-password/password/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From 45e8d16a69f54c4f8f630663f8dd6faa8579eb14 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:38:24 +0200 Subject: [PATCH 16/39] Update vars via generator state-version for machine frues-port --- vars/per-machine/frues-port/state-version/version/value | 1 + 1 file changed, 1 insertion(+) create mode 100644 vars/per-machine/frues-port/state-version/version/value diff --git a/vars/per-machine/frues-port/state-version/version/value b/vars/per-machine/frues-port/state-version/version/value new file mode 100644 index 0000000..5d54076 --- /dev/null +++ b/vars/per-machine/frues-port/state-version/version/value @@ -0,0 +1 @@ +25.05 \ No newline at end of file From 4ffe516d860960041ca37fbe28f52c54c06764dc Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:38:34 +0200 Subject: [PATCH 17/39] Update vars via generator tor_tor for machine frues-port --- .../tor_tor/hostname/machines/frues-port | 1 + .../frues-port/tor_tor/hostname/secret | 23 +++++++++++++++++++ .../frues-port/tor_tor/hostname/users/pedro | 1 + .../hs_ed25519_secret_key/machines/frues-port | 1 + .../tor_tor/hs_ed25519_secret_key/secret | 23 +++++++++++++++++++ .../tor_tor/hs_ed25519_secret_key/users/pedro | 1 + 6 files changed, 50 insertions(+) create mode 120000 vars/per-machine/frues-port/tor_tor/hostname/machines/frues-port create mode 100644 vars/per-machine/frues-port/tor_tor/hostname/secret create mode 120000 vars/per-machine/frues-port/tor_tor/hostname/users/pedro create mode 120000 vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/machines/frues-port create mode 100644 vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/secret create mode 120000 vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/users/pedro diff --git a/vars/per-machine/frues-port/tor_tor/hostname/machines/frues-port b/vars/per-machine/frues-port/tor_tor/hostname/machines/frues-port new file mode 120000 index 0000000..a686d31 --- /dev/null +++ b/vars/per-machine/frues-port/tor_tor/hostname/machines/frues-port @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-port \ No newline at end of file diff --git a/vars/per-machine/frues-port/tor_tor/hostname/secret b/vars/per-machine/frues-port/tor_tor/hostname/secret new file mode 100644 index 0000000..6099ab6 --- /dev/null +++ b/vars/per-machine/frues-port/tor_tor/hostname/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:dbaAbg6nyafCLx0Ou7RQQnsIHAUoV/k6nys+tCEm4IEPVzHSgI6HdZoQ4a4xve5jOijAkTNLdZIZ5RLEbbAq,iv:ZYCgc/vek9eE8Ouh7gENLdxMmoR1xwNjhTtrbnq1SV0=,tag:IDeguDOCRXbO8m+hqfFslw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age19grcgxeu95xnjtpaakcek36rjd9kzr5aqlak5m5gzmstwayglpmqyvhl87", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIMjE4eSs1WmdZQzBtbU91\nVjE2WEU5M3VLSHpycnBublpQREdITDR0NHdFClZSMExZaXFoVC9tMjFuYTJrVnR2\nc254MnhrVGRVVkd3Q1hWZXBxV3V0UE0KLS0tIFc2cVJNT2gxMUlFZUlWVUxVZnEy\na3NlRHBoMFdheHVHbzZERHZLRjlseGcK7+25AImGWBjcWIYLy/4PqJYKaTexuMKc\nFfhnsvZAbutlYcoBv3jMSLhkmEtW838VFUtXXbm3cKy+fkKR1mNLDQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDYmNHRElxZ0h0OHpJRHhL\nZUpLckZxNTZ5VnpmeEc4SEIzYklQbXVDSVVJCitFOUNaMGh0TEt2VnpPclpmUnUr\na1d1MjZFcnVES3VJNlBaNjBOM0VLejgKLS0tIENjQThWRTdsb2tXZEgwaUc4eTNn\nRHlYWjFDMFZWb2hRM2tYUjQ3TmNBcU0KqDQ2e9NXhTqzq3v1BXEFO2Fde5cKyuMi\n3yh+WsWBHNkPo5r4zTZWq82Lf59oLutA1e3PzHHbyoh4VDwzr40UWg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpMjZIbytvTjB0Rm0xSzFs\ncW5CRzNJMGRxL3hJZHowRzczd0Q2Z1JWekZvCmFLU0VMQUpESWxkd2ZPMlU3anJZ\nMmhjOHlGSFRnV2c5WW0xVUZwZ3V2NjAKLS0tIDJGQ0I4eUpjUnYxTjdSNTkzdHZw\nQzFUUVphUE9YVnZEbGtOZ3J1VWpTQUUKCi7N9AElnkdV+eOdIiy+nJVO89W07Kv2\nMSt87iuneZ6Je8/3Cl8tKucgDfAMuCnLDCawh+todg1d91dj/YYU5g==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:38:34Z", + "mac": "ENC[AES256_GCM,data:TAm1Wdv9M9TGrFBieYntrlp0qLevK2VSMgj6LHdw3dZcwiT5oXMYskJNf9RAiNf0Rqs8fRxh7HTXwmwwXv9jbYrioi3xYqT/FaliXMoWrByv6S4A/1vbnPIayEzYnGK0kNmKjqFG9CiEVkjC71JY23R3Yy6v1of9SB4dPIgW1P4=,iv:xDNsU/K0W8OwdceyaoYXwHppFfxmVlPW2FGulRL1/pc=,tag:x3NzmktNj2YM+L6mAIHzrg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-port/tor_tor/hostname/users/pedro b/vars/per-machine/frues-port/tor_tor/hostname/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-port/tor_tor/hostname/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/machines/frues-port b/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/machines/frues-port new file mode 120000 index 0000000..a686d31 --- /dev/null +++ b/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/machines/frues-port @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-port \ No newline at end of file diff --git a/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/secret b/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/secret new file mode 100644 index 0000000..270c255 --- /dev/null +++ b/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:iZ46FO2cZGISPJdR8iwBWhiC8Koz6Nii6ZjsU6enzXdRdzIjwIzRhMT3pacFHIqtT8bm8R1T0h1zhzZMRBa0zkCFc/0F6t0yKczEULKHeQjfbO1oNo4a5f+3DMn4Zfyk,iv:RmDOehP+k5I/SHtRC+jRumRcKBwDrQ+lITZnqXHaF/w=,tag:kmzO5u3bwHaS3jqyqevLpA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age19grcgxeu95xnjtpaakcek36rjd9kzr5aqlak5m5gzmstwayglpmqyvhl87", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFTkNUUW9XM2l3dHQreGRF\naXluK1pQUjJNaHVlRHZGVTBFNElPb0hXMUdrClFUMHNiOFQwQWVxQmtRRUgxNkFt\ncm1VTlJRMHlLVUZZYW9sem4yNC9MZXMKLS0tIHN5Q0lZZnZnMkloeFVqMzFVZlhG\neUpPYnQzTklBb0k5a1IxVW94UnBKUVUKZXEX5hf3oHKKGnJ50LQoLVLe3XbfwzsQ\nODjDftyubwAKYnEHeH3fhUNYe1/I5D5WltBsxxefQ/t78fRtGOJrDQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaM3RMSlZIaTFGbkFnOHpO\nZGVUTXpUbTVvMkEzaUVkQUtoa2VraCtFeGtVCmJ0Zm9nYnkxM20rVEdqdjI0MWRY\nN2RlYVFudnVBUFFsR3Y5cFpjQVE2Mm8KLS0tIDNZdEdqVXg4RTRaTEIzYUIxOGR5\nVExQWEtGNWorQXYwWkJVbjZBWHFseU0Kg7X9DIHU8sONkpAaAAZMLIaH+ejMUxhd\nYVAu8jHmpYuf2mfJNsg2loVsQHTP7nuAAfONOnJxjFB7KInKRecZEQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKK1ljRDcyQVJQSk5DRnVk\nRUQ5VXJEYjNpVEl5RWhzRDBFWkhXZkhNUHpvClN4NUZ5aXdxTTBBYXhUdXJpUG1j\nLzhnSHBJSkgwMHhUd1lGL2djVGVJemcKLS0tIEZQNnlnZ0ZKakNJSTMxN0RvbUwr\nSU05QXFBK0FBRmZreHdLZEdESTlKN0EKhCqMcpK/xGDhH6NPmT/txXqBEUEzOfbw\nBb5pRl6ipxQaw311D1iFrSLMJFI47XBNEiSk84luHKBOMxd2+xXhvg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:38:34Z", + "mac": "ENC[AES256_GCM,data:SM7k5ywtU+MEh1PPkUzr0YZm6BCFKtN1b3aAFrNw+mOiDdWxZvtufRy8f0vRHYrUir/CCVoAo/3Ku/A5kfTiq73Vx+/4U5iea8msa96ZD9zC100q8FDAWU6cvS6DIhaTQ1CdhQHuG5u0F4bYzCEFR5+XQxv86UsDPdo+AEj8TMY=,iv:/ZwWH1Jgj7GIxBEbIp/d4hEXOGf3GdcGYRYOnYZIA4M=,tag:ExhIne921ticqDhkfLxUmA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/users/pedro b/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-port/tor_tor/hs_ed25519_secret_key/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From d61e91331ef9446c40653aa3450f9959dae0f74b Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 17 Sep 2025 21:38:41 +0200 Subject: [PATCH 18/39] Update vars via generator user-password-pedro for machine frues-port --- .../user-password-hash/machines/frues-port | 1 + .../user-password-hash/secret | 23 +++++++++++++++++++ .../user-password-hash/users/pedro | 1 + .../user-password-pedro/user-password/secret | 19 +++++++++++++++ .../user-password/users/pedro | 1 + 5 files changed, 45 insertions(+) create mode 120000 vars/per-machine/frues-port/user-password-pedro/user-password-hash/machines/frues-port create mode 100644 vars/per-machine/frues-port/user-password-pedro/user-password-hash/secret create mode 120000 vars/per-machine/frues-port/user-password-pedro/user-password-hash/users/pedro create mode 100644 vars/per-machine/frues-port/user-password-pedro/user-password/secret create mode 120000 vars/per-machine/frues-port/user-password-pedro/user-password/users/pedro diff --git a/vars/per-machine/frues-port/user-password-pedro/user-password-hash/machines/frues-port b/vars/per-machine/frues-port/user-password-pedro/user-password-hash/machines/frues-port new file mode 120000 index 0000000..a686d31 --- /dev/null +++ b/vars/per-machine/frues-port/user-password-pedro/user-password-hash/machines/frues-port @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-port \ No newline at end of file diff --git a/vars/per-machine/frues-port/user-password-pedro/user-password-hash/secret b/vars/per-machine/frues-port/user-password-pedro/user-password-hash/secret new file mode 100644 index 0000000..2a151a7 --- /dev/null +++ b/vars/per-machine/frues-port/user-password-pedro/user-password-hash/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:f33RhMOn7VbCtc4EE4/7ScnegScWPL0lS9f7glPc8wQL2U7l3+fYrkpCfoAcUwfSmKSgI/lcWlFcUphO/iusyu4LHs0y+hcz/x8nP3yWxcgkGReB0Lt4UHQeW5ab2BfmgNw+Pmsct+wNcA==,iv:48Os15XQzool61A/BI3bLUKh/GzTT/0YOzaYJx5C8Js=,tag:XaaJdu5Ugb/X/mPuYvarDw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age19grcgxeu95xnjtpaakcek36rjd9kzr5aqlak5m5gzmstwayglpmqyvhl87", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPT0Jjb2xTaVV5cmRVVEZ0\nYXVTR1hiMVZsV0NwMlVzMTVXUzdtVlN5WEVBCk9yVVZkQmZON3ZQeFc5NFFxK1Ru\nYlVFWVB2WnlhKzBGZEdkcGorTTN2NW8KLS0tIDF2MWNrclJwTWc3QU1mWjZIOWRs\nTjBDbFlTeUNvaXBFWHdEUVB1Q1lkdVkKX+NuMZiQY051Z+lzQMmeJ2Xq7cZmX/9+\nEx9wfa5TBbQZgCexrHW+lIeGGCugVyA2phjIaQ9ZoWotmZu6bfDrnw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjWStVQUdUbTR1KzMwQW81\nUUZ1cER6UVpsTGRITEk1Z0dXSmY4d0dtZEEwCjlTaDVGMGt2cUNkZ0F2WWZkcCs5\nN0pGdDNMOHpuT0h6aDhQc3lVRW5ySkkKLS0tIDF0bm1yQjVybkpKYmttSXFsczJa\neVlyOXVFTFllbGZrUzdhRnVFRXozc2sKzajcssM2dUAeyq/grsb7Seuq3980hqA+\n6qk2/Y5qT9HbHDycgAthYAcIN4P+2nznBPx6SoIcQ1xPq3I9T7v71g==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOWHpTNWF6aDJWZkNXeCt5\nRjcxd0VuSHp1OXZ1WEpaZnhrWTRMUzNySWtNCkpmVFhlVjhaTUV1c3puN0M4emZS\nMSsvendVb1RhZUxyTkFLcHpqTGdJV0UKLS0tIFVFTU1HRnRnRjIrQlMxa0NvUGJR\neDVweEVvMGJiVHd6RzdKZDhLSm5XdFEKumzfHmtgid1Iol7E7XY3N7GW1zTzEfQj\nWQoyOkxNoF5X1iu5sdvf24yuVIDL9VRk2xxRazpe5Oj0raN5nuD4Yw==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:38:41Z", + "mac": "ENC[AES256_GCM,data:/WmYJqS3Az88hbE6CY4LVYU+7der6gz92ivax7jJbfVcnOtoJGl7PvinMmW94O5NPo+XJfI1sr44QNyVtUJWcQ9UaJEL2ten9NVe8bSoH7I6qT3i2B68S6i9HkDL1cOYXPnTQWRM6MPPkf8gcPdR93OCukzqxDYiawph3aqPkm8=,iv:jkuxKx2TpWxfh2n2Rs8sTJUjvFBllW8a+rZB371tEHU=,tag:CWpdk6NnKgIyLZaOraz6Xg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-port/user-password-pedro/user-password-hash/users/pedro b/vars/per-machine/frues-port/user-password-pedro/user-password-hash/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-port/user-password-pedro/user-password-hash/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/frues-port/user-password-pedro/user-password/secret b/vars/per-machine/frues-port/user-password-pedro/user-password/secret new file mode 100644 index 0000000..b79c045 --- /dev/null +++ b/vars/per-machine/frues-port/user-password-pedro/user-password/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:BXB0nxG0CZ1nUojl,iv:bxzd6guLZySQxyP38U5u0Y1Dklz16h6+X/CTU6kd3Z0=,tag:6Rwke/zyxRCwry43oGSVCA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBabUdxN0pqVldnWHlsVkpZ\ncWhJNjN4bjczN0JJOXZuZWRUb0R0Uk56QjFRCmgzTlhUUG1ldnNrRTZEUFcyV2hq\nQW9aQThKUWVUeE9PQjdZOU1DRk5VNGcKLS0tIGhXWnVHQTl6QUdCK1c2VkdZYzVl\nWVBiamFCak5oRktUaFNGZzlJYnNXL28KsBB7RhJCc610rYw50bYMGU9v6iL44Keb\nUCyiUQIGAQyQ9GetPHe1vuQ3z5tlOl6GdMSZ648hm7cTk8wi9m+ZSg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGdVp0U1NwdEpmL0VnMzNw\nWnQrcUxnT3FWcSswdERrMGRBVXRLNlpXNERBCldRWGVwTVJOS1pkMmRmTzJFYzZp\ncjlwQitHR1pPVnRuRlhaaVdtUjJOc0UKLS0tIHI5WEFkVFczaTY1TVcxNTBld1BS\nMWlnVkFqN3FYNmVuNE9XTXJ2L0FtTEEKt9Pa3mzpraaU1/t3Wp4OtQiBAKfCZjfA\nrHn7SDqLRUXNnUqyo4dT9ZLWyUCY1fS/69tixWcsbflExLHPCsvd0Q==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-09-17T19:38:41Z", + "mac": "ENC[AES256_GCM,data:B+kNEZMdHrdrl6OLgmMo+bI9RbDY8p8AGFTYM0Qk0LiaqXgg/dtGm8XoA0YED2GSvG7S0nTgwOph1lePzSqCw7XR+tFWYQkhJcENTUEzEQWcVlDOYtYVCNOQVcWrfZ51BpNuhlliVTi6pGWtPb05afuBIZ6zSoufxTRljMqplyg=,iv:/b3qkv8xR+XnTh5q8Te1V2uGEgcXil8bMDaqOgWqi9g=,tag:Wa2V0M2cTES/9RuvsMIBbA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-port/user-password-pedro/user-password/users/pedro b/vars/per-machine/frues-port/user-password-pedro/user-password/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-port/user-password-pedro/user-password/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From 79b4ad0be25cf2e208af16d2195acdc1c7a691b7 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:04:22 +0200 Subject: [PATCH 19/39] Add machine frues-port --- clan.nix | 3 + flake.lock | 64 +- machines/frues-port/configuration.nix | 8 + machines/frues-port/disko.nix | 58 + machines/frues-port/facter.json | 3669 +++++++++++++++++++++++++ 5 files changed, 3770 insertions(+), 32 deletions(-) create mode 100644 machines/frues-port/configuration.nix create mode 100644 machines/frues-port/disko.nix create mode 100755 machines/frues-port/facter.json diff --git a/clan.nix b/clan.nix index 17cdbcf..32a4628 100644 --- a/clan.nix +++ b/clan.nix @@ -8,6 +8,9 @@ frues-pc = { tags = ["desktop" "spain" "gaming"]; }; + frues-port = { + tags = ["desktop" "spain"]; + }; terrier = { tags = ["server" "headless" "raspberry"]; }; diff --git a/flake.lock b/flake.lock index 9622139..781ac6b 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1757257662, - "narHash": "sha256-9gE+R7vRmCUQUFaXWhbIJM+sqrbrXOw/VdAKxp6il2M=", - "rev": "e953f807dedf24c11c2550f9052f7b02462dd994", + "lastModified": 1758171905, + "narHash": "sha256-b7kdqdIGp3/S0GLxV7QZaKq0cX2PvYXiVsHh7rNybJg=", + "rev": "92e2c841e339665571876307aed738eaf7d331bc", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/e953f807dedf24c11c2550f9052f7b02462dd994.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/92e2c841e339665571876307aed738eaf7d331bc.tar.gz" }, "original": { "type": "tarball", @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1756695982, - "narHash": "sha256-dyLhOSDzxZtRgi5aj/OuaZJUsuvo+8sZ9CU/qieZ15c=", - "rev": "cc8f26e7e6c2dc985526ba59b286ae5a83168cdb", + "lastModified": 1757905600, + "narHash": "sha256-Yd7buL9N7N7IaDVViItqP9HsECfnlDFykxvvNgMYcKk=", + "rev": "c10c4002bdc5aef040fcbb814d5f482e82dc8345", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/cc8f26e7e6c2dc985526ba59b286ae5a83168cdb.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/c10c4002bdc5aef040fcbb814d5f482e82dc8345.tar.gz" }, "original": { "type": "tarball", @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1757255839, - "narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=", + "lastModified": 1758160037, + "narHash": "sha256-fXelTdjdILspZ1IUU9aICB1+PXwSFiF8j+7ujwo1VpQ=", "owner": "nix-community", "repo": "disko", - "rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a", + "rev": "4f554162fff88e77655073d352eec0cea71103a2", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1757304222, - "narHash": "sha256-s070stByAXxeCLgftTXxFxZ2ynJhghne4Y6cTuqGAaw=", + "lastModified": 1758168230, + "narHash": "sha256-Fsb3Tpo3QRlRAKvDCoMvWD99y+ioY62kgU/cjMr203U=", "owner": "rycee", "repo": "nur-expressions", - "rev": "fa312c0175ffb82bc67da095439b9cb683ac52bd", + "rev": "285da329ed3e03565cba6f92b7f21350831266e3", "type": "gitlab" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1757130842, - "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", + "lastModified": 1758102940, + "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", + "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", "type": "github" }, "original": { @@ -414,10 +414,10 @@ "nixpkgs": { "locked": { "lastModified": 315532800, - "narHash": "sha256-h8Sx4S+/0FpodZji6W9lHzwY5BcuUG85Aj3GfhvGC2o=", - "rev": "a650b5d0de99158323597f048667c4d914243224", + "narHash": "sha256-1tUpklZsKzMGI3gjo/dWD+hS8cf+5Jji8TF5Cfz7i3I=", + "rev": "08b8f92ac6354983f5382124fef6006cade4a1c1", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre845298.a650b5d0de99/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre862603.08b8f92ac635/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -438,11 +438,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1758070117, + "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", "type": "github" }, "original": { @@ -519,11 +519,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { @@ -553,11 +553,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757174190, - "narHash": "sha256-eEU7Ku2Dtf6EXXbV1lAGFV8dd3Vlr4h2Mm3HQ+vtAow=", + "lastModified": 1757957798, + "narHash": "sha256-FT4O5imFJ+FUIGhYj/aFwEEgyvLhuyJ2my8f6mCLtTY=", "owner": "nix-community", "repo": "stylix", - "rev": "e50ae02496b48e3687ad50a38dc0b6e833a075d2", + "rev": "e6fc25cd12e8f461e402cf34649cc73ad93c7bdd", "type": "github" }, "original": { diff --git a/machines/frues-port/configuration.nix b/machines/frues-port/configuration.nix new file mode 100644 index 0000000..9afd9e8 --- /dev/null +++ b/machines/frues-port/configuration.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + imports = [ + ../../modules/desktop/hyprland.nix + ]; + + hm-pedro.de = "hyprland"; + programs.hyprland.autoLogin.username = "pedro"; +} diff --git a/machines/frues-port/disko.nix b/machines/frues-port/disko.nix new file mode 100644 index 0000000..dea3543 --- /dev/null +++ b/machines/frues-port/disko.nix @@ -0,0 +1,58 @@ +{ + boot.loader.grub = { + enable = true; + efiSupport = true; + efiInstallAsRemovable = true; + device = "nodev"; + }; + + disko.devices = { + disk = { + main = { + type = "disk"; + device = "/dev/disk/by-id/ata-KINGSTON_SA400S37480G_50026B77824FB121"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "500M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = ["umask=0077"]; + }; + }; + luks-root = { + size = "100%"; + content = { + type = "luks"; + name = "crypted-root"; + settings.allowDiscards = true; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + }; + }; + luks-swap = { + size = "16G"; + content = { + type = "luks"; + name = "crypted-swap"; + settings.allowDiscards = true; + content = { + type = "swap"; + discardPolicy = "both"; + resumeDevice = true; + }; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/machines/frues-port/facter.json b/machines/frues-port/facter.json new file mode 100755 index 0000000..913e73a --- /dev/null +++ b/machines/frues-port/facter.json @@ -0,0 +1,3669 @@ +{ + "version": 1, + "system": "x86_64-linux", + "virtualisation": "none", + "hardware": { + "bios": { + "apm_info": { + "supported": false, + "enabled": false, + "version": 0, + "sub_version": 0, + "bios_flags": 0 + }, + "vbe_info": { + "version": 0, + "video_memory": 0 + }, + "pnp": true, + "pnp_id": 3932160, + "lba_support": false, + "low_memory_size": 650240, + "smbios_version": 769 + }, + "bluetooth": [ + { + "index": 33, + "attached_to": 38, + "class_list": [ + "usb", + "bluetooth" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0115", + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "hex": "8087", + "value": 32903 + }, + "device": { + "hex": "0aaa", + "value": 2730 + }, + "revision": { + "hex": "0000", + "name": "0.02", + "value": 0 + }, + "model": "Bluetooth Device", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-10/1-10:1.0", + "sysfs_bus_id": "1-10:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v8087p0AAAd0002dcE0dsc01dp01icE0isc01ip01in00" + }, + { + "index": 36, + "attached_to": 38, + "class_list": [ + "usb", + "bluetooth" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0115", + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "hex": "8087", + "value": 32903 + }, + "device": { + "hex": "0aaa", + "value": 2730 + }, + "revision": { + "hex": "0000", + "name": "0.02", + "value": 0 + }, + "model": "Bluetooth Device", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-10/1-10:1.1", + "sysfs_bus_id": "1-10:1.1", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v8087p0AAAd0002dcE0dsc01dp01icE0isc01ip01in01" + } + ], + "bridge": [ + { + "index": 14, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0001", + "name": "ISA bridge", + "value": 1 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9d84", + "value": 40324 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel ISA bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.0", + "sysfs_bus_id": "0000:00:1f.0", + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00009D84sv0000103Csd00008538bc06sc01i00" + }, + { + "index": 22, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0000", + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "3e34", + "value": 15924 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "000b", + "value": 11 + }, + "model": "Intel Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:00.0", + "sysfs_bus_id": "0000:00:00.0", + "detail": { + "function": 0, + "command": 6, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "driver": "skl_uncore", + "driver_module": "intel_uncore", + "drivers": [ + "skl_uncore" + ], + "driver_modules": [ + "intel_uncore" + ], + "module_alias": "pci:v00008086d00003E34sv0000103Csd00008538bc06sc00i00" + }, + { + "index": 25, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 29 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9db0", + "value": 40368 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "00f1", + "value": 241 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1d.0", + "sysfs_bus_id": "0000:00:1d.0", + "resources": [ + { + "type": "irq", + "base": 120, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 1, + "secondary_bus": 1, + "irq": 120, + "prog_if": 0 + }, + "driver": "pcieport", + "driver_module": "pcieportdrv", + "drivers": [ + "pcieport" + ], + "driver_modules": [ + "pcieportdrv" + ], + "module_alias": "pci:v00008086d00009DB0sv0000103Csd00008538bc06sc04i00" + } + ], + "camera": [ + { + "index": 34, + "attached_to": 38, + "class_list": [ + "camera", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010f", + "name": "Camera", + "value": 271 + }, + "vendor": { + "hex": "05c8", + "name": "Cheng Uei Precision Industry Co., Ltd", + "value": 1480 + }, + "device": { + "hex": "03cb", + "name": "HP HD Camera", + "value": 971 + }, + "revision": { + "hex": "0000", + "name": "0.09", + "value": 0 + }, + "model": "Cheng Uei Precision Industry HP HD Camera", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-2/1-2:1.0", + "sysfs_bus_id": "1-2:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00ef", + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "hex": "000e", + "name": "video", + "value": 14 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "hex": "000e", + "name": "video", + "value": 14 + }, + "function_subclass": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 0 + } + }, + "hotplug": "usb", + "driver": "uvcvideo", + "driver_module": "uvcvideo", + "drivers": [ + "uvcvideo" + ], + "driver_modules": [ + "uvcvideo" + ], + "module_alias": "usb:v05C8p03CBd0009dcEFdsc02dp01ic0Eisc01ip00in00" + }, + { + "index": 37, + "attached_to": 38, + "class_list": [ + "camera", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010f", + "name": "Camera", + "value": 271 + }, + "vendor": { + "hex": "05c8", + "name": "Cheng Uei Precision Industry Co., Ltd", + "value": 1480 + }, + "device": { + "hex": "03cb", + "name": "HP HD Camera", + "value": 971 + }, + "revision": { + "hex": "0000", + "name": "0.09", + "value": 0 + }, + "model": "Cheng Uei Precision Industry HP HD Camera", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-2/1-2:1.1", + "sysfs_bus_id": "1-2:1.1", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00ef", + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "hex": "000e", + "name": "video", + "value": 14 + }, + "interface_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "interface_protocol": 0, + "interface_number": 1, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "hex": "000e", + "name": "video", + "value": 14 + }, + "function_subclass": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 0 + } + }, + "hotplug": "usb", + "driver": "uvcvideo", + "driver_module": "uvcvideo", + "drivers": [ + "uvcvideo" + ], + "driver_modules": [ + "uvcvideo" + ], + "module_alias": "usb:v05C8p03CBd0009dcEFdsc02dp01ic0Eisc02ip00in01" + } + ], + "chip_card": [ + { + "index": 41, + "attached_to": 38, + "class_list": [ + "chip_card", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010e", + "name": "Chipcard Reader", + "value": 270 + }, + "vendor": { + "hex": "234b", + "name": "Free Software Initiative of Japan", + "value": 9035 + }, + "device": { + "hex": "0000", + "name": "Gnuk Token", + "value": 0 + }, + "revision": { + "hex": "0000", + "name": "2.00", + "value": 0 + }, + "serial": "FSIJ-2.2-01F0A8BD", + "model": "Free Software Initiative Gnuk Token", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-5/1-5:1.0", + "sysfs_bus_id": "1-5:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "000b", + "name": "smart_card", + "value": 11 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbfs", + "driver_module": "usbcore", + "drivers": [ + "usbfs" + ], + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v234Bp0000d0200dc00dsc00dp00ic0Bisc00ip00in00" + } + ], + "cpu": [ + { + "architecture": "x86_64", + "vendor_name": "GenuineIntel", + "family": 6, + "model": 142, + "stepping": 11, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "dts", + "acpi", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "ht", + "tm", + "pbe", + "syscall", + "nx", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "art", + "arch_perfmon", + "pebs", + "bts", + "rep_good", + "nopl", + "xtopology", + "nonstop_tsc", + "cpuid", + "aperfmperf", + "pni", + "pclmulqdq", + "dtes64", + "monitor", + "ds_cpl", + "vmx", + "est", + "tm2", + "ssse3", + "sdbg", + "fma", + "cx16", + "xtpr", + "pdcm", + "pcid", + "sse4_1", + "sse4_2", + "x2apic", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "xsave", + "avx", + "f16c", + "rdrand", + "lahf_lm", + "abm", + "3dnowprefetch", + "cpuid_fault", + "epb", + "ssbd", + "ibrs", + "ibpb", + "stibp", + "tpr_shadow", + "flexpriority", + "ept", + "vpid", + "ept_ad", + "fsgsbase", + "tsc_adjust", + "bmi1", + "avx2", + "smep", + "bmi2", + "erms", + "invpcid", + "mpx", + "rdseed", + "adx", + "smap", + "clflushopt", + "intel_pt", + "xsaveopt", + "xsavec", + "xgetbv1", + "xsaves", + "dtherm", + "ida", + "arat", + "pln", + "pts", + "hwp", + "hwp_notify", + "hwp_act_window", + "hwp_epp", + "vnmi", + "md_clear", + "flush_l1d", + "arch_capabilities" + ], + "bugs": [ + "spectre_v1", + "spectre_v2", + "spec_store_bypass", + "mds", + "swapgs", + "itlb_multihit", + "srbds", + "mmio_stale_data", + "retbleed", + "gds", + "spectre_v2_user" + ], + "bogo": 3600, + "cache": 6144, + "units": 16, + "physical_id": 0, + "siblings": 8, + "cores": 4, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 22, + "write_protect": false, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": "0x27", + "virtual": "0x30" + } + } + ], + "disk": [ + { + "index": 31, + "attached_to": 12, + "class_list": [ + "disk", + "ide", + "block_device" + ], + "bus_type": { + "hex": "0085", + "name": "IDE", + "value": 133 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "0000", + "name": "KINGSTON", + "value": 0 + }, + "device": { + "hex": "0000", + "name": "SA400S3", + "value": 0 + }, + "revision": { + "hex": "0000", + "name": "B1H5", + "value": 0 + }, + "serial": "50026B77824FB121", + "model": "KINGSTON SA400S3", + "sysfs_id": "/class/block/sda", + "sysfs_bus_id": "0:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0", + "unix_device_name": "/dev/sda", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 0, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-id/ata-KINGSTON_SA400S37480G_50026B77824FB121", + "/dev/disk/by-id/wwn-0x50026b77824fb121", + "/dev/disk/by-path/pci-0000:00:17.0-ata-1", + "/dev/disk/by-path/pci-0000:00:17.0-ata-1.0", + "/dev/sda" + ], + "rom_id": "0x80", + "resources": [ + { + "type": "disk_geo", + "cylinders": 58369, + "heads": 255, + "sectors": 63, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 937703088, + "value_2": 512 + } + ], + "driver": "ahci", + "driver_module": "ahci", + "drivers": [ + "ahci", + "sd" + ], + "driver_modules": [ + "ahci", + "sd_mod" + ] + } + ], + "graphics_card": [ + { + "index": 27, + "attached_to": 0, + "class_list": [ + "graphics_card", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 2 + }, + "base_class": { + "hex": "0003", + "name": "Display controller", + "value": 3 + }, + "sub_class": { + "hex": "0000", + "name": "VGA compatible controller", + "value": 0 + }, + "pci_interface": { + "hex": "0000", + "name": "VGA", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "3ea0", + "value": 16032 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "model": "Intel VGA compatible controller", + "sysfs_id": "/devices/pci0000:00/0000:00:02.0", + "sysfs_bus_id": "0000:00:02.0", + "resources": [ + { + "type": "io", + "base": 16384, + "range": 64, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 135, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 3758096384, + "range": 268435456, + "enabled": true, + "access": "read_only", + "prefetch": "no" + }, + { + "type": "mem", + "base": 4026531840, + "range": 16777216, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 786432, + "range": 131072, + "enabled": false, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 135, + "prog_if": 0 + }, + "driver": "i915", + "driver_module": "i915", + "drivers": [ + "i915" + ], + "driver_modules": [ + "i915" + ], + "module_alias": "pci:v00008086d00003EA0sv0000103Csd00008538bc03sc00i00", + "label": "Onboard IGD" + } + ], + "hub": [ + { + "index": 38, + "attached_to": 28, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d6b", + "name": "Linux 6.15.1 xhci-hcd", + "value": 7531 + }, + "device": { + "hex": "0002", + "name": "xHCI Host Controller", + "value": 2 + }, + "revision": { + "hex": "0000", + "name": "6.15", + "value": 0 + }, + "serial": "0000:00:14.0", + "model": "Linux 6.15.1 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-0:1.0", + "sysfs_bus_id": "1-0:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 1, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "driver_module": "usbcore", + "drivers": [ + "hub" + ], + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v1D6Bp0002d0615dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 40, + "attached_to": 28, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d6b", + "name": "Linux 6.15.1 xhci-hcd", + "value": 7531 + }, + "device": { + "hex": "0003", + "name": "xHCI Host Controller", + "value": 3 + }, + "revision": { + "hex": "0000", + "name": "6.15", + "value": 0 + }, + "serial": "0000:00:14.0", + "model": "Linux 6.15.1 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb2/2-0:1.0", + "sysfs_bus_id": "2-0:1.0", + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "driver_module": "usbcore", + "drivers": [ + "hub" + ], + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v1D6Bp0003d0615dc09dsc00dp03ic09isc00ip00in00" + } + ], + "keyboard": [ + { + "index": 39, + "attached_to": 38, + "class_list": [ + "keyboard", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0108", + "name": "Keyboard", + "value": 264 + }, + "sub_class": { + "hex": "0000", + "name": "Keyboard", + "value": 0 + }, + "vendor": { + "hex": "046d", + "name": "Logitech Inc.", + "value": 1133 + }, + "device": { + "hex": "c534", + "name": "USB Receiver", + "value": 50484 + }, + "revision": { + "hex": "0000", + "name": "29.01", + "value": 0 + }, + "model": "Logitech USB Receiver", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.0", + "sysfs_bus_id": "1-4:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "keyboard", + "xkb_rules": "xfree86", + "xkb_model": "pc104" + }, + "module_alias": "usb:v046DpC534d2901dc00dsc00dp00ic03isc01ip01in00" + } + ], + "memory": [ + { + "index": 11, + "attached_to": 0, + "class_list": [ + "memory" + ], + "base_class": { + "hex": "0101", + "name": "Internally Used Class", + "value": 257 + }, + "sub_class": { + "hex": "0002", + "name": "Main Memory", + "value": 2 + }, + "model": "Main Memory", + "resources": [ + { + "type": "mem", + "base": 0, + "range": 16613613568, + "enabled": true, + "access": "read_write", + "prefetch": "unknown" + }, + { + "type": "phys_mem", + "range": 16106127360 + } + ] + } + ], + "monitor": [ + { + "index": 30, + "attached_to": 27, + "class_list": [ + "monitor" + ], + "base_class": { + "hex": "0100", + "name": "Monitor", + "value": 256 + }, + "sub_class": { + "hex": "0002", + "name": "LCD Monitor", + "value": 2 + }, + "vendor": { + "hex": "2163", + "name": "HKC MY", + "value": 8547 + }, + "device": { + "hex": "023d", + "value": 573 + }, + "serial": "0", + "model": "HKC MY LCD Monitor", + "resources": [ + { + "type": "monitor", + "width": 1920, + "height": 1080, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "size", + "unit": "mm", + "value_1": 344, + "value_2": 194 + } + ], + "detail": { + "manufacture_year": 2023, + "manufacture_week": 0, + "vertical_sync": { + "min": 55, + "max": 60 + }, + "horizontal_sync": { + "min": 67, + "max": 67 + }, + "horizontal_sync_timings": { + "disp": 1920, + "sync_start": 1968, + "sync_end": 2000, + "total": 2080 + }, + "vertical_sync_timings": { + "disp": 1080, + "sync_start": 1083, + "sync_end": 1089, + "total": 1115 + }, + "clock": 139150, + "width": 1920, + "height": 1080, + "width_millimetres": 344, + "height_millimetres": 194, + "horizontal_flag": 45, + "vertical_flag": 45, + "vendor": "HKC MY", + "name": "" + }, + "driver_info": { + "type": "display", + "width": 1920, + "height": 1080, + "vertical_sync": { + "min": 55, + "max": 60 + }, + "horizontal_sync": { + "min": 67, + "max": 67 + }, + "bandwidth": 0, + "horizontal_sync_timings": { + "disp": 1920, + "sync_start": 1968, + "sync_end": 2000, + "total": 2080 + }, + "vertical_sync_timings": { + "disp": 1080, + "sync_start": 1083, + "sync_end": 1089, + "total": 1115 + }, + "horizontal_flag": 45, + "vertical_flag": 45 + } + } + ], + "mouse": [ + { + "index": 32, + "attached_to": 38, + "class_list": [ + "mouse", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0105", + "name": "Mouse", + "value": 261 + }, + "sub_class": { + "hex": "0003", + "name": "USB Mouse", + "value": 3 + }, + "vendor": { + "hex": "046d", + "name": "Logitech Inc.", + "value": 1133 + }, + "device": { + "hex": "c534", + "name": "USB Receiver", + "value": 50484 + }, + "revision": { + "hex": "0000", + "name": "29.01", + "value": 0 + }, + "compat_vendor": "Unknown", + "compat_device": "Generic USB Mouse", + "model": "Logitech USB Receiver", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.1", + "sysfs_bus_id": "1-4:1.1", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 2, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "mouse", + "db_entry_0": [ + "explorerps/2", + "exps2" + ], + "xf86": "explorerps/2", + "gpm": "exps2", + "buttons": -1, + "wheels": -1 + }, + "module_alias": "usb:v046DpC534d2901dc00dsc00dp00ic03isc01ip02in01" + }, + { + "index": 46, + "attached_to": 0, + "bus_type": { + "hex": "0081", + "name": "serial", + "value": 129 + }, + "base_class": { + "hex": "0118", + "name": "touchpad", + "value": 280 + }, + "sub_class": { + "hex": "0001", + "name": "bus", + "value": 1 + }, + "vendor": { + "hex": "06cb", + "value": 1739 + }, + "device": { + "hex": "826f", + "value": 33391 + }, + "sysfs_id": "/devices/pci0000:00/0000:00:15.1/i2c_designware.1/i2c-2/i2c-SYNA3081:00/0018:06CB:826F.0005/input/input31", + "unix_device_names": [ + "/dev/input/event9", + "/dev/input/ + handler" + ] + }, + { + "index": 47, + "attached_to": 0, + "bus_type": { + "hex": "0080", + "name": "ps2", + "value": 128 + }, + "base_class": { + "hex": "0118", + "name": "touchpad", + "value": 280 + }, + "sub_class": { + "hex": "0000", + "name": "ps2", + "value": 0 + }, + "vendor": { + "hex": "0002", + "value": 2 + }, + "device": { + "hex": "0007", + "value": 7 + }, + "sysfs_id": "/devices/platform/i8042/serio3/input/input25", + "unix_device_names": [ + "/dev/input/event17", + "/dev/input/ + handler" + ] + } + ], + "network_controller": [ + { + "index": 17, + "attached_to": 0, + "class_list": [ + "network_controller", + "pci", + "wlan_card" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "hex": "0002", + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "hex": "0082", + "name": "WLAN controller", + "value": 130 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9df0", + "value": 40432 + }, + "sub_device": { + "hex": "0034", + "value": 52 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel WLAN controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.3", + "sysfs_bus_id": "0000:00:14.3", + "unix_device_name": "wlp0s20f3", + "unix_device_names": [ + "wlp0s20f3" + ], + "resources": [ + { + "type": "hwaddr", + "address": 100 + }, + { + "type": "irq", + "base": 134, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4044423168, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "phwaddr", + "address": 100 + }, + { + "type": "wlan", + "channels": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "36", + "40", + "44", + "48", + "52", + "56", + "60", + "64", + "100", + "104", + "108", + "112", + "116", + "120", + "124", + "128", + "132", + "136", + "140" + ], + "frequencies": [ + "2.412", + "2.417", + "2.422", + "2.427", + "2.432", + "2.437", + "2.442", + "2.447", + "2.452", + "2.457", + "2.462", + "2.467", + "2.472", + "5.18", + "5.2", + "5.22", + "5.24", + "5.26", + "5.28", + "5.3", + "5.32", + "5.5", + "5.52", + "5.54", + "5.56", + "5.58", + "5.6", + "5.62", + "5.64", + "5.66", + "5.68", + "5.7" + ], + "auth_modes": [ + "open", + "sharedkey", + "wpa-psk", + "wpa-eap" + ], + "enc_modes": [ + "WEP40", + "WEP104", + "TKIP", + "CCMP" + ] + } + ], + "detail": { + "function": 3, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 134, + "prog_if": 0 + }, + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ], + "module_alias": "pci:v00008086d00009DF0sv00008086sd00000034bc02sc80i00" + }, + { + "index": 19, + "attached_to": 25, + "class_list": [ + "network_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "hex": "0002", + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "hex": "0000", + "name": "Ethernet controller", + "value": 0 + }, + "vendor": { + "hex": "10ec", + "value": 4332 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "8168", + "value": 33128 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0015", + "value": 21 + }, + "model": "Ethernet controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:01:00.0", + "sysfs_bus_id": "0000:01:00.0", + "unix_device_name": "enp1s0", + "unix_device_names": [ + "enp1s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 98 + }, + { + "type": "io", + "base": 12288, + "range": 256, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 16, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4043309056, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 4043325440, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "phwaddr", + "address": 98 + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 16, + "prog_if": 0 + }, + "driver": "r8169", + "driver_module": "r8169", + "drivers": [ + "r8169" + ], + "driver_modules": [ + "r8169" + ], + "module_alias": "pci:v000010ECd00008168sv0000103Csd00008538bc02sc00i00" + } + ], + "network_interface": [ + { + "index": 43, + "attached_to": 17, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0001", + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/wlp0s20f3", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.3", + "unix_device_name": "wlp0s20f3", + "unix_device_names": [ + "wlp0s20f3" + ], + "resources": [ + { + "type": "hwaddr", + "address": 100 + }, + { + "type": "phwaddr", + "address": 100 + } + ], + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ] + }, + { + "index": 44, + "attached_to": 0, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0000", + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + }, + { + "index": 45, + "attached_to": 19, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0001", + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/enp1s0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:01:00.0", + "unix_device_name": "enp1s0", + "unix_device_names": [ + "enp1s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 98 + }, + { + "type": "phwaddr", + "address": 98 + } + ], + "driver": "r8169", + "driver_module": "r8169", + "drivers": [ + "r8169" + ], + "driver_modules": [ + "r8169" + ] + } + ], + "pci": [ + { + "index": 13, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 21 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0080", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9de9", + "value": 40425 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel Serial bus controller", + "sysfs_id": "/devices/pci0000:00/0000:00:15.1", + "sysfs_bus_id": "0000:00:15.1", + "resources": [ + { + "type": "irq", + "base": 17, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 274879016960, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 1, + "command": 6, + "header_type": 0, + "secondary_bus": 0, + "irq": 17, + "prog_if": 0 + }, + "driver": "intel-lpss", + "driver_module": "intel_lpss_pci", + "drivers": [ + "intel-lpss" + ], + "driver_modules": [ + "intel_lpss_pci" + ], + "module_alias": "pci:v00008086d00009DE9sv0000103Csd00008538bc0Csc80i00" + }, + { + "index": 15, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "hex": "0008", + "name": "Generic system peripheral", + "value": 8 + }, + "sub_class": { + "hex": "0005", + "value": 5 + }, + "pci_interface": { + "hex": "0001", + "value": 1 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9df5", + "value": 40437 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel Generic system peripheral", + "sysfs_id": "/devices/pci0000:00/0000:00:14.5", + "sysfs_bus_id": "0000:00:14.5", + "resources": [ + { + "type": "irq", + "base": 19, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 274879021056, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 5, + "command": 6, + "header_type": 0, + "secondary_bus": 0, + "irq": 19, + "prog_if": 1 + }, + "driver": "sdhci-pci", + "driver_module": "sdhci_pci", + "drivers": [ + "sdhci-pci" + ], + "driver_modules": [ + "sdhci_pci" + ], + "module_alias": "pci:v00008086d00009DF5sv0000103Csd00008538bc08sc05i01" + }, + { + "index": 16, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 4 + }, + "base_class": { + "hex": "0011", + "name": "Signal processing controller", + "value": 17 + }, + "sub_class": { + "hex": "0080", + "name": "Signal processing controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "1903", + "value": 6403 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "000b", + "value": 11 + }, + "model": "Intel Signal processing controller", + "sysfs_id": "/devices/pci0000:00/0000:00:04.0", + "sysfs_bus_id": "0000:00:04.0", + "resources": [ + { + "type": "irq", + "base": 16, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 274878955520, + "range": 32768, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 2, + "header_type": 0, + "secondary_bus": 0, + "irq": 16, + "prog_if": 0 + }, + "driver": "proc_thermal", + "driver_module": "processor_thermal_device_pci_legacy", + "drivers": [ + "proc_thermal" + ], + "driver_modules": [ + "processor_thermal_device_pci_legacy" + ], + "module_alias": "pci:v00008086d00001903sv0000103Csd00008538bc11sc80i00" + }, + { + "index": 18, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 22 + }, + "base_class": { + "hex": "0007", + "name": "Communication controller", + "value": 7 + }, + "sub_class": { + "hex": "0080", + "name": "Communication controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9de0", + "value": 40416 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel Communication controller", + "sysfs_id": "/devices/pci0000:00/0000:00:16.0", + "sysfs_bus_id": "0000:00:16.0", + "resources": [ + { + "type": "irq", + "base": 131, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 274879008768, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 131, + "prog_if": 0 + }, + "driver": "mei_me", + "driver_module": "mei_me", + "drivers": [ + "mei_me" + ], + "driver_modules": [ + "mei_me" + ], + "module_alias": "pci:v00008086d00009DE0sv0000103Csd00008538bc07sc80i00" + }, + { + "index": 20, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0080", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9da4", + "value": 40356 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel Serial bus controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.5", + "sysfs_bus_id": "0000:00:1f.5", + "resources": [ + { + "type": "mem", + "base": 4261478400, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 5, + "command": 1026, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "driver": "intel-spi", + "driver_module": "spi_intel_pci", + "drivers": [ + "intel-spi" + ], + "driver_modules": [ + "spi_intel_pci" + ], + "module_alias": "pci:v00008086d00009DA4sv0000103Csd00008538bc0Csc80i00" + }, + { + "index": 23, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 18 + }, + "base_class": { + "hex": "0011", + "name": "Signal processing controller", + "value": 17 + }, + "sub_class": { + "hex": "0080", + "name": "Signal processing controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9df9", + "value": 40441 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel Signal processing controller", + "sysfs_id": "/devices/pci0000:00/0000:00:12.0", + "sysfs_bus_id": "0000:00:12.0", + "resources": [ + { + "type": "irq", + "base": 16, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 274879029248, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 2, + "header_type": 0, + "secondary_bus": 0, + "irq": 16, + "prog_if": 0 + }, + "driver": "intel_pch_thermal", + "driver_module": "intel_pch_thermal", + "drivers": [ + "intel_pch_thermal" + ], + "driver_modules": [ + "intel_pch_thermal" + ], + "module_alias": "pci:v00008086d00009DF9sv0000103Csd00008538bc11sc80i00" + }, + { + "index": 24, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 21 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0080", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9de8", + "value": 40424 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel Serial bus controller", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0", + "sysfs_bus_id": "0000:00:15.0", + "resources": [ + { + "type": "irq", + "base": 16, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 274879012864, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 6, + "header_type": 0, + "secondary_bus": 0, + "irq": 16, + "prog_if": 0 + }, + "driver": "intel-lpss", + "driver_module": "intel_lpss_pci", + "drivers": [ + "intel-lpss" + ], + "driver_modules": [ + "intel_lpss_pci" + ], + "module_alias": "pci:v00008086d00009DE8sv0000103Csd00008538bc0Csc80i00" + }, + { + "index": 26, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "hex": "0005", + "name": "Memory controller", + "value": 5 + }, + "sub_class": { + "hex": "0000", + "name": "RAM memory", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9def", + "value": 40431 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel RAM memory", + "sysfs_id": "/devices/pci0000:00/0000:00:14.2", + "sysfs_bus_id": "0000:00:14.2", + "resources": [ + { + "type": "mem", + "base": 274879025152, + "range": 4096, + "enabled": false, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 4044447744, + "range": 8192, + "enabled": false, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 2, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00009DEFsv0000103Csd00008538bc05sc00i00" + }, + { + "index": 29, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0005", + "name": "SMBus", + "value": 5 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9da3", + "value": 40355 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel SMBus", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.4", + "sysfs_bus_id": "0000:00:1f.4", + "resources": [ + { + "type": "io", + "base": 61344, + "range": 32, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 16, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 274879004672, + "range": 256, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 4, + "command": 3, + "header_type": 0, + "secondary_bus": 0, + "irq": 16, + "prog_if": 0 + }, + "driver": "i801_smbus", + "driver_module": "i2c_i801", + "drivers": [ + "i801_smbus" + ], + "driver_modules": [ + "i2c_i801" + ], + "module_alias": "pci:v00008086d00009DA3sv0000103Csd00008538bc0Csc05i00" + } + ], + "sound": [ + { + "index": 21, + "attached_to": 0, + "class_list": [ + "sound", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "0004", + "name": "Multimedia controller", + "value": 4 + }, + "sub_class": { + "hex": "0003", + "value": 3 + }, + "pci_interface": { + "hex": "0080", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9dc8", + "value": 40392 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel Multimedia controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.3", + "sysfs_bus_id": "0000:00:1f.3", + "resources": [ + { + "type": "irq", + "base": 136, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 274877906944, + "range": 1048576, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 274878988288, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 3, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 136, + "prog_if": 128 + }, + "driver": "snd_hda_intel", + "driver_module": "snd_hda_intel", + "drivers": [ + "snd_hda_intel" + ], + "driver_modules": [ + "snd_hda_intel" + ], + "module_alias": "pci:v00008086d00009DC8sv0000103Csd00008538bc04sc03i80" + } + ], + "storage_controller": [ + { + "index": 12, + "attached_to": 0, + "class_list": [ + "storage_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 23 + }, + "base_class": { + "hex": "0001", + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "hex": "0006", + "value": 6 + }, + "pci_interface": { + "hex": "0001", + "value": 1 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9dd3", + "value": 40403 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:17.0", + "sysfs_bus_id": "0000:00:17.0", + "resources": [ + { + "type": "io", + "base": 16480, + "range": 32, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 16512, + "range": 8, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 16520, + "range": 4, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 129, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4044439552, + "range": 8192, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 4044460032, + "range": 2048, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 4044464128, + "range": 256, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 129, + "prog_if": 1 + }, + "driver": "ahci", + "driver_module": "ahci", + "drivers": [ + "ahci" + ], + "driver_modules": [ + "ahci" + ], + "module_alias": "pci:v00008086d00009DD3sv0000103Csd00008538bc01sc06i01" + } + ], + "system": { + "form_factor": "laptop" + }, + "usb": [ + { + "index": 35, + "attached_to": 38, + "class_list": [ + "usb", + "unknown" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "06cb", + "value": 1739 + }, + "device": { + "hex": "00c9", + "value": 201 + }, + "serial": "c20a642b0466", + "model": "Unclassified device", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-7/1-7:1.0", + "sysfs_bus_id": "1-7:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00ff", + "name": "vendor_spec", + "value": 255 + }, + "device_subclass": { + "hex": "0010", + "name": "audio_video", + "value": 16 + }, + "device_protocol": 255, + "interface_class": { + "hex": "00ff", + "name": "vendor_spec", + "value": 255 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "module_alias": "usb:v06CBp00C9d0000dcFFdsc10dpFFicFFisc00ip00in00" + } + ], + "usb_controller": [ + { + "index": 28, + "attached_to": 0, + "class_list": [ + "usb_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0003", + "name": "USB Controller", + "value": 3 + }, + "pci_interface": { + "hex": "0030", + "value": 48 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "103c", + "value": 4156 + }, + "device": { + "hex": "9ded", + "value": 40429 + }, + "sub_device": { + "hex": "8538", + "value": 34104 + }, + "revision": { + "hex": "0011", + "value": 17 + }, + "model": "Intel USB Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0", + "sysfs_bus_id": "0000:00:14.0", + "resources": [ + { + "type": "irq", + "base": 121, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4044357632, + "range": 65536, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 121, + "prog_if": 48 + }, + "driver": "xhci_hcd", + "driver_module": "xhci_pci", + "drivers": [ + "xhci_hcd" + ], + "driver_modules": [ + "xhci_pci" + ], + "module_alias": "pci:v00008086d00009DEDsv0000103Csd00008538bc0Csc03i30" + } + ] + }, + "smbios": { + "bios": { + "handle": 1, + "vendor": "HP", + "version": "R71 Ver. 01.28.00", + "date": "04/12/2024", + "features": [ + "PCI supported", + "PCMCIA supported", + "BIOS flashable", + "BIOS shadowing allowed", + "CD boot supported", + "Selectable boot supported", + "EDD spec supported", + "Print Screen supported", + "8042 Keyboard Services supported", + "Serial Services supported", + "Printer Services supported", + "ACPI supported", + "USB Legacy supported", + "Smart Battery supported", + "BIOS Boot Spec supported", + "F12 Network boot supported" + ], + "start_address": "0xf0000", + "rom_size": 16777216 + }, + "board": { + "handle": 3, + "manufacturer": "HP", + "product": "8538", + "version": "KBC Version 51.31.00", + "board_type": { + "hex": "000a", + "name": "Motherboard", + "value": 10 + }, + "features": [ + "Hosting Board" + ], + "location": "", + "chassis": 0 + }, + "cache": [ + { + "handle": 18, + "socket": "L1 Cache", + "size_max": 256, + "size_current": 256, + "speed": 0, + "mode": { + "hex": "0001", + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 0, + "ecc": { + "hex": "0004", + "name": "Parity", + "value": 4 + }, + "cache_type": { + "hex": "0005", + "name": "Unified", + "value": 5 + }, + "associativity": { + "hex": "0007", + "name": "8-way Set-Associative", + "value": 7 + }, + "sram_type_current": [ + "Synchronous" + ], + "sram_type_supported": [ + "Synchronous" + ] + }, + { + "handle": 19, + "socket": "L2 Cache", + "size_max": 1024, + "size_current": 1024, + "speed": 0, + "mode": { + "hex": "0001", + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 1, + "ecc": { + "hex": "0005", + "name": "Single-bit", + "value": 5 + }, + "cache_type": { + "hex": "0005", + "name": "Unified", + "value": 5 + }, + "associativity": { + "hex": "0005", + "name": "4-way Set-Associative", + "value": 5 + }, + "sram_type_current": [ + "Synchronous" + ], + "sram_type_supported": [ + "Synchronous" + ] + }, + { + "handle": 20, + "socket": "L3 Cache", + "size_max": 6144, + "size_current": 6144, + "speed": 0, + "mode": { + "hex": "0001", + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 2, + "ecc": { + "hex": "0006", + "name": "Multi-bit", + "value": 6 + }, + "cache_type": { + "hex": "0005", + "name": "Unified", + "value": 5 + }, + "associativity": { + "hex": "0009", + "name": "Other", + "value": 9 + }, + "sram_type_current": [ + "Synchronous" + ], + "sram_type_supported": [ + "Synchronous" + ] + } + ], + "chassis": [ + { + "handle": 4, + "manufacturer": "HP", + "version": "", + "chassis_type": { + "hex": "000a", + "name": "Notebook", + "value": 10 + }, + "lock_present": false, + "bootup_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "power_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "security_state": { + "hex": "0003", + "name": "None", + "value": 3 + }, + "oem": "0x0" + } + ], + "group_associations": [ + { + "handle": 27, + "power": { + "hex": "0000", + "name": "Disabled", + "value": 0 + }, + "keyboard": { + "hex": "0000", + "name": "Disabled", + "value": 0 + }, + "admin": { + "hex": "0000", + "name": "Disabled", + "value": 0 + }, + "reset": { + "hex": "0000", + "name": "Disabled", + "value": 0 + } + }, + { + "handle": 30, + "name": "$MEI", + "handles": [ + 0 + ] + } + ], + "language": [ + { + "handle": 6, + "languages": [ + "enUS", + "deDE", + "esES", + "itIT", + "frFR", + "jaJP", + "ptPT", + "daDK", + "svSE", + "nlBE", + "noNO", + "fiFI", + "zhCN", + "zhTW", + "ruRU" + ] + } + ], + "memory_array": [ + { + "handle": 7, + "location": { + "hex": "0003", + "name": "Motherboard", + "value": 3 + }, + "usage": { + "hex": "0003", + "name": "System memory", + "value": 3 + }, + "ecc": { + "hex": "0003", + "name": "None", + "value": 3 + }, + "max_size": "0x2000000", + "error_handle": 65534, + "slots": 2 + } + ], + "memory_array_mapped_address": [ + { + "handle": 12, + "array_handle": 7, + "start_address": "0x0", + "end_address": "0x400000000", + "part_width": 2 + } + ], + "memory_device": [ + { + "handle": 26, + "location": "Bottom-Slot 1(left)", + "bank_location": "ChannelA", + "manufacturer": "Micron", + "part_number": "8ATF1G64HZ-2G6E1", + "array_handle": 7, + "error_handle": 65534, + "width": 64, + "ecc_bits": 0, + "size": 8388608, + "form_factor": { + "hex": "000d", + "name": "SODIMM", + "value": 13 + }, + "set": 0, + "memory_type": { + "hex": "001a", + "name": "Other", + "value": 26 + }, + "memory_type_details": [ + "Synchronous" + ], + "speed": 2667 + }, + { + "handle": 8, + "location": "Bottom-Slot 2(right)", + "bank_location": "ChannelB", + "manufacturer": "Unknown - [0x9B85]", + "part_number": "CT8G4SFRA266.M8FRS", + "array_handle": 7, + "error_handle": 65534, + "width": 64, + "ecc_bits": 0, + "size": 8388608, + "form_factor": { + "hex": "000d", + "name": "SODIMM", + "value": 13 + }, + "set": 0, + "memory_type": { + "hex": "001a", + "name": "Other", + "value": 26 + }, + "memory_type_details": [ + "Synchronous" + ], + "speed": 2667 + } + ], + "memory_device_mapped_address": [ + { + "handle": 9, + "memory_device_handle": 26, + "array_map_handle": 12, + "start_address": "0x0", + "end_address": "0x200000000", + "row_position": 1, + "interleave_position": 0, + "interleave_depth": 0 + }, + { + "handle": 10, + "memory_device_handle": 8, + "array_map_handle": 12, + "start_address": "0x200000000", + "end_address": "0x400000000", + "row_position": 1, + "interleave_position": 1, + "interleave_depth": 0 + } + ], + "onboard": [ + { + "handle": 5, + "devices": [ + { + "name": "32 MB", + "type": { + "hex": "0003", + "name": "Video", + "value": 3 + }, + "enabled": true + } + ] + } + ], + "processor": [ + { + "handle": 21, + "socket": "U3E1", + "socket_type": { + "hex": "003c", + "name": "Other", + "value": 60 + }, + "socket_populated": true, + "manufacturer": "Intel(R) Corporation", + "version": "Intel(R) Core(TM) i5-8265U CPU @ 1.60GHz", + "part": "To Be Filled By O.E.M.", + "processor_type": { + "hex": "0003", + "name": "CPU", + "value": 3 + }, + "processor_family": { + "hex": "00cd", + "name": "Other", + "value": 205 + }, + "processor_status": { + "hex": "0001", + "name": "Enabled", + "value": 1 + }, + "clock_ext": 100, + "clock_max": 3900, + "cache_handle_l1": 18, + "cache_handle_l2": 19, + "cache_handle_l3": 20 + } + ], + "slot": [ + { + "handle": 22, + "designation": "M2 WLAN/BT", + "slot_type": { + "hex": "00b2", + "name": "Other", + "value": 178 + }, + "bus_width": { + "hex": "0008", + "name": "Other", + "value": 8 + }, + "usage": { + "hex": "0004", + "name": "In Use", + "value": 4 + }, + "length": { + "hex": "0004", + "name": "Long", + "value": 4 + }, + "id": 1, + "features": [ + "3.3 V", + "PME#" + ] + }, + { + "handle": 23, + "designation": "M2 SSD", + "slot_type": { + "hex": "00b4", + "name": "Other", + "value": 180 + }, + "bus_width": { + "hex": "000a", + "name": "Other", + "value": 10 + }, + "usage": { + "hex": "0003", + "name": "Available", + "value": 3 + }, + "length": { + "hex": "0004", + "name": "Long", + "value": 4 + }, + "id": 2, + "features": [ + "3.3 V", + "PME#" + ] + } + ], + "system": { + "handle": 2, + "manufacturer": "HP", + "product": "HP ProBook 450 G6", + "version": "SBKPF", + "wake_up": { + "hex": "0006", + "name": "Power Switch", + "value": 6 + } + } + } +} \ No newline at end of file From da4e6124ea4743caccea4d2fda2b78f53e675a54 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:04:51 +0200 Subject: [PATCH 20/39] Enable fwupd on desktops --- modules/desktop/base/services.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/desktop/base/services.nix b/modules/desktop/base/services.nix index eeb289e..d906389 100644 --- a/modules/desktop/base/services.nix +++ b/modules/desktop/base/services.nix @@ -4,6 +4,8 @@ gnome.gnome-keyring.enable = true; dbus.enable = true; + fwupd.enable = true; + flatpak.enable = true; printing.enable = true; From 3c0a34b4af6782b55bf78a062bc518cb69551e75 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:54:31 +0200 Subject: [PATCH 21/39] Update secret frues-surface3-age.key --- sops/secrets/frues-surface3-age.key/secret | 19 +++++++++++++++++++ .../frues-surface3-age.key/users/pedro | 1 + 2 files changed, 20 insertions(+) create mode 100644 sops/secrets/frues-surface3-age.key/secret create mode 120000 sops/secrets/frues-surface3-age.key/users/pedro diff --git a/sops/secrets/frues-surface3-age.key/secret b/sops/secrets/frues-surface3-age.key/secret new file mode 100644 index 0000000..a5b3907 --- /dev/null +++ b/sops/secrets/frues-surface3-age.key/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:fPGIf3XIBdfWvqyvKrr+rxI4ZQ/a6Msvc+VMt/xUjTXn/zWunzlV/LXzEZO/l6kbRbWGexwl8TQ+UHBNRThFkSYYm8/izl2KKjo=,iv:HAIo1iP5sXWvcPkZ/VAFV8w9hbnF9dKF51jzLUpRDHI=,tag:n8VY8ZjOlkLASExJIdbWjw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkaGpYMGpjdVV5YWViNkRv\nNk0rZGo5NzQ4M2tldW1QaG1wYzhTYk52REFRCis3RUpYbkdveDJYbllMRVJ3OGtx\naGNtTTVvK0NaTm9FcFN1YXA3eklsRDgKLS0tIGRFbHorYXNlNVR3WnRLWkhOSEJt\nczQ2bkVvZ2FiRHpHUFhRdXJoL2pmVzAKJyq1vDzf/RXq1gkN/qSEfiAk19kIO42X\npjokQyMmM2xkHAN7fC/Bj3Mx1GedfOgCZ9u95DV2SInZLtI610urJw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1UDk3UDBVYy9WSWUxZXhy\nMVY5b0VlQXpOTnkwSU96c1gzUkVYRWdYREM0CndDMEQxQ2o3bDg0L0hVOWFjOHdS\nYThoMFlBQllFSVBIaDdFaVgyZzZGcnMKLS0tIHZZVHdvNTE2OXM4U2RZVGRQdGw4\nbFRZTnIwWERuTU53aFlzNXc1b2pyVHcKBkgOrmPl8xEeuJpwRPb0YBvou08qe8rf\naNH7mMLV/FGH5OxxWkxZDnOeGu4nXI7cn19jNB8QYlFh5Bft3vOCCg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:54:31Z", + "mac": "ENC[AES256_GCM,data:ENWGtrH6BcI7IBiZxzS07GBHUhjV22pS81il3grzgKtBdsJRjAvbT73S6cgoMAmvy+5XHxH7hmEAUCJ1X7oLdMqrgIiXh2J4m8eMRlr3BaDaKLTeEsHnCw4fAD0Hb7PClYhxkY0+9Hi3j/q65O7gy9JQ2F+uQ+Iwlvs3uJW+iVg=,iv:2epPNizXgtxhkul22LUZHPGHYg0WHVGlatqbpkhzLuc=,tag:CZgsgOMXiWAsy1kEMwDKMQ==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/sops/secrets/frues-surface3-age.key/users/pedro b/sops/secrets/frues-surface3-age.key/users/pedro new file mode 120000 index 0000000..c7b3668 --- /dev/null +++ b/sops/secrets/frues-surface3-age.key/users/pedro @@ -0,0 +1 @@ +../../../users/pedro \ No newline at end of file From 7803c4314970d4d94fc8997d6d4fec891447abbe Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:54:36 +0200 Subject: [PATCH 22/39] Add machine frues-surface3 to secrets --- sops/machines/frues-surface3/key.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 sops/machines/frues-surface3/key.json diff --git a/sops/machines/frues-surface3/key.json b/sops/machines/frues-surface3/key.json new file mode 100755 index 0000000..5c3c81d --- /dev/null +++ b/sops/machines/frues-surface3/key.json @@ -0,0 +1,6 @@ +[ + { + "publickey": "age1c2r28vncfxtz34kx9vzx4a7hqnmz3mtq7rfm2ldyja437dh9yfrqm0vgde", + "type": "age" + } +] \ No newline at end of file From a7c67efc1833405003fdce2f2de5eff1018eb38f Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:54:41 +0200 Subject: [PATCH 23/39] Update vars via generator mycelium for machine frues-surface3 --- .../frues-surface3/mycelium/ip/value | 1 + .../mycelium/key/machines/frues-surface3 | 1 + .../frues-surface3/mycelium/key/secret | 23 +++++++++++++++++++ .../frues-surface3/mycelium/key/users/pedro | 1 + .../frues-surface3/mycelium/pubkey/value | 1 + 5 files changed, 27 insertions(+) create mode 100644 vars/per-machine/frues-surface3/mycelium/ip/value create mode 120000 vars/per-machine/frues-surface3/mycelium/key/machines/frues-surface3 create mode 100644 vars/per-machine/frues-surface3/mycelium/key/secret create mode 120000 vars/per-machine/frues-surface3/mycelium/key/users/pedro create mode 100644 vars/per-machine/frues-surface3/mycelium/pubkey/value diff --git a/vars/per-machine/frues-surface3/mycelium/ip/value b/vars/per-machine/frues-surface3/mycelium/ip/value new file mode 100644 index 0000000..57175c9 --- /dev/null +++ b/vars/per-machine/frues-surface3/mycelium/ip/value @@ -0,0 +1 @@ +58a:b62:5897:e03c:961d:b7ed:5222:2260 diff --git a/vars/per-machine/frues-surface3/mycelium/key/machines/frues-surface3 b/vars/per-machine/frues-surface3/mycelium/key/machines/frues-surface3 new file mode 120000 index 0000000..14d276d --- /dev/null +++ b/vars/per-machine/frues-surface3/mycelium/key/machines/frues-surface3 @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-surface3 \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/mycelium/key/secret b/vars/per-machine/frues-surface3/mycelium/key/secret new file mode 100644 index 0000000..e9fbbcd --- /dev/null +++ b/vars/per-machine/frues-surface3/mycelium/key/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:YxXBwydNdSMuDkHt+SKmskcXLu2djPXWQ0FOFLV+PbU=,iv:+tB4haEkl5DsYajxVxZ3xhg7LQ1GxR7t6DDAsJkwfzc=,tag:/gjj70Y+opRwRJ5RsGN71Q==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1c2r28vncfxtz34kx9vzx4a7hqnmz3mtq7rfm2ldyja437dh9yfrqm0vgde", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhbDJOM2hUOWExNjNteWFU\naXF5cHZLM3VRTVpYem8yQ3NiWEVVY291dkhFCmoxdXFoZWRDNHNDY1lCMFRzemxa\nYjBHRFdhR2JYRTlRck9hcEtqQ3BoSGMKLS0tIE1McDJGdXJMNENRaEFYbkpUSXoy\nYVI5WUlyZnFreWlvaDh6d1VwYTlSc2cKd7Bhyckp++xhJejUoGbqJ89RLrq+AuAa\n2N/um93RAlZJuu1Z6bBzajrYkbL5W7iqwYVxu79NUHd0gffg64UPGA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5azV0V3JKeDF6VWIzWjJF\nVXc0cldBU3J5QmNWTkdJNlF5MHBXb3VrVkRJCjhxM0krMW9Rc3Y5QUJXQllMc2dF\nSWFEeGJPNXRlU0k0bEZVWGRROStDK2sKLS0tIEpJeWFOOERmVlllejJMdG9zaWhq\nb2RiTU96Z0R6VDZpK2Q0cG5wZ0hrRXMKiaHIluHDKCvaeqd+XUnSslZN/Jk2cSuH\nAKdiuJCNBPnRfZWWySePZf3mMTxXS9nTnAfufH3RiD/hcgm+nv+8+A==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1TjFPanpWNVR1dWgyTHBB\nSDQxSlFFNlB6UmlkN0VJQjJUbHh4OGtiWGhNCjNDQS91dzAwVWl5eERqSS9KOE5G\neXRIRVQ0T1FBazNHMGhpZnZ6ZSs0OTAKLS0tIHpKak9idEkxMENNWGJNYWxxcTFj\nMTFpaDZvbjhwbnJSMWJNeFpVUG94K1kK9xIuEp0sMm89goU5BipMHS+iCzndaW1m\nJj6qdsR9HMdmmAroh+FI4KrmfO29wIEDcJ/djpxvVSfJW7CQ/V3w4Q==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:54:41Z", + "mac": "ENC[AES256_GCM,data:r5YEJ54gJ7SJbYwRb/Hve8GaF8vHS3UfGjQCUast/bWSokEK3tDbw5aVdw7tLevdDwWP4UZFQNdqSVtjo2l5QVlnpb3eTQgoH8404z0CP0q/R4PxKm1OOnriCYP7P2aJjAEQFUM2MsbGS4UsR90AVSPsbmhnRPzKbk6XjeTZ3z0=,iv:ILf9PLR0GwfCx7Qc5gL0fSA7kmztPyso01KhedhhGLE=,tag:5DbQp0BBiDF7XnQzbNTC3A==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-surface3/mycelium/key/users/pedro b/vars/per-machine/frues-surface3/mycelium/key/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-surface3/mycelium/key/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/mycelium/pubkey/value b/vars/per-machine/frues-surface3/mycelium/pubkey/value new file mode 100644 index 0000000..c9f0b02 --- /dev/null +++ b/vars/per-machine/frues-surface3/mycelium/pubkey/value @@ -0,0 +1 @@ +7286fb3936246d9f0b74e18cebbb8984adb17856ccb3250c7bb74ff96d72cf61 From 6692467ce6801db3c9e134c76bc92964f5f40f5a Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:54:47 +0200 Subject: [PATCH 24/39] Update vars via generator openssh for machine frues-surface3 --- .../openssh/ssh.id_ed25519.pub/value | 1 + .../ssh.id_ed25519/machines/frues-surface3 | 1 + .../openssh/ssh.id_ed25519/secret | 23 +++++++++++++++++++ .../openssh/ssh.id_ed25519/users/pedro | 1 + 4 files changed, 26 insertions(+) create mode 100644 vars/per-machine/frues-surface3/openssh/ssh.id_ed25519.pub/value create mode 120000 vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/machines/frues-surface3 create mode 100644 vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/secret create mode 120000 vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/users/pedro diff --git a/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519.pub/value b/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519.pub/value new file mode 100644 index 0000000..4340e8c --- /dev/null +++ b/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519.pub/value @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsV+pT8fHcrDmOWSeWKgpdSLGHTHTk3jeIvuQIQcO6F diff --git a/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/machines/frues-surface3 b/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/machines/frues-surface3 new file mode 120000 index 0000000..14d276d --- /dev/null +++ b/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/machines/frues-surface3 @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-surface3 \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/secret b/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/secret new file mode 100644 index 0000000..d57853c --- /dev/null +++ b/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:yda4mWEhJSC55C7xK1khXeOtVG6+fqySf1uysDDbdtKN/qTsbmsBSZN5GhMYw7zyU3Dvc2QneFOvxteagRgbiaxihR5bKS9W4RKwVopeGARm/l0RwdSfSpjd5Odyh97hcQVCyP3ZheNTlB3CMGRyfekDEWR9d4ahyo25MgLEaYrPwdPyJrq4/eRwVHT2+qhcAkr8MVWN/mt7Ws/rxHQw5WMlJfCBz4QacTULQH1PfYQ0g/9k67VuQQhEgzkuCyV8Da1SA0LPAU8QAfnvK1GAQevh69MsBm00YPdKLCDKXvYYfXVQuGDTb3mCinLZG+rQSfWyFUXZdrqm9rG49TMYRMbEzxRmmONbPnJfAsUuKYdiCjvWrVMz/KiRK1ziIGH8gPfzqCpJ+0ujDsuxZWKWu7CeKWnGsazwxth8KR3+c3UMTlMU6+iok5dWtmfZfJ2jGkdKuuTMuE6jUzJNrtzF01Ab5YnWenNm6QnA+iwrdlj9qMNKrnJv+35UXGQSeyEfxOj8,iv:l+sGbUOIykPqZMi7NI3H/rDlLDjzQX9wH6lz0+p/xZg=,tag:674hhr0pqIt8LOkeqOCwFA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1c2r28vncfxtz34kx9vzx4a7hqnmz3mtq7rfm2ldyja437dh9yfrqm0vgde", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNRTBmY2dCdTB4cVBmZzVH\nOVhCaFJ1cFBranRtamhNVDlCcUhFWEpyYnc0CjdhNS90Q0dOY3JsYzJxQU9oS3FY\naFlMNEZyQkNSRWYwakFEanJRMnpIUnMKLS0tIEZlcC9FZ0JocHBXejNHN3VOQkg0\nK3VWTnZpZS9PMXlXZWoxd1VLNzdrOEEKYRASMvJ/4W5Ob9UlKUVCYKz8CgNMdmrQ\n2fQyGHKDygSVg28mR2Pu3RFuvJEP+JC9DyT47WW/W3M5ZqQKGdxh5w==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6YVpSeXlieTcwdm0vVEhY\nUTl4NnJaWVpiNzdGQ0ZIbm44SGtiYzdyNG4wCmZxQlNzdWJmeTBHSnI4NmRoVjdn\nVGVzcXRUTjRqMEY3WWJwRHozRFZsQzQKLS0tIElubFp6WkswZFZOUnR6YkZkbVB3\nRlR6ajhsSnhRaDRYeEcxZDdtS2Z4ZlUK/vnpDX+yqZTY1B41dAfAURdyXwHu2hsC\npgy31d7fGUv3kjF8LFwxnyJm4Ordp3Zw/dFWD3KTxKK8eDGDQUgi0A==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArYWFKTkJuVFlqeDR2UkUy\nMFhCZHJYd3BkS1FXTmdqRWpzWTRQYlhsR3pzCmIrRWM5WWV6bU9uM2QxK1FNdGFX\neWNxU2YvOEcwc1Jsd0N0bzM2MCtNMUEKLS0tIEtvMUZ0bW43RmxVU0RZYXdMeVI2\ndGd2NGJQMGswUHpqVHV1OUFOM0xpS0UKsRIfh1mhNfONAiZgD83XEj/TqrvNbdC4\nCTlkrzayrjSbIrTgRBWB1XgsbeMrChFfrVjRr/hDkV8lH8xSPneCEQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:54:47Z", + "mac": "ENC[AES256_GCM,data:b0jzb1864Tb9BUohD/FbLdghIZNt1BDhKu6RukjL4MnfnthOJH0VAHAQufHCyyx/7DX3Qtp8Jdqr8d7hPnE71VURq7xnTpzrL/EJ73VT30gi58gSCd+4OqZ6PapAwAOZ+SBNmgm0WvAacYfthJUeWLtfQS9Xtf928nXQGFqgF1M=,iv:x08AF9BJLd1q+/uw/bzLDrDVzzCAcL64uysz6Vhoxj0=,tag:0SG95rUAaMt/9alyKyn89A==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/users/pedro b/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-surface3/openssh/ssh.id_ed25519/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From ac22699adfa362ac0b5733e51959c47e47834002 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:54:54 +0200 Subject: [PATCH 25/39] Update vars via generator root-password for machine frues-surface3 --- .../password-hash/machines/frues-surface3 | 1 + .../root-password/password-hash/secret | 23 +++++++++++++++++++ .../root-password/password-hash/users/pedro | 1 + .../root-password/password/secret | 19 +++++++++++++++ .../root-password/password/users/pedro | 1 + 5 files changed, 45 insertions(+) create mode 120000 vars/per-machine/frues-surface3/root-password/password-hash/machines/frues-surface3 create mode 100644 vars/per-machine/frues-surface3/root-password/password-hash/secret create mode 120000 vars/per-machine/frues-surface3/root-password/password-hash/users/pedro create mode 100644 vars/per-machine/frues-surface3/root-password/password/secret create mode 120000 vars/per-machine/frues-surface3/root-password/password/users/pedro diff --git a/vars/per-machine/frues-surface3/root-password/password-hash/machines/frues-surface3 b/vars/per-machine/frues-surface3/root-password/password-hash/machines/frues-surface3 new file mode 120000 index 0000000..14d276d --- /dev/null +++ b/vars/per-machine/frues-surface3/root-password/password-hash/machines/frues-surface3 @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-surface3 \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/root-password/password-hash/secret b/vars/per-machine/frues-surface3/root-password/password-hash/secret new file mode 100644 index 0000000..4e3bc8f --- /dev/null +++ b/vars/per-machine/frues-surface3/root-password/password-hash/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:uCT6cftq1zTdEmwvKdyP/qqDP/Lh0qh8d+mzJqW0pghMmZh8Cklk8f4rnArmiMZ3wxKArjbMaLEHAVXiqMXeLhxXMG3fWW6mv4ulgm64Dpkx1yEl/HQ2fUn8PKhroq5H2JXBgJ1OXR4w0g==,iv:EHnIgRTpq26hsAjOgTfxN3rgVqjBgZrjxakOdjwEll0=,tag:CbXGxfMzzHi0tOtU91fPaw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1c2r28vncfxtz34kx9vzx4a7hqnmz3mtq7rfm2ldyja437dh9yfrqm0vgde", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHM2hKWFQyVzV3MlRJK1FO\nUFdqRnRpMjVST2xEMFhZVHVWVGlGdU1RNXpnCldCT1NMUmdNaURrZkNwTjlVS3hs\ncWExZEo3Z1lDWjlINW1uSDBoNGhSd0EKLS0tIFJpdWwzZ1ZncE1EZWVTQmhXdDZa\ndlIvTm1oZ1hZMWxadFRlZ3FuZVZxN00K0vpjxGUitDtSk+59G4kMODdZ2/2sHLk5\nGzgcUvAGVElnqEVs3mQb5jCjTxMlk/BjMpV4Ng8JTooc7EkNM1sRog==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLeGJtMnhSelJOQkZvZSty\nMWx5Q25VVGFyTHNXUnNQZTMvZ1dHUVFQOUhrCkpXZktFL2hBS1BDZmRPSVhzbHgz\nWmxGMmMzdTNVRGNVd1NGUVdETGwySXMKLS0tIFkwa2IwYUVKeEJ6enc3dmtFbnFo\nT1JiTW1Ua2ZXb3RjWHpKbWt0T1B0MlEKmCdM1yLE0nwcPm+Vi0Nl7tiWTT/d89s6\nfjkvsSnV8jAvpI+6NZDr8haj9F3uoc/0CJVuuK/C8oHqUH98HY8Tag==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBReVdjMkgxQWxiNHV3dS9u\ncWVqUVBubkxhSVg1bjBNcXFDY1ZsMTZhQ0FZCi9pMWhGSVJud24vRjRib1cyY2tX\nT011MmNwNjFVVmdML28zTER5OVNKb2sKLS0tIDBlcnppTThDZnFPK0R5eGxwbFIy\nanZwOXE4cDluSS9YQUFpWmE4d2JvK2cKGR9h+LbZ2xTqQwiaNDaqpO17Lqo6hz3T\n50ABsT7H+EAUqiLdj4Il5clWumTY1lPazedwbH9tHZHsw05fnKRrAQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:54:54Z", + "mac": "ENC[AES256_GCM,data:JJ0jHEwhJTjbZf7O4HIYVc5YzNBkqEcSo85a0gVhLznmefiPwnSr49mRDFewu7WKJ3AXPAXAgwIbme0dgd5clsYAY3cUEkRtM8W68/1mqP4IFpxlIbG5EOm6xJ7Jy9OKnFb46SGJ7Hwt0Ogkwq3J7d8OrbRgd1qGAUIlr52T7ss=,iv:yUKzNSp0QqIDcz0qFVUdh+cQkEf9Cn8x6RP4sB6Q6yA=,tag:ywXILsizX4cW/zOC652PXA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-surface3/root-password/password-hash/users/pedro b/vars/per-machine/frues-surface3/root-password/password-hash/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-surface3/root-password/password-hash/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/root-password/password/secret b/vars/per-machine/frues-surface3/root-password/password/secret new file mode 100644 index 0000000..65f8096 --- /dev/null +++ b/vars/per-machine/frues-surface3/root-password/password/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:mTVMWkRvB/YVWZiu,iv:h+DVXcpx1IZwWL11YBxbu5eGbtb1ux6RihbQs2+rhcI=,tag:WbXQRQTyO8dAGZ4SifWPHg==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1UGZwWnZrT3lVNENESm1J\nWDMwdGtaTEJqS3hRdHBPTVEzQkI3UlJjUG5jCmFyZWVoY3k4OWkyZTI4RlZOcFlU\nQXNrYmd0R3VpVkwxYldsbENkcmhBRmsKLS0tIFAyZXpoSDBEa1JhcVkwd2dWK0Yz\neUNvUGdVM2kwME9ZM0h2TEZLUHdXMEUK8UhxI2pFfNyotLIQonXbV2X0efJRjrL5\n94M+d2lM/vzI71HN9Qkp7/p6PE0citxdEB43MR55pmCEg1CBmaGHYg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4dTU1WUltUGtORlFlekVq\nVFlyTU1IQ2FHSEN2cW1OVngydVFkNlpvNlU0CmpQV1JnVThpQlVyeHNneTVGcm5R\nOFk0S3RXc0U1bXNmVUZONGl6OFIyMEUKLS0tIEU1eExEM3JqbW8vWktyclNGSGdR\nRzlTNk1SU20wVlVXQUo2MGxyb3FWRTgKM5dNWzQQGezMQRXkOIN7htegQc3O7osN\nzK0YIgUmUsKyygL3FiHIAQUhKrmg86WHQZngCwyxFv/HX0BGoI7pEw==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:54:54Z", + "mac": "ENC[AES256_GCM,data:lVQs46C4H9bR8CUarQAzxkZAN+02b4C3wz1EEiG38oUCsgbzrXwGJ1RVD2ztK0/MCINCmrCJQh2zYrcwFLRPrGsEOy9a+k3nWKxcRNQQTHlp+SLsminu+txhHw+F9nBYTTiI3h+AN0Q2vBmgiPQ1k1IVrbdm8Uf6Z/4b06rQhwc=,iv:pSmHk+wGOhv6HX/BNMitB860DrDn817JC+ckRK9mkwU=,tag:Lxn69gSHgEQ75jyzCjOVHg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-surface3/root-password/password/users/pedro b/vars/per-machine/frues-surface3/root-password/password/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-surface3/root-password/password/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From 566ce6590b20e734cb98f60c0f9886172dd7b41a Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:55:00 +0200 Subject: [PATCH 26/39] Update vars via generator state-version for machine frues-surface3 --- vars/per-machine/frues-surface3/state-version/version/value | 1 + 1 file changed, 1 insertion(+) create mode 100644 vars/per-machine/frues-surface3/state-version/version/value diff --git a/vars/per-machine/frues-surface3/state-version/version/value b/vars/per-machine/frues-surface3/state-version/version/value new file mode 100644 index 0000000..5d54076 --- /dev/null +++ b/vars/per-machine/frues-surface3/state-version/version/value @@ -0,0 +1 @@ +25.05 \ No newline at end of file From c9997935102395f9b4a9411bb326100115158853 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:55:10 +0200 Subject: [PATCH 27/39] Update vars via generator tor_tor for machine frues-surface3 --- .../tor_tor/hostname/machines/frues-surface3 | 1 + .../frues-surface3/tor_tor/hostname/secret | 23 +++++++++++++++++++ .../tor_tor/hostname/users/pedro | 1 + .../machines/frues-surface3 | 1 + .../tor_tor/hs_ed25519_secret_key/secret | 23 +++++++++++++++++++ .../tor_tor/hs_ed25519_secret_key/users/pedro | 1 + 6 files changed, 50 insertions(+) create mode 120000 vars/per-machine/frues-surface3/tor_tor/hostname/machines/frues-surface3 create mode 100644 vars/per-machine/frues-surface3/tor_tor/hostname/secret create mode 120000 vars/per-machine/frues-surface3/tor_tor/hostname/users/pedro create mode 120000 vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/machines/frues-surface3 create mode 100644 vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/secret create mode 120000 vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/users/pedro diff --git a/vars/per-machine/frues-surface3/tor_tor/hostname/machines/frues-surface3 b/vars/per-machine/frues-surface3/tor_tor/hostname/machines/frues-surface3 new file mode 120000 index 0000000..14d276d --- /dev/null +++ b/vars/per-machine/frues-surface3/tor_tor/hostname/machines/frues-surface3 @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-surface3 \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/tor_tor/hostname/secret b/vars/per-machine/frues-surface3/tor_tor/hostname/secret new file mode 100644 index 0000000..735746e --- /dev/null +++ b/vars/per-machine/frues-surface3/tor_tor/hostname/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:QlD7y0a4JWx/43vFVNmSzcE2OkbY4af5ae1FQ97s/ltZ9k99OcwNR2Gvg/6wI9B/r3RBhHhXKlkkbJRcfMYd,iv:rkXO6ALdB9Xs09Sf1ItHquByRSpov6dnVic0aU+SXQo=,tag:DCxBXKa/Gm/YJTVuqw1SDQ==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1c2r28vncfxtz34kx9vzx4a7hqnmz3mtq7rfm2ldyja437dh9yfrqm0vgde", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmSUpyb20waGRadEpxSEZU\nVno1SElCOGl5UUR6cVFISlNsUCt1clg5VnkwCkVFNU1ybkZGcDU3UzM2M1c4dkp4\nempkMEZSdkpoSWxYTGpEbGJTdjBRTDQKLS0tIGI5a3NaNEJxTmRDamhYWENOMCtP\nNm9KOERFcVRuSFFKYnFzMGJjdGw3WlkKpHkAm5xDRvA8PX0dKL+ysiy97Nv2ZvTX\n4LPKas8lSTmlInKhNTSgowK5o2uuM6Ovg81QqjhaIOJeRqFJHrxbLA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArcitxR2N0Tzh6YTZEc29S\nbS9QcU5WbHE2U3Ivcyt1Wi9zVi9CSTV6cGs0CkQxd3U5R1J2Q2I4aXlXZmpCYkJE\nczNjYmFxMGxINkxqQ2ZReXE2M3FldDAKLS0tIFhZd3I0ZHFzU1dlQ3dpZjFKREFx\nTG9MUmdNK0t1VVVLVFhHS0tkcXdpTjAKSeL75uNQ4RO+nNF3Sr575UGnQD3DdPJd\noDKcy1xV51xjyZ6xoBukZsjpSzaqN3TIAjyJrvhdtFftEptqrSpQRA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3MnhoaHpMZmlJWHd0UmZR\nV3RQQXdkYm1VTStiSmhGbWF1UG9TUmphQTNjClJCc0dpWk5ibGp6aWlCem1MZlh5\nNnpjblVxcFBxSHlwSmk5cDFFbW1zVVkKLS0tIG11Y2ZpWHprcHEyQWNXblRiWnVo\neE9TandHQkVLTTBLdW9tL0pMSnNDRjgK9uxt1d9SG8KWDBEtej68juUh1tgPEZR5\nAynRVsjjG7o/VG/9p1y2OVUog1Myf5jAjtl3Y6LmTVEWBAh0ylNPug==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:55:10Z", + "mac": "ENC[AES256_GCM,data:iJxQ7A3kMjtzo/edH+MmKNmFMgqqOyZ/DYYBy9BkgAIr+UjaC8ygoOh9tdVZFg+iys7qXMPQScCPb9wiv/Lw8JTPHCwT1JaFBsraCNDKYgFpXiGIMIGWn9dvboo7sgLJFoJIUn4gaLZGOBuOTJNC3vA8W9nt2NvlxlYxK9Gc0GE=,iv:JRvnwP+ZvPqOrLWv/QlFI3I4RYnNAKFRMnPZ209iaQA=,tag:pdG4LVyq84Ur2WhlnH+loA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-surface3/tor_tor/hostname/users/pedro b/vars/per-machine/frues-surface3/tor_tor/hostname/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-surface3/tor_tor/hostname/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/machines/frues-surface3 b/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/machines/frues-surface3 new file mode 120000 index 0000000..14d276d --- /dev/null +++ b/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/machines/frues-surface3 @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-surface3 \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/secret b/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/secret new file mode 100644 index 0000000..613a876 --- /dev/null +++ b/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:Z+96rhSf0GU6exSk8/G/fhtaygFg3zd4a0m+jYTiJj4pXMaEkggnfQemjWqtfYxpYOAoZWJTSO2MNyc4fVkUyt3ZAKGv5cHlTHllf0+ejuVEPamleoEP8n1oqCh9znk+,iv:VLUf7ZO/RkN/HYY6y7owkCD/awGNDZLFfXIFhY5EPrc=,tag:nfMxj/ykrVgVCJ3gil6GBw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1c2r28vncfxtz34kx9vzx4a7hqnmz3mtq7rfm2ldyja437dh9yfrqm0vgde", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBodDcvN1k2M0pvNlgzdThE\nc0J2eUVJU2d4djF4S3I4bnFZSi9nZzA3NWdRCktYUHYrQXk1TitzMzVBZWQxc2dX\nL2dFS1R2ZUZ0bXBSZkJNWjNEb1ZCUlUKLS0tIGNNejZHaldDMHVCcmRTVkJiTnll\nYjVob0hjWmFRK1F0TlB0ZDBwbzY2NnMK1oHiNvkf7wnXFRfWKKiYY3IXMhK4xSBN\nku4BrIj0/scRO8aXlknh3GmZXmuXBaz1Jf/O08M0FunrXTIuGcUzWg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoaWtwUzB3VHl2K1N5SlpX\nWjB6cnREenlTUFRMNS9zL0V3R1dWRXVjT1NvCmV6VDJNaEVpSDY3cVRMVUZ1WTFF\nKytKQVJsWjNFTTV5VzVudzNRNmxBNTgKLS0tIHVSNmJ3b2g4SU4rV1ZXQVY1cjZD\nTSt3cUhhT0tPOWtMcU9tYUg0RS84SVEK6Qg3chE+efRzqQrt/VZacddCfYArYs99\nyURBT2Hh+EtWa+y61C70bFCM/z3KrAbNlui/HmnJrlfK/hwAaERuww==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGcDduLy8zeDFUdEVqZXBL\nZlFHSWNxZE96QitWaWgycC80ZytUbFQzclNNCi9WZUJnOTN4eEhseUNBcEV6REZr\ndkxob21HQTZxV0FuU1RQeEF5a1NGbmMKLS0tIDgzeHdZaXJkM0Z4L0Q4VVlkbC9p\nRDZZajdNbnZMS3EzM1J2dFRHS0ptMGsKL9rTdfpXiEvAeVfvpGp56+Z1q36qWXAD\nNlkN9dN15ENF7qfjaZLvB8GHZtxopbdulxIAkpYpIqNUlsKqAlR3Cw==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:55:10Z", + "mac": "ENC[AES256_GCM,data:rmRAIxeP+hdUYg5G90yJL5FvVr1S1jTPsQe+yCKVHPQhABWOBJumBbcHpidY0CNMuabqDWo05nSEWNK9Gu4jvy+7fH+ibRrprb5NWOv/nUfBBSZrkryvwwy3tIEMqJOoklfWJ7SYBeMCvcVhEvXWXy3PAvIGGB1Tv6lqJQdXjys=,iv:PtYMT0HwO5ojCdoanZYDWW6pXr+TO3ASpiH4w+RPk6Y=,tag:j9/1YqdIbXL9QQR60rVpKw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/users/pedro b/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-surface3/tor_tor/hs_ed25519_secret_key/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From 843937d01397fe131e1f075c61ec16e4cebd59c0 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 1 Oct 2025 19:55:17 +0200 Subject: [PATCH 28/39] Update vars via generator user-password-pedro for machine frues-surface3 --- .../machines/frues-surface3 | 1 + .../user-password-hash/secret | 23 +++++++++++++++++++ .../user-password-hash/users/pedro | 1 + .../user-password-pedro/user-password/secret | 19 +++++++++++++++ .../user-password/users/pedro | 1 + 5 files changed, 45 insertions(+) create mode 120000 vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/machines/frues-surface3 create mode 100644 vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/secret create mode 120000 vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/users/pedro create mode 100644 vars/per-machine/frues-surface3/user-password-pedro/user-password/secret create mode 120000 vars/per-machine/frues-surface3/user-password-pedro/user-password/users/pedro diff --git a/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/machines/frues-surface3 b/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/machines/frues-surface3 new file mode 120000 index 0000000..14d276d --- /dev/null +++ b/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/machines/frues-surface3 @@ -0,0 +1 @@ +../../../../../../sops/machines/frues-surface3 \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/secret b/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/secret new file mode 100644 index 0000000..d2ca0d3 --- /dev/null +++ b/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/secret @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data:2zcv/Xn120wY4sNzbcu9TCQhSnD1ONGJh250sDnV7Z4AtGHO57WWnpp7Ff2h2ERdWCFoPvGPA6yyz8zUSL0juBOqUC6HNtu36qkQMgkndfNucditvBhSodbedPQW544wHr4ntqqL97DN4w==,iv:GTbxxNmvtVNc1TSfAWfg6SowGftfaep73NCWMSbQaD4=,tag:dlMwmkdS5jSYYWjqX5aWDg==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1c2r28vncfxtz34kx9vzx4a7hqnmz3mtq7rfm2ldyja437dh9yfrqm0vgde", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLR2wzdFQvdGtuVDY0LzBw\nQ1VOM1lJUHRDZXkraVhMTjRrcDIwbWp3eHhrCjB5WlJFd2ZJRFpiOEY2UTVnRWVZ\nSVQ2WUFCekZtVERJS2VjRDd2QjlwNUkKLS0tIGIrUEJqbUM5a2F1TTB4Q1B6Q3Er\nckI5REdGN09PQTdtMnNRaEd6UHZGYXMKGlAyIowbylFcxUVbyP3JWbEWV+HAP6Rc\nd9HapeoHgDY/wur149Y0FK3/L4yo6VryxQnsRMIvrFPXE/yRBJR2sg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCTjFQT2I0Y0wyV0pjSDJJ\nYk9ORjlmYnlOd3ZmNDhVTzMzNjF4QUM4NXk4CmY5MzlYR1BKNkRKNENLU0IrbzhU\ncDBnYjVFMFUzcEFXR2VIdzhUSTFZOE0KLS0tIC8zODNRWkFnWTlUbE5ML1lUd3ZC\nbEV3dkpPME0wWjYyQWhGR3ZJYkNqbGMKraXkcBZ4Ruf3YHeJkct4jtRFG01EEN90\nKwUA/RmOBAgcEpEBtBJCBOoIUhX+ZASoY4CDLqDwWxnhKD3kgi0gzw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBneDhqb1hQOEp4TThpbnJV\nTER1UW1RRWhKd0I3bXhjYUgwYlF0TzN4ZFZVCmdqRzQrZUdhOWdadGcwTllXelQw\nT0crV0lHdExhaVJtN2Iva2NrMW1iNjQKLS0tIENrdnRGZ3M1TzRMdTM5ZzQ3Mm5Q\nRGk0cXM4R3VJZ3dHRTlpdWI1NGxwb00K/odf6Effahcb7OBsJDZs59jxuiHuc3Q6\nelKaMstUnYqBK9vNXjZLIZ9CQLUflkZTjPs2LO7rwoSKXXGKqvmDGQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:55:17Z", + "mac": "ENC[AES256_GCM,data:Nr/uHCLI7XNtjCAQ5Z2YPuoA2LNK2nropeC2NJmDjzejvsW4h+EfjZ/v+Hen+KNhvh1FOdqKZ61WRrSnTwK3UAF9p5ZexqZBntf5cfZWr0jKtJjXsu8XT+gYVBg90doygar88sQuk8mmuXgHXIV1jfONQYWOl0KW2KLatpcry6I=,iv:MyhwUinL/I89Tml+ck5m4vPdiHvxoRj74oC9kI6Ev0I=,tag:cei2n9+P0/cYHX02Slg9kw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/users/pedro b/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-surface3/user-password-pedro/user-password-hash/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file diff --git a/vars/per-machine/frues-surface3/user-password-pedro/user-password/secret b/vars/per-machine/frues-surface3/user-password-pedro/user-password/secret new file mode 100644 index 0000000..268ca20 --- /dev/null +++ b/vars/per-machine/frues-surface3/user-password-pedro/user-password/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:kpsITyiyL8sUqrbz,iv:JzeO/z27a+FxGFbg8BqpW50hCcl5v84XbGLr5Dan/Qc=,tag:Nd/+VGB0cCoOLdWA+zppYw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age1lrg2j5a90yy4ccj4c8yrmkk4rx029t5hfh6n5a2nte77pwlspp8qvgmtmg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5b3gzaU5JUnVKR1RXQSt0\nVjd3RGo2ZzJLcE1xSkRnM2FEdUxGbE9SQ2pjCmZ3aTE3RjVUWUtlWGhUdndMMDdK\nbklYSlp1cGZNVlJiRDBFM1lEaHcwak0KLS0tIGJNK3hpNGxicnhKS0xEQVY5OWd2\nSXdqeDduR09IZjhoQWxVd09KNTJmcW8K8vC5vlJ1w2inC0fxWnpndVSp6R3egC/I\nBOopjEVtYXZYV2xcn673BRKC+Tp/8236lhfR41vTBqKRuDFYL7dQUg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1r2sw9uncvkqtklypw4rttufhw86lhhqrghed8l2kda6hdrd9ypyqm7y863", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuWUZPSmljaFBCVHFydllG\nTS9mSXlCemlCTldJUCtBWkZudlpDbkt6SVVjCkFBdEtVdEg3NmpDZlczeFdKTExU\nQzc3WldzRW1Oc3U1c0Qrbm54ZXhmbjgKLS0tIHBLVGcyWlk1Rno4ODF1ZkxEbEJs\nTyt1eHBpb2Q2MjF5L04wSjE2bEFzM2sKLDMypikyXlFCpw+IHU3Y5f3SUPryF/+3\naGYZHaxinQoF3TUiEjDFJAs4mg7Op2oOYNxCvoE764tA8IJQVEN9MA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-10-01T17:55:17Z", + "mac": "ENC[AES256_GCM,data:c09knxURyJ1RUGvoumd1zi/lhP8Rn36Me0od4pweEFv9yggU7N7EL6tIfWdC4fFyMRWSbP88/TDUvj4/cfJ2Prs2zx/RFnS0GuYS3nm2zifyekrtSGBOG8SMS/ldfff3bix8UEWeTldOyJrAtFJLillI39vydK5zmykb5BK32Cg=,iv:MOY/BS1Ry605g++pUPFFXHzr8coYpxkTWghP630ex4Y=,tag:AzpGzbFFNC+1vjtv+xCktw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/frues-surface3/user-password-pedro/user-password/users/pedro b/vars/per-machine/frues-surface3/user-password-pedro/user-password/users/pedro new file mode 120000 index 0000000..ae0c694 --- /dev/null +++ b/vars/per-machine/frues-surface3/user-password-pedro/user-password/users/pedro @@ -0,0 +1 @@ +../../../../../../sops/users/pedro \ No newline at end of file From bf040abdb41e6c4f6273ed7460280d0008ae9735 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Thu, 2 Oct 2025 13:17:51 +0200 Subject: [PATCH 29/39] update(inventory.json): Installed frues-surface3 --- inventory.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 inventory.json diff --git a/inventory.json b/inventory.json new file mode 100644 index 0000000..ac71ee7 --- /dev/null +++ b/inventory.json @@ -0,0 +1,7 @@ +{ + "machines": { + "frues-surface3": { + "installedAt": 1759403871 + } + } +} \ No newline at end of file From e6ecc1e8ebcd9bdf05b4b41d864767798bdebd42 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Thu, 2 Oct 2025 13:19:53 +0200 Subject: [PATCH 30/39] update(inventory.json): Installed frues-surface3 --- inventory.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.json b/inventory.json index ac71ee7..afd7697 100644 --- a/inventory.json +++ b/inventory.json @@ -1,7 +1,7 @@ { "machines": { "frues-surface3": { - "installedAt": 1759403871 + "installedAt": 1759403993 } } } \ No newline at end of file From 5dbdf3884980cfd33f7595e8c05bf37524844cf8 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Thu, 2 Oct 2025 14:52:28 +0200 Subject: [PATCH 31/39] update(inventory.json): Installed frues-surface3 --- inventory.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.json b/inventory.json index afd7697..0126dea 100644 --- a/inventory.json +++ b/inventory.json @@ -1,7 +1,7 @@ { "machines": { "frues-surface3": { - "installedAt": 1759403993 + "installedAt": 1759406633 } } } \ No newline at end of file From 8fb1ec833004274a2537bc206ccc827b5f61243c Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 8 Oct 2025 15:25:19 +0200 Subject: [PATCH 32/39] Refactor --- machines/aresix/modules/reverse-proxy.nix | 56 +++++++++++++++-------- machines/aresix/modules/wireguard.nix | 1 + 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/machines/aresix/modules/reverse-proxy.nix b/machines/aresix/modules/reverse-proxy.nix index 05458a6..3cd7334 100644 --- a/machines/aresix/modules/reverse-proxy.nix +++ b/machines/aresix/modules/reverse-proxy.nix @@ -1,4 +1,8 @@ -{...}: { +{ + lib, + config, + ... +}: { security.acme = { acceptTerms = true; defaults.email = "personal+letsencrypt@peprolinbot.com"; @@ -15,29 +19,41 @@ recommendedProxySettings = true; recommendedTlsSettings = true; - virtualHosts = { - "ha.campares.duckdns.org" = { + virtualHosts = let + base = locations: { + inherit locations; + forceSSL = true; enableACME = true; - extraConfig = '' - proxy_buffering off; - ''; - locations."/" = { - proxyPass = "http://[::1]:8123"; - proxyWebsockets = true; - }; }; - "wg.campares.duckdns.org" = { - forceSSL = true; - enableACME = true; - extraConfig = '' - proxy_buffering off; - ''; - locations."/" = { - proxyPass = "http://[::1]:8000"; - proxyWebsockets = true; + + proxy = { + port, + websockets ? false, + }: + (base { + "/" = { + proxyPass = "http://[::1]:" + toString port + "/"; + proxyWebsockets = websockets; + }; + }) + // { + extraConfig = lib.mkIf websockets '' + proxy_buffering off; + ''; }; - }; + + proxySimple = port: proxy {inherit port;}; + + proxyWebsockets = port: + proxy { + inherit port; + websockets = true; + }; + in { + "ha.campares.duckdns.org" = proxyWebsockets config.services.home-assistant.config.http.server_port; + + "wg.campares.duckdns.org" = proxySimple config.services.wg-access-server.settings.port; }; }; } diff --git a/machines/aresix/modules/wireguard.nix b/machines/aresix/modules/wireguard.nix index 1c5b5ef..6aba4ad 100644 --- a/machines/aresix/modules/wireguard.nix +++ b/machines/aresix/modules/wireguard.nix @@ -25,6 +25,7 @@ settings = { httpHost = "::1"; + port = 8000; }; secretsFile = config.clan.core.vars.generators.wg-access-server.files.secrets-file.path; From a6a54029071951ce510055ae8cc10b96bf3adb4d Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 8 Oct 2025 17:55:09 +0200 Subject: [PATCH 33/39] Add machine frues-surface3 --- clan.nix | 3 + .../frues-surface3/0002-surface3-spi.patch | 63 + machines/frues-surface3/configuration.nix | 14 + machines/frues-surface3/disko.nix | 59 + machines/frues-surface3/facter.json | 2291 +++++++++++++++++ 5 files changed, 2430 insertions(+) create mode 100644 machines/frues-surface3/0002-surface3-spi.patch create mode 100644 machines/frues-surface3/configuration.nix create mode 100644 machines/frues-surface3/disko.nix create mode 100644 machines/frues-surface3/facter.json diff --git a/clan.nix b/clan.nix index 32a4628..17f6efb 100644 --- a/clan.nix +++ b/clan.nix @@ -11,6 +11,9 @@ frues-port = { tags = ["desktop" "spain"]; }; + frues-surface3 = { + tags = ["desktop" "spain"]; + }; terrier = { tags = ["server" "headless" "raspberry"]; }; diff --git a/machines/frues-surface3/0002-surface3-spi.patch b/machines/frues-surface3/0002-surface3-spi.patch new file mode 100644 index 0000000..6e57900 --- /dev/null +++ b/machines/frues-surface3/0002-surface3-spi.patch @@ -0,0 +1,63 @@ +From fc5a0e4525516353e76a8a3ef348dcd84d935fc4 Mon Sep 17 00:00:00 2001 +From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> +Date: Fri, 6 Dec 2019 23:10:30 +0900 +Subject: [PATCH 2/7] surface3-spi + +--- + drivers/input/touchscreen/surface3_spi.c | 26 ++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/drivers/input/touchscreen/surface3_spi.c b/drivers/input/touchscreen/surface3_spi.c +index ce4828b1415a..63b0b8ddf090 100644 +--- a/drivers/input/touchscreen/surface3_spi.c ++++ b/drivers/input/touchscreen/surface3_spi.c +@@ -25,6 +25,12 @@ + #define SURFACE3_REPORT_TOUCH 0xd2 + #define SURFACE3_REPORT_PEN 0x16 + ++bool use_dma = false; ++module_param(use_dma, bool, 0644); ++MODULE_PARM_DESC(use_dma, ++ "Disable DMA mode if you encounter touch input crash. " ++ "(default: false, disabled to avoid crash)"); ++ + struct surface3_ts_data { + struct spi_device *spi; + struct gpio_desc *gpiod_rst[2]; +@@ -326,6 +332,13 @@ static int surface3_spi_create_pen_input(struct surface3_ts_data *data) + return 0; + } + ++static bool surface3_spi_can_dma(struct spi_controller *ctlr, ++ struct spi_device *spi, ++ struct spi_transfer *tfr) ++{ ++ return use_dma; ++} ++ + static int surface3_spi_probe(struct spi_device *spi) + { + struct surface3_ts_data *data; +@@ -368,6 +381,19 @@ static int surface3_spi_probe(struct spi_device *spi) + if (error) + return error; + ++ /* ++ * Set up DMA ++ * ++ * TODO: Currently, touch input with DMA seems to be broken. ++ * On 4.19 LTS, touch input will crash after suspend. ++ * On recent stable kernel (at least after 5.1), touch input will crash after ++ * the first touch. No problem with PIO on those kernels. ++ * Maybe we need to configure DMA here. ++ * ++ * Link to issue: https://github.com/jakeday/linux-surface/issues/596 ++ */ ++ spi->controller->can_dma = surface3_spi_can_dma; ++ + return 0; + } + +-- +2.25.0 + diff --git a/machines/frues-surface3/configuration.nix b/machines/frues-surface3/configuration.nix new file mode 100644 index 0000000..d00ef6d --- /dev/null +++ b/machines/frues-surface3/configuration.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: { + hm-pedro.de = "gnome"; + + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + boot.kernelPatches = [ + { + name = "surface3-spi"; + patch = ./0002-surface3-spi.patch; + } + ]; +} diff --git a/machines/frues-surface3/disko.nix b/machines/frues-surface3/disko.nix new file mode 100644 index 0000000..1567a7d --- /dev/null +++ b/machines/frues-surface3/disko.nix @@ -0,0 +1,59 @@ +{ + boot.loader.grub = { + enable = true; + efiSupport = true; + device = "nodev"; + }; + + disko.devices = { + disk = { + main = { + type = "disk"; + device = "/dev/disk/by-id/mmc-064GEA_0x55da4659"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "500M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = ["umask=0077"]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + settings.allowDiscards = true; + content = { + type = "filesystem"; + format = "f2fs"; + mountpoint = "/"; + extraArgs = [ + "-i" + "-O" + "extra_attr,inode_checksum,sb_checksum,compression" + ]; + mountOptions = [ + "compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime,nodiscard" + ]; + }; + }; + }; + encryptedSwap = { + size = "4G"; + content = { + type = "swap"; + randomEncryption = true; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/machines/frues-surface3/facter.json b/machines/frues-surface3/facter.json new file mode 100644 index 0000000..3877360 --- /dev/null +++ b/machines/frues-surface3/facter.json @@ -0,0 +1,2291 @@ +{ + "version": 1, + "system": "x86_64-linux", + "virtualisation": "none", + "hardware": { + "bios": { + "apm_info": { + "supported": false, + "enabled": false, + "version": 0, + "sub_version": 0, + "bios_flags": 0 + }, + "vbe_info": { + "version": 0, + "video_memory": 0 + }, + "pnp": false, + "pnp_id": 0, + "lba_support": false, + "low_memory_size": 0, + "smbios_version": 520 + }, + "bluetooth": [ + { + "index": 23, + "attached_to": 26, + "class_list": [ + "usb", + "bluetooth" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0115", + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "hex": "1286", + "name": "Marvell", + "value": 4742 + }, + "device": { + "hex": "204c", + "name": "Bluetooth and Wireless LAN Composite Device", + "value": 8268 + }, + "revision": { + "hex": "0000", + "name": "32.01", + "value": 0 + }, + "serial": "0000000000000000", + "model": "Marvell Bluetooth and Wireless LAN Composite Device", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.1", + "sysfs_bus_id": "1-4:1.1", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v1286p204Cd3201dcE0dsc01dp01icE0isc01ip01in01" + }, + { + "index": 27, + "attached_to": 26, + "class_list": [ + "usb", + "bluetooth" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0115", + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "hex": "1286", + "name": "Marvell", + "value": 4742 + }, + "device": { + "hex": "204c", + "name": "Bluetooth and Wireless LAN Composite Device", + "value": 8268 + }, + "revision": { + "hex": "0000", + "name": "32.01", + "value": 0 + }, + "serial": "0000000000000000", + "model": "Marvell Bluetooth and Wireless LAN Composite Device", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.0", + "sysfs_bus_id": "1-4:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v1286p204Cd3201dcE0dsc01dp01icE0isc01ip01in00" + } + ], + "bridge": [ + { + "index": 8, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 28 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "22c8", + "value": 8904 + }, + "sub_device": { + "hex": "7270", + "value": 29296 + }, + "revision": { + "hex": "0020", + "value": 32 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1c.0", + "sysfs_bus_id": "0000:00:1c.0", + "resources": [ + { + "type": "irq", + "base": 149, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 1, + "secondary_bus": 1, + "irq": 149, + "prog_if": 0 + }, + "driver": "pcieport", + "driver_module": "pcieportdrv", + "drivers": [ + "pcieport" + ], + "driver_modules": [ + "pcieportdrv" + ], + "module_alias": "pci:v00008086d000022C8sv00008086sd00007270bc06sc04i00" + }, + { + "index": 9, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0001", + "name": "ISA bridge", + "value": 1 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "229c", + "value": 8860 + }, + "sub_device": { + "hex": "7270", + "value": 29296 + }, + "revision": { + "hex": "0020", + "value": 32 + }, + "model": "Intel ISA bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.0", + "sysfs_bus_id": "0000:00:1f.0", + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "driver": "lpc_ich", + "driver_module": "lpc_ich", + "drivers": [ + "lpc_ich" + ], + "driver_modules": [ + "lpc_ich" + ], + "module_alias": "pci:v00008086d0000229Csv00008086sd00007270bc06sc01i00" + }, + { + "index": 11, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0000", + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "1414", + "value": 5140 + }, + "device": { + "hex": "2280", + "value": 8832 + }, + "sub_device": { + "hex": "0009", + "value": 9 + }, + "revision": { + "hex": "0020", + "value": 32 + }, + "model": "Intel Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:00.0", + "sysfs_bus_id": "0000:00:00.0", + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "driver": "iosf_mbi_pci", + "driver_module": "iosf_mbi", + "drivers": [ + "iosf_mbi_pci" + ], + "driver_modules": [ + "iosf_mbi" + ], + "module_alias": "pci:v00008086d00002280sv00001414sd00000009bc06sc00i00" + } + ], + "cpu": [ + { + "architecture": "x86_64", + "vendor_name": "GenuineIntel", + "family": 6, + "model": 76, + "stepping": 3, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "dts", + "acpi", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "ht", + "tm", + "pbe", + "syscall", + "nx", + "rdtscp", + "lm", + "constant_tsc", + "arch_perfmon", + "pebs", + "bts", + "rep_good", + "nopl", + "xtopology", + "tsc_reliable", + "nonstop_tsc", + "cpuid", + "aperfmperf", + "tsc_known_freq", + "pni", + "pclmulqdq", + "dtes64", + "monitor", + "ds_cpl", + "vmx", + "est", + "tm2", + "ssse3", + "cx16", + "xtpr", + "pdcm", + "sse4_1", + "sse4_2", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "rdrand", + "lahf_lm", + "3dnowprefetch", + "epb", + "pti", + "ibrs", + "ibpb", + "stibp", + "tpr_shadow", + "flexpriority", + "ept", + "vpid", + "tsc_adjust", + "smep", + "erms", + "dtherm", + "ida", + "arat", + "vnmi", + "md_clear" + ], + "bugs": [ + "cpu_meltdown", + "spectre_v1", + "spectre_v2", + "mds", + "msbds_only", + "mmio_unknown" + ], + "bogo": 3200, + "cache": 1024, + "units": 16, + "physical_id": 0, + "siblings": 4, + "cores": 4, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 11, + "write_protect": false, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": "0x24", + "virtual": "0x30" + } + } + ], + "disk": [ + { + "index": 19, + "attached_to": 17, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "serial": "0x55da4659", + "model": "Disk", + "sysfs_id": "/class/block/mmcblk0", + "sysfs_bus_id": "mmc0:0001", + "sysfs_device_link": "/devices/pci0000:00/80860F14:00/mmc_host/mmc0/mmc0:0001", + "unix_device_name": "/dev/mmcblk0", + "unix_device_number": { + "type": 98, + "major": 179, + "minor": 0, + "range": 32 + }, + "unix_device_names": [ + "/dev/disk/by-id/mmc-064GEA_0x55da4659", + "/dev/disk/by-path/platform-80860F14:00", + "/dev/mmcblk0" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 1908480, + "heads": 4, + "sectors": 16, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 122142720, + "value_2": 512 + } + ], + "driver": "sdhci-acpi", + "driver_module": "sdhci_acpi", + "drivers": [ + "mmcblk", + "sdhci-acpi" + ], + "driver_modules": [ + "sdhci_acpi" + ] + }, + { + "index": 20, + "attached_to": 17, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/mmcblk0boot0", + "sysfs_bus_id": "mmcblk0", + "sysfs_device_link": "/devices/pci0000:00/80860F14:00/mmc_host/mmc0/mmc0:0001/block/mmcblk0", + "unix_device_name": "/dev/mmcblk0boot0", + "unix_device_number": { + "type": 98, + "major": 179, + "minor": 32, + "range": 32 + }, + "unix_device_names": [ + "/dev/disk/by-path/platform-80860F14:00-boot0", + "/dev/mmcblk0boot0" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 128, + "heads": 4, + "sectors": 16, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ], + "driver": "mmcblk", + "drivers": [ + "mmcblk" + ] + }, + { + "index": 21, + "attached_to": 17, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/mmcblk0boot1", + "sysfs_bus_id": "mmcblk0", + "sysfs_device_link": "/devices/pci0000:00/80860F14:00/mmc_host/mmc0/mmc0:0001/block/mmcblk0", + "unix_device_name": "/dev/mmcblk0boot1", + "unix_device_number": { + "type": 98, + "major": 179, + "minor": 64, + "range": 32 + }, + "unix_device_names": [ + "/dev/disk/by-path/platform-80860F14:00-boot1", + "/dev/mmcblk0boot1" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 128, + "heads": 4, + "sectors": 16, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ], + "driver": "mmcblk", + "drivers": [ + "mmcblk" + ] + }, + { + "index": 22, + "attached_to": 16, + "class_list": [ + "disk", + "usb", + "scsi", + "block_device" + ], + "bus_type": { + "hex": "0084", + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "0951", + "name": "Kingston", + "value": 2385 + }, + "device": { + "hex": "1666", + "name": "DataTraveler 3.0", + "value": 5734 + }, + "revision": { + "hex": "0000", + "name": "PMAP", + "value": 0 + }, + "serial": "6E02AC414DC9", + "model": "Kingston DataTraveler 3.0", + "sysfs_id": "/class/block/sda", + "sysfs_bus_id": "0:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/host0/target0:0:0/0:0:0:0", + "unix_device_name": "/dev/sda", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 0, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-id/usb-Kingston_DataTraveler_3.0_60A44C413C4EE2C1D97588F2-0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usb-0:2:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:2:1.0-scsi-0:0:0:0", + "/dev/sda" + ], + "unix_device_name2": "/dev/sg0", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 0, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 15077, + "heads": 255, + "sectors": 63, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 242221056, + "value_2": 512 + } + ], + "driver": "usb-storage", + "driver_module": "usb_storage", + "drivers": [ + "sd", + "usb-storage" + ], + "driver_modules": [ + "sd_mod", + "usb_storage" + ], + "module_alias": "usb:v0951p1666d0110dc00dsc00dp00ic08isc06ip50in00" + } + ], + "graphics_card": [ + { + "index": 15, + "attached_to": 0, + "class_list": [ + "graphics_card", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 2 + }, + "base_class": { + "hex": "0003", + "name": "Display controller", + "value": 3 + }, + "sub_class": { + "hex": "0000", + "name": "VGA compatible controller", + "value": 0 + }, + "pci_interface": { + "hex": "0000", + "name": "VGA", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "1414", + "value": 5140 + }, + "device": { + "hex": "22b0", + "value": 8880 + }, + "sub_device": { + "hex": "0009", + "value": 9 + }, + "revision": { + "hex": "0020", + "value": 32 + }, + "model": "Intel VGA compatible controller", + "sysfs_id": "/devices/pci0000:00/0000:00:02.0", + "sysfs_bus_id": "0000:00:02.0", + "resources": [ + { + "type": "io", + "base": 61440, + "range": 64, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 168, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 3221225472, + "range": 268435456, + "enabled": true, + "access": "read_only", + "prefetch": "no" + }, + { + "type": "mem", + "base": 3489660928, + "range": 16777216, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 786432, + "range": 131072, + "enabled": false, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 168, + "prog_if": 0 + }, + "driver": "i915", + "driver_module": "i915", + "drivers": [ + "i915" + ], + "driver_modules": [ + "i915" + ], + "module_alias": "pci:v00008086d000022B0sv00001414sd00000009bc03sc00i00" + } + ], + "hub": [ + { + "index": 26, + "attached_to": 16, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d6b", + "name": "Linux 6.14.10 xhci-hcd", + "value": 7531 + }, + "device": { + "hex": "0002", + "name": "xHCI Host Controller", + "value": 2 + }, + "revision": { + "hex": "0000", + "name": "6.14", + "value": 0 + }, + "serial": "0000:00:14.0", + "model": "Linux 6.14.10 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-0:1.0", + "sysfs_bus_id": "1-0:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 1, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "driver_module": "usbcore", + "drivers": [ + "hub" + ], + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 28, + "attached_to": 16, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d6b", + "name": "Linux 6.14.10 xhci-hcd", + "value": 7531 + }, + "device": { + "hex": "0003", + "name": "xHCI Host Controller", + "value": 3 + }, + "revision": { + "hex": "0000", + "name": "6.14", + "value": 0 + }, + "serial": "0000:00:14.0", + "model": "Linux 6.14.10 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb2/2-0:1.0", + "sysfs_bus_id": "2-0:1.0", + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "driver_module": "usbcore", + "drivers": [ + "hub" + ], + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00" + } + ], + "memory": [ + { + "index": 7, + "attached_to": 0, + "class_list": [ + "memory" + ], + "base_class": { + "hex": "0101", + "name": "Internally Used Class", + "value": 257 + }, + "sub_class": { + "hex": "0002", + "name": "Main Memory", + "value": 2 + }, + "model": "Main Memory", + "resources": [ + { + "type": "mem", + "base": 0, + "range": 4021194752, + "enabled": true, + "access": "read_write", + "prefetch": "unknown" + }, + { + "type": "phys_mem", + "range": 4026531840 + } + ] + } + ], + "mmc_controller": [ + { + "index": 17, + "attached_to": 0, + "class_list": [ + "mmc_controller" + ], + "bus_type": { + "hex": "0093", + "name": "MMC", + "value": 147 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0117", + "name": "MMC Controller", + "value": 279 + }, + "vendor": "", + "device": "MMC Controller", + "model": "MMC Controller", + "sysfs_id": "/devices/pci0000:00/80860F14:00/mmc_host/mmc0/mmc0:0001", + "sysfs_bus_id": "mmc0:0001", + "driver": "mmcblk", + "drivers": [ + "mmcblk" + ] + } + ], + "mouse": [ + { + "index": 24, + "attached_to": 26, + "class_list": [ + "mouse", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0105", + "name": "Mouse", + "value": 261 + }, + "sub_class": { + "hex": "0003", + "name": "USB Mouse", + "value": 3 + }, + "vendor": { + "hex": "045e", + "name": "Microsoft", + "value": 1118 + }, + "device": { + "hex": "07de", + "name": "Surface Type Cover", + "value": 2014 + }, + "revision": { + "hex": "0000", + "name": "3.07", + "value": 0 + }, + "compat_vendor": "Unknown", + "compat_device": "Generic USB Mouse", + "model": "Microsoft Surface Type Cover", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-3/1-3:1.0", + "sysfs_bus_id": "1-3:1.0", + "unix_device_name": "/dev/input/mice", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 63, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/mice" + ], + "unix_device_name2": "/dev/input/mouse1", + "unix_device_number2": { + "type": 99, + "major": 13, + "minor": 33, + "range": 1 + }, + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "mouse", + "db_entry_0": [ + "explorerps/2", + "exps2" + ], + "xf86": "explorerps/2", + "gpm": "exps2", + "buttons": -1, + "wheels": -1 + }, + "module_alias": "usb:v045Ep07DEd0307dc00dsc00dp00ic03isc03ip00in00" + }, + { + "index": 31, + "attached_to": 0, + "bus_type": { + "hex": "0086", + "name": "usb", + "value": 134 + }, + "base_class": { + "hex": "0118", + "name": "touchpad", + "value": 280 + }, + "sub_class": { + "hex": "0003", + "name": "usb", + "value": 3 + }, + "vendor": { + "hex": "045e", + "name": "Microsoft", + "value": 1118 + }, + "device": { + "hex": "07de", + "name": "Surface_Type_Cover", + "value": 2014 + }, + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-3/1-3:1.0/0003:045E:07DE.0001/input/input11", + "unix_device_names": [ + "/dev/input/event3", + "/dev/input/ + handler" + ] + } + ], + "network_controller": [ + { + "index": 10, + "attached_to": 8, + "class_list": [ + "network_controller", + "pci", + "wlan_card" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "hex": "0002", + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "hex": "0082", + "name": "WLAN controller", + "value": 130 + }, + "vendor": { + "hex": "11ab", + "value": 4523 + }, + "sub_vendor": { + "hex": "0002", + "value": 2 + }, + "device": { + "hex": "2b38", + "value": 11064 + }, + "sub_device": { + "hex": "045e", + "value": 1118 + }, + "model": "WLAN controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0", + "sysfs_bus_id": "0000:01:00.0", + "unix_device_name": "wlan0", + "unix_device_names": [ + "wlan0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 99 + }, + { + "type": "irq", + "base": 165, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 3514826752, + "range": 1048576, + "enabled": true, + "access": "read_only", + "prefetch": "no" + }, + { + "type": "mem", + "base": 3515875328, + "range": 1048576, + "enabled": true, + "access": "read_only", + "prefetch": "no" + }, + { + "type": "phwaddr", + "address": 99 + }, + { + "type": "wlan", + "channels": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "34", + "38", + "42", + "46", + "36", + "40", + "44", + "48", + "52", + "56", + "60", + "64", + "100", + "104", + "108", + "112", + "116", + "120", + "124" + ], + "frequencies": [ + "2.412", + "2.417", + "2.422", + "2.427", + "2.432", + "2.437", + "2.442", + "2.447", + "2.452", + "2.457", + "2.462", + "2.467", + "2.472", + "5.17", + "5.19", + "5.21", + "5.23", + "5.18", + "5.2", + "5.22", + "5.24", + "5.26", + "5.28", + "5.3", + "5.32", + "5.5", + "5.52", + "5.54", + "5.56", + "5.58", + "5.6", + "5.62" + ], + "auth_modes": [ + "open", + "sharedkey", + "wpa-psk", + "wpa-eap" + ], + "enc_modes": [ + "WEP40", + "WEP104", + "TKIP", + "CCMP" + ] + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 165, + "prog_if": 0 + }, + "driver": "mwifiex_pcie", + "driver_module": "mwifiex_pcie", + "drivers": [ + "mwifiex_pcie" + ], + "driver_modules": [ + "mwifiex_pcie" + ], + "module_alias": "pci:v000011ABd00002B38sv00000002sd0000045Ebc02sc00i00" + } + ], + "network_interface": [ + { + "index": 29, + "attached_to": 10, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "000a", + "name": "WLAN", + "value": 10 + }, + "model": "WLAN network interface", + "sysfs_id": "/class/net/wlan0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0", + "unix_device_name": "wlan0", + "unix_device_names": [ + "wlan0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 99 + }, + { + "type": "phwaddr", + "address": 99 + } + ], + "driver": "mwifiex_pcie", + "driver_module": "mwifiex_pcie", + "drivers": [ + "mwifiex_pcie" + ], + "driver_modules": [ + "mwifiex_pcie" + ] + }, + { + "index": 30, + "attached_to": 0, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0000", + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + } + ], + "pci": [ + { + "index": 12, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 3 + }, + "base_class": { + "hex": "0004", + "name": "Multimedia controller", + "value": 4 + }, + "sub_class": { + "hex": "0080", + "name": "Multimedia controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "1414", + "value": 5140 + }, + "device": { + "hex": "22b8", + "value": 8888 + }, + "sub_device": { + "hex": "0009", + "value": 9 + }, + "revision": { + "hex": "0020", + "value": 32 + }, + "model": "Intel Multimedia controller", + "sysfs_id": "/devices/pci0000:00/0000:00:03.0", + "sysfs_bus_id": "0000:00:03.0", + "resources": [ + { + "type": "irq", + "base": 255, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 3506438144, + "range": 4194304, + "enabled": false, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 255, + "prog_if": 0 + }, + "driver": "intel_atomisp2_pm", + "driver_module": "intel_atomisp2_pm", + "drivers": [ + "intel_atomisp2_pm" + ], + "driver_modules": [ + "intel_atomisp2_pm" + ], + "module_alias": "pci:v00008086d000022B8sv00001414sd00000009bc04sc80i00" + }, + { + "index": 13, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 26 + }, + "base_class": { + "hex": "0010", + "name": "Encryption controller", + "value": 16 + }, + "sub_class": { + "hex": "0080", + "name": "Encryption controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "2298", + "value": 8856 + }, + "sub_device": { + "hex": "7270", + "value": 29296 + }, + "revision": { + "hex": "0020", + "value": 32 + }, + "model": "Intel Encryption controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1a.0", + "sysfs_bus_id": "0000:00:1a.0", + "resources": [ + { + "type": "irq", + "base": 157, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 3512729600, + "range": 1048576, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 3513778176, + "range": 1048576, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1286, + "header_type": 0, + "secondary_bus": 0, + "irq": 157, + "prog_if": 0 + }, + "driver": "mei_txe", + "driver_module": "mei_txe", + "drivers": [ + "mei_txe" + ], + "driver_modules": [ + "mei_txe" + ], + "module_alias": "pci:v00008086d00002298sv00008086sd00007270bc10sc80i00" + }, + { + "index": 14, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 11 + }, + "base_class": { + "hex": "0011", + "name": "Signal processing controller", + "value": 17 + }, + "sub_class": { + "hex": "0080", + "name": "Signal processing controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "1414", + "value": 5140 + }, + "device": { + "hex": "22dc", + "value": 8924 + }, + "sub_device": { + "hex": "0009", + "value": 9 + }, + "revision": { + "hex": "0020", + "value": 32 + }, + "model": "Intel Signal processing controller", + "sysfs_id": "/devices/pci0000:00/0000:00:0b.0", + "sysfs_bus_id": "0000:00:0b.0", + "resources": [ + { + "type": "irq", + "base": 166, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 3517149184, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1026, + "header_type": 0, + "secondary_bus": 0, + "irq": 166, + "prog_if": 0 + }, + "driver": "proc_thermal", + "driver_module": "processor_thermal_device_pci_legacy", + "drivers": [ + "proc_thermal" + ], + "driver_modules": [ + "processor_thermal_device_pci_legacy" + ], + "module_alias": "pci:v00008086d000022DCsv00001414sd00000009bc11sc80i00" + } + ], + "system": { + "form_factor": "laptop" + }, + "unknown": [ + { + "index": 18, + "attached_to": 0, + "class_list": [ + "unknown" + ], + "base_class": { + "hex": "0007", + "name": "Communication controller", + "value": 7 + }, + "sub_class": { + "hex": "0000", + "name": "Serial controller", + "value": 0 + }, + "pci_interface": { + "hex": "0002", + "name": "16550", + "value": 2 + }, + "device": { + "hex": "0000", + "name": "16550A", + "value": 0 + }, + "model": "16550A", + "unix_device_name": "/dev/ttyS0", + "unix_device_names": [ + "/dev/ttyS0" + ], + "resources": [ + { + "type": "io", + "base": 1016, + "range": 0, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 147, + "triggered": 0, + "enabled": true + } + ] + } + ], + "usb_controller": [ + { + "index": 16, + "attached_to": 0, + "class_list": [ + "usb_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0003", + "name": "USB Controller", + "value": 3 + }, + "pci_interface": { + "hex": "0030", + "value": 48 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "22b5", + "value": 8885 + }, + "sub_device": { + "hex": "7270", + "value": 29296 + }, + "revision": { + "hex": "0020", + "value": 32 + }, + "model": "Intel USB Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0", + "sysfs_bus_id": "0000:00:14.0", + "resources": [ + { + "type": "irq", + "base": 153, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 3516923904, + "range": 65536, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 153, + "prog_if": 48 + }, + "driver": "xhci_hcd", + "driver_module": "xhci_pci", + "drivers": [ + "xhci_hcd" + ], + "driver_modules": [ + "xhci_pci" + ], + "module_alias": "pci:v00008086d000022B5sv00008086sd00007270bc0Csc03i30" + } + ] + }, + "smbios": { + "bios": { + "handle": 0, + "vendor": "American Megatrends Inc.", + "version": "1.51116.238", + "date": "03/09/2015", + "features": [ + "PCI supported", + "BIOS flashable", + "ACPI supported", + "USB Legacy supported", + "BIOS Boot Spec supported" + ], + "start_address": "0xf0000", + "rom_size": 8388608 + }, + "board": { + "handle": 2, + "manufacturer": "Microsoft Corporation", + "product": "Surface 3", + "version": "00", + "board_type": { + "hex": "000a", + "name": "Motherboard", + "value": 10 + }, + "features": [ + "Hosting Board" + ], + "location": "Internal", + "chassis": 3 + }, + "cache": [ + { + "handle": 12, + "socket": "CPU Internal L1", + "size_max": 224, + "size_current": 224, + "speed": 0, + "mode": { + "hex": "0001", + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 0, + "ecc": { + "hex": "0005", + "name": "Single-bit", + "value": 5 + }, + "cache_type": { + "hex": "0001", + "name": "Other", + "value": 1 + }, + "associativity": { + "hex": "0001", + "name": "Other", + "value": 1 + }, + "sram_type_current": [ + "Unknown" + ], + "sram_type_supported": [ + "Unknown" + ] + }, + { + "handle": 13, + "socket": "CPU Internal L2", + "size_max": 2048, + "size_current": 2048, + "speed": 0, + "mode": { + "hex": "0001", + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 1, + "ecc": { + "hex": "0005", + "name": "Single-bit", + "value": 5 + }, + "cache_type": { + "hex": "0005", + "name": "Unified", + "value": 5 + }, + "associativity": { + "hex": "0008", + "name": "16-way Set-Associative", + "value": 8 + }, + "sram_type_current": [ + "Unknown" + ], + "sram_type_supported": [ + "Unknown" + ] + } + ], + "chassis": [ + { + "handle": 3, + "manufacturer": "Microsoft Corporation", + "version": "1", + "chassis_type": { + "hex": "0009", + "name": "LapTop", + "value": 9 + }, + "lock_present": false, + "bootup_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "power_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "security_state": { + "hex": "0003", + "name": "None", + "value": 3 + }, + "oem": "0x0" + } + ], + "config": { + "handle": 9, + "options": [ + "SMI:00B29C", + "DSN:", + "DSN:123456789ABCDEF", + "DSN:123456789ABCDEF" + ] + }, + "group_associations": [ + { + "handle": 10, + "power": { + "hex": "0000", + "name": "Disabled", + "value": 0 + }, + "keyboard": { + "hex": "0000", + "name": "Disabled", + "value": 0 + }, + "admin": { + "hex": "0000", + "name": "Disabled", + "value": 0 + }, + "reset": { + "hex": "0000", + "name": "Disabled", + "value": 0 + } + } + ], + "language": [ + { + "handle": 19, + "languages": [ + "en|US|iso8859-1" + ] + } + ], + "memory_array": [ + { + "handle": 15, + "location": { + "hex": "0003", + "name": "Motherboard", + "value": 3 + }, + "usage": { + "hex": "0003", + "name": "System memory", + "value": 3 + }, + "ecc": { + "hex": "0003", + "name": "None", + "value": 3 + }, + "max_size": "0x800000", + "error_handle": 65534, + "slots": 2 + } + ], + "memory_array_mapped_address": [ + { + "handle": 18, + "array_handle": 15, + "start_address": "0x0", + "end_address": "0x100000000", + "part_width": 2 + } + ], + "memory_device": [ + { + "handle": 16, + "location": "ChannelA-DIMM0", + "bank_location": "BANK 0", + "manufacturer": "0000", + "part_number": "", + "array_handle": 15, + "error_handle": 65534, + "width": 8, + "ecc_bits": 0, + "size": 2097152, + "form_factor": { + "hex": "0009", + "name": "DIMM", + "value": 9 + }, + "set": 0, + "memory_type": { + "hex": "0018", + "name": "Other", + "value": 24 + }, + "memory_type_details": [ + "Synchronous" + ], + "speed": 1600 + }, + { + "handle": 17, + "location": "ChannelB-DIMM0", + "bank_location": "BANK 1", + "manufacturer": "0000", + "part_number": "", + "array_handle": 15, + "error_handle": 65534, + "width": 8, + "ecc_bits": 0, + "size": 2097152, + "form_factor": { + "hex": "0009", + "name": "DIMM", + "value": 9 + }, + "set": 0, + "memory_type": { + "hex": "0018", + "name": "Other", + "value": 24 + }, + "memory_type_details": [ + "Synchronous" + ], + "speed": 1600 + } + ], + "processor": [ + { + "handle": 14, + "socket": "SOCKET 0", + "socket_type": { + "hex": "0024", + "name": "Other", + "value": 36 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "Intel(R) Atom(TM) x7-Z8700 CPU @ 1.60GHz", + "part": "", + "processor_type": { + "hex": "0003", + "name": "CPU", + "value": 3 + }, + "processor_family": { + "hex": "0001", + "name": "Other", + "value": 1 + }, + "processor_status": { + "hex": "0001", + "name": "Enabled", + "value": 1 + }, + "clock_ext": 83, + "clock_max": 2400, + "cache_handle_l1": 12, + "cache_handle_l2": 13, + "cache_handle_l3": 0 + } + ], + "system": { + "handle": 1, + "manufacturer": "Microsoft Corporation", + "product": "Surface 3", + "version": "B16D1SW1C4G1X1", + "wake_up": { + "hex": "0006", + "name": "Power Switch", + "value": 6 + } + } + } +} From 78c66148837da2bbaa76159ed10508abbeb2ecb3 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 8 Oct 2025 17:55:53 +0200 Subject: [PATCH 34/39] Set X11 (GDM) keyboard layout --- modules/spain.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/spain.nix b/modules/spain.nix index 4feabfc..d06165e 100644 --- a/modules/spain.nix +++ b/modules/spain.nix @@ -1,5 +1,8 @@ {...}: { time.timeZone = "Europe/Madrid"; + + services.xserver.xkb.layout = "es"; console.keyMap = "es"; + i18n.defaultLocale = "en_US.UTF-8"; } From d636dced9e3023315aff0d8b83cdde1e5d3a0b13 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 8 Oct 2025 17:56:31 +0200 Subject: [PATCH 35/39] Use adwaita cursor in gnome (https://github.com/nix-community/stylix/issues/359) --- users/pedro/home-configuration/stylix.nix | 19 ++++++++++++++----- users/pedro/home.nix | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/users/pedro/home-configuration/stylix.nix b/users/pedro/home-configuration/stylix.nix index 4af4a60..22c6956 100644 --- a/users/pedro/home-configuration/stylix.nix +++ b/users/pedro/home-configuration/stylix.nix @@ -2,6 +2,7 @@ inputs, config, pkgs, + osConfig, ... }: { imports = [inputs.stylix.homeModules.stylix]; @@ -27,14 +28,22 @@ emoji = config.stylix.fonts.monospace; }; - cursor = { - package = pkgs.catppuccin-cursors.mochaDark; - name = "Catppuccin Mocha Dark"; - size = 22; - }; + cursor = + if osConfig.hm-pedro.de == "gnome" # https://github.com/nix-community/stylix/issues/359 + then { + package = pkgs.adwaita-icon-theme; + name = "Adwaita"; + size = 22; + } + else { + package = pkgs.catppuccin-cursors.mochaDark; + name = "Catppuccin Mocha Dark"; + size = 22; + }; iconTheme = { enable = true; + # package = pkgs.adwaita-icon-theme; package = pkgs.catppuccin-papirus-folders.override { flavor = "mocha"; accent = "lavender"; diff --git a/users/pedro/home.nix b/users/pedro/home.nix index 79c01fd..4644542 100644 --- a/users/pedro/home.nix +++ b/users/pedro/home.nix @@ -9,7 +9,7 @@ options = { hm-pedro.de = lib.mkOption { default = "none"; - type = lib.types.enum ["none" "hyprland"]; + type = lib.types.enum ["none" "hyprland" "gnome"]; }; }; config = { From 86398b9dd16dff42ebb440724027204d3eabebee Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 8 Oct 2025 17:58:10 +0200 Subject: [PATCH 36/39] Remove unneessary stuff --- users/pedro/home-configuration/qt.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/users/pedro/home-configuration/qt.nix b/users/pedro/home-configuration/qt.nix index b88dc67..b79437c 100644 --- a/users/pedro/home-configuration/qt.nix +++ b/users/pedro/home-configuration/qt.nix @@ -1,22 +1,5 @@ -{ - pkgs, - config, - ... -}: let - qtctConf = '' - [Appearance] - style=kvantum - icon_theme=${config.stylix.iconTheme.${config.stylix.polarity}} - - [Fonts] - general="${config.stylix.fonts.sansSerif.name},${builtins.toString config.stylix.fonts.sizes.applications},-1,5,50,0,0,0,0,0,Regular" - fixed="${config.stylix.fonts.monospace.name},${builtins.toString config.stylix.fonts.sizes.applications},-1,5,50,0,0,0,0,0,Regular" - ''; -in { +{...}: { qt = { enable = true; }; - - xdg.configFile."qt5ct/qt5ct.conf".text = qtctConf; - xdg.configFile."qt6ct/qt6ct.conf".text = qtctConf; } From 0787fef8c52974b5f9c0cba61c0ec10fc1d66f1e Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 8 Oct 2025 17:59:00 +0200 Subject: [PATCH 37/39] Run tor and mycelium only on servers --- clan.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clan.nix b/clan.nix index 17f6efb..48c13ca 100644 --- a/clan.nix +++ b/clan.nix @@ -81,12 +81,12 @@ # Docs: https://docs.clan.lol/reference/clanServices/mycelium/ mycelium = { - roles.peer.tags.all = {}; + roles.peer.tags.server = {}; }; # Fallback: Secure connections via Tor tor = { - roles.server.tags.all = {}; + roles.server.tags.server = {}; }; }; } From c04d3d965d17db002ada7e0b3afd49f8ca548be5 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 8 Oct 2025 23:17:56 +0200 Subject: [PATCH 38/39] Add Rnote --- users/pedro/home-configuration/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/pedro/home-configuration/packages.nix b/users/pedro/home-configuration/packages.nix index 66154d2..e986ed7 100644 --- a/users/pedro/home-configuration/packages.nix +++ b/users/pedro/home-configuration/packages.nix @@ -63,6 +63,7 @@ in { vlc mpv # video player xournalpp # For notes and pdf editing + rnote # Modern alternative to Xournal++ qbittorrent # torrent client speedcrunch # Fast power user calculator simple-scan From 9e57effbbbf26c0b09685d4b50835b56b11fcb31 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 8 Oct 2025 23:18:19 +0200 Subject: [PATCH 39/39] Remove skip-redirect (annoying with some websites) --- users/pedro/home-configuration/browsers/librewolf.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/users/pedro/home-configuration/browsers/librewolf.nix b/users/pedro/home-configuration/browsers/librewolf.nix index 3bfd1ef..0b42717 100644 --- a/users/pedro/home-configuration/browsers/librewolf.nix +++ b/users/pedro/home-configuration/browsers/librewolf.nix @@ -62,7 +62,6 @@ packages = with inputs.firefox-addons.packages.${pkgs.system}; [ ublock-origin # Included in Librewolf bitwarden - skip-redirect libredirect multi-account-containers tridactyl