From b7443bd5771ab04be438b0f6762fc3c7691089a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 23 May 2025 13:10:24 +0200 Subject: [PATCH 1/3] Add moritz-laptop to secret --- .../moritz-email-new/password/machines/moritz-laptop | 1 + vars/shared/moritz-email-new/password/secret | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 120000 vars/shared/moritz-email-new/password/machines/moritz-laptop diff --git a/vars/shared/moritz-email-new/password/machines/moritz-laptop b/vars/shared/moritz-email-new/password/machines/moritz-laptop new file mode 120000 index 0000000..8c17ba4 --- /dev/null +++ b/vars/shared/moritz-email-new/password/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/shared/moritz-email-new/password/secret b/vars/shared/moritz-email-new/password/secret index 8bf4f43..46e9563 100644 --- a/vars/shared/moritz-email-new/password/secret +++ b/vars/shared/moritz-email-new/password/secret @@ -2,13 +2,17 @@ "data": "ENC[AES256_GCM,data:IXktUisgMZF1FtVgeYGMw1hGmlen6aYRXebYDbzIvlk=,iv:tmfL9DNr39QGOIYbijyGY38Q/kbHrE5emMZlNXKLLnE=,tag:8J+E7Y+Agv6YyY8eStgbRw==,type:str]", "sops": { "age": [ + { + "recipient": "age1rgyueg2rnfw2er0rzkc6dc97p38fekjujdusfje6xn7g40plpfrshrlsyu", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVaUlmQlp4N0IyTlp1WUhr\nWFRiRy81TWFNSiszaXhtRTBWMmYvY25ZUHdRCmZlVUp6WE5vL25QWGRZTXZzZGto\nTStLa0czY3IyUTNqYzcvNm1kSTFweFkKLS0tIC9BTGpJUDZpbTZHZVJrbEtEb1Jh\na2pJK0F2ZXdVUWNOakw3aGpIa25iNjgKW6XkjqNI12RzmF+EIgL+sBAlIQzsgXOS\npgo/rQcz2LLYt97teDFGL5iT/h2dcbLaWr2oJotSDYA6znen3VgVKg==\n-----END AGE ENCRYPTED FILE-----\n" + }, { "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXTkJwTWVnRko1UGh5YVdV\naXdlSmljZkJBOUxGeGY4QStGNjlrQURpWmtzCmRiV3NpVCtleFJaYkNOOTZPajFF\nbFlaOUhTMDEveGVLTTRsdnZHWnBneWMKLS0tIHBBbEVuQzFUTG1pZGRnZ01hVUVR\nMHhhN0xITHRQdjdHTFBBeGdzYk1BKzQK8OScWI7g1Y12lwqY0H38d/6REtLXurIB\nT7YeF27RUxh5SojvY25x/lmTu7djueGxP0VH4wH4P11sRk7im10G5w==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByVUFXMmgzb0tkUUROMSs1\nazBWUG51NlhQek81b3RkWE9aUmFPYUdFNzJJCmljcTl2akdYSHpWaVNvWGxTUVFC\nSzdGWTVnMDhXcnNNS1NuOUdoU2lod1kKLS0tIDdHeXBiUkVJazcyemFqbEo1WDE1\nN2U1TnhTM3MxbXNpWnVGVlZRZ2htN00Klq6ZzvgH+wWDoSIYyxS6Dsiz7Wl2s7gI\niRomYY0DTzlTBRzszI/AHU5IUZIdUJenrZMHcITGaVXIYVsEs4T5Tw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKYWtqakhoMzNXcmJ3bjQ2\nL3UxbHFQWGFWb1MxZURUWU1LbXJFaUFsU0VNCklYcE10aGZKazM3Znh1bXA0dVBM\naDc5UlQ3RytzY2FPTmNndWo1cmlReEEKLS0tIE5hVlFEVElJL2QrWmNkd3NOaWwv\nTTlNWVE2RzFlWmQzMVFDeEVCZFlJcHcKo2Xvh+YiW1hrFsjcgJstMj5BkAR0QbgI\nlswG2kNlwVixFwScqrHoQ4u+Uvzj7KOR+ZRtrCfq4X2D2pnI4oLh7w==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTbzErQlNwRzVwR0lNMlVF\nOEJWMFNtdEM1MVk5WTFDUmpNdjJzZnM1SVZBCk9TREpvMVo3VC9SclZ6cVpqTXlk\nZlFXeFd3TTJnQ2xZSkx4bHY0WVBoWk0KLS0tIEozVm02czkvMklIS3VxbGcySm84\nVnZEaGphYm03L3Iyekc1TUJSRW4wejAKUGdg7ShFzooFuI8IPy27PLzyULJ08kEv\nNOEcIToz3EDZ9KfEeVQC4zJ5vb+My9TThIJ7kr7QeAsNa6H69zBRtA==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-05-14T16:25:57Z", From 7aa27bf47e6fe3ec7adab49b9869df50d7b76c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 28 May 2025 11:14:01 +0200 Subject: [PATCH 2/3] feat: add typst formatter --- modules/moritz/programs/nvim/plugins/conform.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/moritz/programs/nvim/plugins/conform.nix b/modules/moritz/programs/nvim/plugins/conform.nix index 87232e1..cb73f96 100644 --- a/modules/moritz/programs/nvim/plugins/conform.nix +++ b/modules/moritz/programs/nvim/plugins/conform.nix @@ -25,6 +25,7 @@ toml = ["taplo"]; yaml = ["yamlfix"]; markdown = ["injected"]; + typst = ["typstyle"]; }; }; opts.formatexpr = "v:lua.require'conform'.formatexpr()"; From e69d9f410f1e87dacd049a8f3187c7032bef3a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 28 May 2025 11:21:45 +0200 Subject: [PATCH 3/3] feat: switch back to lix --- machines/moritz-server/configuration.nix | 3 ++- modules/moritz/programs/nix.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/machines/moritz-server/configuration.nix b/machines/moritz-server/configuration.nix index 57a1055..ef26b4d 100644 --- a/machines/moritz-server/configuration.nix +++ b/machines/moritz-server/configuration.nix @@ -1,4 +1,4 @@ -{ +{pkgs, ...}: { imports = [ ../../modules/zfs_unencrypted.nix ../../modules/shared.nix @@ -15,6 +15,7 @@ # If you change the hostname, you need to update this line to root@ # This only works however if you have avahi running on your admin machine else use IP clan.core.networking.targetHost = "root@moritz-server"; + nix.package = pkgs.lixPackageSets.latest.lix; networking = { interfaces.enp2s0 = { diff --git a/modules/moritz/programs/nix.nix b/modules/moritz/programs/nix.nix index d00dfd1..15b4c20 100644 --- a/modules/moritz/programs/nix.nix +++ b/modules/moritz/programs/nix.nix @@ -30,7 +30,7 @@ in { nix = { nixPath = ["nixpkgs=${inputs.nixpkgs}"]; - package = pkgs.nix; # TODO: change this back + package = pkgs.lixPackageSets.latest.lix; extraOptions = '' experimental-features = nix-command flakes