moritz/clan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: moritz:020ea538ff297ed31143df854cd000da83244323
Branches Tags
moritz:main
...
compare: moritz:e69d9f410f1e87dacd049a8f3187c7032bef3a27
Branches Tags
moritz:main

3 commits
020ea538ff ... e69d9f410f

Author SHA1 Message Date
Moritz Böhme
e69d9f410f
feat: switch back to lix 2025-05-28 11:21:45 +02:00
Moritz Böhme
7aa27bf47e
feat: add typst formatter 2025-05-28 11:14:24 +02:00
Moritz Böhme
b7443bd577
Add moritz-laptop to secret 2025-05-28 11:14:23 +02:00
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
machines/moritz-server/configuration.nix
View file

@ -1,4 +1,4 @@
{ {pkgs, ...}: {
imports = [ imports = [
../../modules/zfs_unencrypted.nix ../../modules/zfs_unencrypted.nix
../../modules/shared.nix ../../modules/shared.nix
@ -15,6 +15,7 @@
# If you change the hostname, you need to update this line to root@<new-hostname> # If you change the hostname, you need to update this line to root@<new-hostname>
# This only works however if you have avahi running on your admin machine else use IP # This only works however if you have avahi running on your admin machine else use IP
clan.core.networking.targetHost = "root@moritz-server"; clan.core.networking.targetHost = "root@moritz-server";
nix.package = pkgs.lixPackageSets.latest.lix;
networking = { networking = {
interfaces.enp2s0 = { interfaces.enp2s0 = {

2
modules/moritz/programs/nix.nix
View file

@ -30,7 +30,7 @@ in {
nix = { nix = {
nixPath = ["nixpkgs=${inputs.nixpkgs}"]; nixPath = ["nixpkgs=${inputs.nixpkgs}"];
package = pkgs.nix; # TODO: change this back package = pkgs.lixPackageSets.latest.lix;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes

1
modules/moritz/programs/nvim/plugins/conform.nix
View file

@ -25,6 +25,7 @@
toml = ["taplo"]; toml = ["taplo"];
yaml = ["yamlfix"]; yaml = ["yamlfix"];
markdown = ["injected"]; markdown = ["injected"];
typst = ["typstyle"];
}; };
}; };
opts.formatexpr = "v:lua.require'conform'.formatexpr()"; opts.formatexpr = "v:lua.require'conform'.formatexpr()";

1
vars/shared/moritz-email-new/password/machines/moritz-laptop Symbolic link
View file

@ -0,0 +1 @@
../../../../../sops/machines/moritz-laptop

8
vars/shared/moritz-email-new/password/secret
View file

@ -2,13 +2,17 @@
"data": "ENC[AES256_GCM,data:IXktUisgMZF1FtVgeYGMw1hGmlen6aYRXebYDbzIvlk=,iv:tmfL9DNr39QGOIYbijyGY38Q/kbHrE5emMZlNXKLLnE=,tag:8J+E7Y+Agv6YyY8eStgbRw==,type:str]", "data": "ENC[AES256_GCM,data:IXktUisgMZF1FtVgeYGMw1hGmlen6aYRXebYDbzIvlk=,iv:tmfL9DNr39QGOIYbijyGY38Q/kbHrE5emMZlNXKLLnE=,tag:8J+E7Y+Agv6YyY8eStgbRw==,type:str]",
"sops": { "sops": {
"age": [ "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", "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", "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", "lastmodified": "2025-05-14T16:25:57Z",