From d4bb23f6cea6712e324e07920115396429920cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 25 Jul 2025 15:55:57 +0200 Subject: [PATCH 1/8] chore!: remove avante --- .../moritz/programs/nvim/plugins/avante.nix | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 modules/moritz/programs/nvim/plugins/avante.nix diff --git a/modules/moritz/programs/nvim/plugins/avante.nix b/modules/moritz/programs/nvim/plugins/avante.nix deleted file mode 100644 index a0fde07..0000000 --- a/modules/moritz/programs/nvim/plugins/avante.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib) mkIf; - - cfg = config.my.ai; -in { - config = mkIf cfg.enable { - home-manager.users.moritz.programs.nixvim.plugins = { - render-markdown = { - enable = true; - settings.file_types = ["markdown" "Avante"]; - }; - nui.enable = true; - dressing.enable = true; - avante = { - enable = true; - settings = { - provider = "openai"; - openai = { - api_key_name = "cmd:cat ${config.clan.core.vars.generators.moritz-openai.files.api-key.path}"; - }; - }; - lazyLoad.settings.event = ["DeferredUIEnter"]; - }; - }; - }; -} From ba9c9cbda35a4ff99205ea07c73185b9a0a6923e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Jul 2025 18:54:01 +0200 Subject: [PATCH 2/8] Update vars via generator user-password-moritz for machine moritz-desktop --- .../machines/moritz-desktop | 1 + .../user-password-hash/secret | 19 +++++++++++++++++++ .../user-password-hash/users/moritz | 1 + .../user-password-moritz/user-password/secret | 15 +++++++++++++++ .../user-password/users/moritz | 1 + 5 files changed, 37 insertions(+) create mode 120000 vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/machines/moritz-desktop create mode 100644 vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/secret create mode 120000 vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/users/moritz create mode 100644 vars/per-machine/moritz-desktop/user-password-moritz/user-password/secret create mode 120000 vars/per-machine/moritz-desktop/user-password-moritz/user-password/users/moritz diff --git a/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/machines/moritz-desktop b/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/machines/moritz-desktop new file mode 120000 index 0000000..32315cc --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/machines/moritz-desktop @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-desktop \ No newline at end of file diff --git a/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/secret b/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/secret new file mode 100644 index 0000000..1f2efa8 --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:5KuBHHM5gG3IKwEq8JQEG1XKv9Kt1eugYe8iK2wmqMo4xDbuCbqDJuZ1Y2ACoBNgdu4P+NWUSGHRRPyJrFiZy/pfyQqYC39Gy7sGLtsWgh4z5K7EpgQ96xonnD1iGSMY3gXNp2jwPFsWsg==,iv:Zfmm+0lfN+MmlBlJ3NE/rOkCgO+ZR8Hmyx77ELzY7tA=,tag:41Qa20I2KOnQKz9vHKaaRA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpSEdwV2RTYWEwZE9vNGFI\nMGtBQTJiUldDemU1YkRHeU5tZ1lhMkVBZnhNCmpiZGZydlZpUlBjb1hISHRlRGxv\nay9sekg0SUVDNjB4YUlrSjVMRVdVWncKLS0tIGJFOXZtZTYyTTh3cG9sQks4c21p\nSGxUOEdXZ1ZydTAraTJOdTcrOVNybXcKHSMn+l0GYFoSVXt4EbAYQpIQ7PRLeMfJ\nlUA0x5iO8ALI/uoRkJSnG/BlSykMC2XSZlUb6vf6TKxFe2n6/PirCA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBndFBsL1ZqNjNqRndpd1A0\naGVTWkF0NS9YYmd3SWNYK1BJNVdoQlF5UVZRClZZanlLRlpVRXVQY3BoMnlFNU5X\nRElGUm94YngyVnRGY1ZqYkZzLzgyNHcKLS0tIGhjaFNWYkJsL2ZJYlM4TTROZkcy\nMkZFa0JVNFhOSFNvVldSa1NpdUNmencKXp46vV2U91ZOOG5AE+7t8iYL+a8UWl2H\nNx5CtmJBHZD76f/sYCy8/shON4VYWUV4jNAcD2PIPFBkUVDWcQYgTg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-07-26T16:54:01Z", + "mac": "ENC[AES256_GCM,data:Jwc96x2+pKYs2Bx0MwwNik/1F9wBxnfZwm+3D5jTFa1sQ3lCf0TOBLYb7pALHR0BdY9oF6uXPTZCwEGB/Aa8CFsemmKCZlW5Gz5RGrDd4EfwoFsv6v6wN+GUNF8XRJGI0ELZEgVAxQ8JvVoOT1Ttdvi3IdyjRqi5tovpevzP8x8=,iv:ZnLsAyo5NqoFW3+z8tJOF0sWTISGWY2rjvb0XSv2qqw=,tag:HZj1f/woO0UAxR5NrE1a5A==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/users/moritz b/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-moritz/user-password-hash/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-desktop/user-password-moritz/user-password/secret b/vars/per-machine/moritz-desktop/user-password-moritz/user-password/secret new file mode 100644 index 0000000..e84ab88 --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-moritz/user-password/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:0AYpxG8PMkITaME=,iv:kjnXGOe0n4n9fc/1UKGWfJjE87UoyQ+IIva36r3ILGw=,tag:hgoTxlsqyHRC2Ig4NuiU4Q==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGamxRc1Y1ZE9ENVk2aFEv\nTjU0cGdERVlwQUZ4N2tjWEl3VGpqN1hYTTNJCmJLai81K1AzVFhnQTVkRWNheHF4\nYlVqZ3FvZ05JTVYyR05qRDlzKys3aWcKLS0tIE5iTXI2V0x4c3NEeVB1V2srV2tJ\ncDZjUm45M3VHeklndWF5TjlpVG9Mcm8KZjUSa4eSlWt/0wzuGIw6d5WHlVGAvVN+\ntEfsVmzeQ8JepKgVO6RhnTQuXMIB8APJAJL07TATaas6tuDUdMF9Ag==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-07-26T16:54:01Z", + "mac": "ENC[AES256_GCM,data:cOjybeWQmXZ8GPcQcbD7yJ0lRBuwmXbH4ILsbhdYuIsNEEqEo5dmHX+3N1VhdK5BaSjioi1bAa1feVb1JtPwXuyUiU75CIhIksfWvnOCnGl57TBS0knBWUSmx1wNVtu9j562MWwXTyYShaLxck/6nzI/9EZcjqNWWLiwbaYATng=,iv:dVmtnj2vQhthww9DXWwhEUrb39QlkOLa5roh2Xh0pKs=,tag:JEWhPdQ4nNgccCxDkJXnBA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-desktop/user-password-moritz/user-password/users/moritz b/vars/per-machine/moritz-desktop/user-password-moritz/user-password/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-moritz/user-password/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file From e9852cca15f2d497683ab9edc3c89d54440b8aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Jul 2025 18:54:10 +0200 Subject: [PATCH 3/8] Update vars via generator user-password-root for machine moritz-desktop --- .../machines/moritz-desktop | 1 + .../user-password-hash/secret | 19 +++++++++++++++++++ .../user-password-hash/users/moritz | 1 + .../user-password-root/user-password/secret | 15 +++++++++++++++ .../user-password/users/moritz | 1 + 5 files changed, 37 insertions(+) create mode 120000 vars/per-machine/moritz-desktop/user-password-root/user-password-hash/machines/moritz-desktop create mode 100644 vars/per-machine/moritz-desktop/user-password-root/user-password-hash/secret create mode 120000 vars/per-machine/moritz-desktop/user-password-root/user-password-hash/users/moritz create mode 100644 vars/per-machine/moritz-desktop/user-password-root/user-password/secret create mode 120000 vars/per-machine/moritz-desktop/user-password-root/user-password/users/moritz diff --git a/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/machines/moritz-desktop b/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/machines/moritz-desktop new file mode 120000 index 0000000..32315cc --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/machines/moritz-desktop @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-desktop \ No newline at end of file diff --git a/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/secret b/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/secret new file mode 100644 index 0000000..baf75e9 --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:hpmCOPiJMC2r/LSC0bXRpeCxR/ZvwhW6j7R5M04HIhO0LpZXk7AHIZgg5wL4BHusgz/LgN5eqlDyhNhg1VJ5+rZJZYpOBL0w6qS6w7RbHY+I29LiTVW/WqB14cVSv1nNVZT5RSl1Ff6uEw==,iv:UagwgAVfbRII258oRXSTSHFL0KltdiRiHOoJh1kqd+U=,tag:VKKOHd7mZvJP+sPeDuJK/w==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5NGJDNGdRRkI1TmtaNWtD\nMHF1UHFWYzlqaVpNRERXcmhaRWRQaXNaQ0QwCmdjc284QW1PYUYvQWF4c0FHNm1R\nUGhSOFFORk4xS3V5R1NlYkYvWGt5N3MKLS0tIHBabkw3UUROWEtrOFJxQlBCam0z\nU0VmWjlyZ0NwemNlWmFubTNlUktDZjAKhhfA0jjDWtb1gdm0w1MKwChyaR8F7Yqy\nHWD+IheX5CMzBAibydakmDz5jtEGAC4ns5oavClRWJf38ae02nhjHQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4b0lCa0F6S0tqZldwOEJa\nQ0xWcWRRRVpxQ1grYWdIYllVWXh3MWR5MDNvCmE5MVIxNWRVRm9OTStZTmV3amd4\nRUE1VThVd3lJaTFiQVIxQ0MrK2ZRbzQKLS0tIEQ4M0Z0V0dvcjJ3dk1wTG1jeW02\nblRxcEVuTS9KQUlhbVZhYjhJNHJiUEEKIq3oGHZCxDZspFAks/CgcudpdHrfBlOA\nL6jNtUHKV71KC6pf5UpFjtaqt80/9p0PHCH8pMEn+xYgpiZalWk0WA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-07-26T16:54:10Z", + "mac": "ENC[AES256_GCM,data:H3BQ1YaRLO+Fse0c5lSGi0T2uCz3E+02IY6yTAoLfnM1Dp87POwDkU0JmJ+anrkLn7CGJ9KBf/an5oqTxbSAKdKsXrfceRurAqLglOnuPDLJOZh75wUD+lfUkFh41DGVfu8S86j2kx1vgOWonGl8rYLuaTYC6D2IuKXRCQfUO5M=,iv:E2zBQYnwAA9hR9ww+Hck/xYulVPsz4dIdH+oOmGKqJ0=,tag:5h6b3DvoK6KvCwY1Rva0mQ==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/users/moritz b/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-root/user-password-hash/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-desktop/user-password-root/user-password/secret b/vars/per-machine/moritz-desktop/user-password-root/user-password/secret new file mode 100644 index 0000000..2a33841 --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-root/user-password/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:g/PPQ+RH45hXBivLTFdvn+6dXIlqpn0GJNYdh+HsBKeV0lksNt9MtgNXizSuAdPOseJbtNTa,iv:f3iKrFOygDc0Wf5Kxn36zJmeH5NHSRDNhE13mjkO25s=,tag:PAuEwy3MnJ7+XU5o4SYejw==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzTDEvMkU3bDBPQW5sSi96\na3hCZnhhWGw2Z2NCNmNOcjlpUWJ0TkZaZWpRClhkeDdXZDlWenhSbEhtcU5uczZn\nSTNCMWZzalpxMmxPc2svWXd0TFFwa2MKLS0tIGRDTFV0YzNyaUNCM1Ryb2x3enJy\nWFJkTzdkS0d2ZFdKRjk5cWpSMVNsbEkKoTRSfVAMnDL2K+5rzatngny636K0JpKF\nXpJhyMwHjOUrYOPYfGMlf6Ph9w3g8e9noojcDLLuGAnyr7ORTtSjkQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-07-26T16:54:10Z", + "mac": "ENC[AES256_GCM,data:6sUYrU4dlDmeur324Ffoqys1s01mtLwJ0ZeaQCkWY8fOR/b6wZn/E+BGM3tW9I5x0tWRdhCuaMcmJq6U0I1FaxvJYk14PVUmWTV8mXL/kSnPcfxgDFuBXHVRYAfd/A1OVez694SPV5wG4r+DomU557rPLZtrVY1xWaGEyfAciEs=,iv:oeyjWzl56DA3T2c6f5QxqaRRlKxLjIHkSWzJi+njNJk=,tag:mY+rMb7sicSGFLtw2aftIg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-desktop/user-password-root/user-password/users/moritz b/vars/per-machine/moritz-desktop/user-password-root/user-password/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-desktop/user-password-root/user-password/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file From 43edc4790ae86a25b6e23cc90e023b474e695143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Jul 2025 18:57:44 +0200 Subject: [PATCH 4/8] Update vars via generator user-password-moritz for machine moritz-server --- .../user-password-hash/machines/moritz-server | 1 + .../user-password-hash/secret | 19 +++++++++++++++++++ .../user-password-hash/users/moritz | 1 + .../user-password-moritz/user-password/secret | 15 +++++++++++++++ .../user-password/users/moritz | 1 + 5 files changed, 37 insertions(+) create mode 120000 vars/per-machine/moritz-server/user-password-moritz/user-password-hash/machines/moritz-server create mode 100644 vars/per-machine/moritz-server/user-password-moritz/user-password-hash/secret create mode 120000 vars/per-machine/moritz-server/user-password-moritz/user-password-hash/users/moritz create mode 100644 vars/per-machine/moritz-server/user-password-moritz/user-password/secret create mode 120000 vars/per-machine/moritz-server/user-password-moritz/user-password/users/moritz diff --git a/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/machines/moritz-server b/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/machines/moritz-server new file mode 120000 index 0000000..f18ca49 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/machines/moritz-server @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-server \ No newline at end of file diff --git a/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/secret b/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/secret new file mode 100644 index 0000000..5d5019d --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:PgQJn1OGosvQlwue8bOOMGyBC5MsIYk3uAcK7Ob77hBfCFuuQIqWDjjo+lVsKE/dp7c+vaFgW/o2RfPo27b6lWjK3HMajhMskyEqSzxiyezwPeI7tUlGD8244FkvlVcpyqbaGEskS8eTBw==,iv:T7uLmD+bInpTHMPDRdTIX1YOerBk8iVysaBb75ma640=,tag:3f8KFP/RbS9Cvko4WHp+1g==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpV1ZIL21vc3VZVHFwTDFR\nSUl6RUU4Wk1ZeS83SmdGYVpTbFhGYU1KdDNFCmNLeEhyUlBTY3dCdTBlVUtKRkQ5\nWHNHYzBpd2xFeG54Wm15bjk5VEpScW8KLS0tIDF3L3g3YlAzaXdhazBXczRRWjRV\neldRRVUxOHBueElOZU9rang3MVE4K28KyM+kYzfK2TW3FE4KiLU31MAbRXAKny0E\nYXinVR2OE/k6dCPgPXze/v/Ykj0TEH7F2hk8AHRhNjQivat4FoiHMA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1wwlwwv9gscl9z6k59z6pp8hcay7vehvqp6y5f85pjyd9seqe8s0q5dkmr4", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWYVovS0x3bGRha2thUC9v\nTXJua3ZqRlFiRDYxRCtTYkVSMk9qL3V4MGtzCnpjSUtseDV1TDIwYzBRZGhEV2tN\nMDR1RVozazRsWXhkbGROUWk5WVhNNkkKLS0tIHBHdCt4SWJTb0w2QVM1T2NteWZG\nN3pCQWx0bGlKdXo2Ylk1WlRmb1JpTncKic3wSalueWDQsMmtUBpnjKwyp02ldCnb\nI39fGeVeQEkwqtmpDNT6KYzuTHRD5RKnlaALiMzpLILszCTnbK9jxw==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-07-26T16:57:44Z", + "mac": "ENC[AES256_GCM,data:7UwvpJf2cLR0QH2vUm9yCaL0Od3TVjOHqcTQ7q9ozYPsodjZGlNVKGr34/qZPRpHNhzJaB6uOgt6edEmkGuzHehSp08qp/vFJMAwsdx3TWpQl5crAJW5djfZcdcV18d8rwMmE712wpKtxWtLpbUMCkRO+UrmAC3WV4adY5CeeOw=,iv:RglUjctgBWVwZ6IC5/G4Em2+LHsy1X4UfTHABAHZAJA=,tag:Ic8RcHgpxWZrMT08N6Tnhg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/users/moritz b/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-moritz/user-password-hash/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-server/user-password-moritz/user-password/secret b/vars/per-machine/moritz-server/user-password-moritz/user-password/secret new file mode 100644 index 0000000..24c2947 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-moritz/user-password/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:ySuCIjS5Fb7Uoco=,iv:amiGdPxEP2PHYD2d/AFXRFDYv30ATebQfy9fnpxWOWY=,tag:DEYEN+nkypmBU5/A/xNcWQ==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDcE1aYmlXb2Rxam1wT2FB\nd1BhbEZQM2VCWm0zbno1YUtlM3VLVmd5UlFvCnNXdEx5OGlZbmpDZWFhN05tdTBm\nTHIrNXJyaHdrL3RncFJtZ2tlZTJLVncKLS0tIFMralFGWnhySHg0V09UQnlnSGVT\nSURHaXZWYUVoZWRZbE10QWFBdVBiZGcKQZAjSC2Bg41YWKQxwIqWDGxriLTxSVxN\nhQBmW9lmSE+06EjjChq10+Go5cl5QrBkd+AfvAhy8N0LU0cf4wN2fA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-07-26T16:57:43Z", + "mac": "ENC[AES256_GCM,data:oqZpb8HBvMF+/L0yxAxLv6TFbNgmsh8axX3ih8yauZ9mUL5nLQtR+R1k9in/oZCUJsIoXyZ5fnwe3KgBJOBNA8Px3o45M24f43XiTTBXFz2J3Gf/zOiyv7gcJbw6cCPLH5ze0AuE3d0oMMXErejAIpEvVBbxYGIcBNqe8xuhYCU=,iv:mJ8kc0X55H/Zj22V7/hNE4JjVtqEoJre+eaATkMqG40=,tag:BmnA1wuwv5oodJ9C5zM2Jw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-server/user-password-moritz/user-password/users/moritz b/vars/per-machine/moritz-server/user-password-moritz/user-password/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-moritz/user-password/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file From be45586ece87702a499a12b5ea9946e459b734e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Jul 2025 18:57:48 +0200 Subject: [PATCH 5/8] Update vars via generator user-password-root for machine moritz-server --- .../user-password-hash/machines/moritz-server | 1 + .../user-password-hash/secret | 19 +++++++++++++++++++ .../user-password-hash/users/moritz | 1 + .../user-password-root/user-password/secret | 15 +++++++++++++++ .../user-password/users/moritz | 1 + 5 files changed, 37 insertions(+) create mode 120000 vars/per-machine/moritz-server/user-password-root/user-password-hash/machines/moritz-server create mode 100644 vars/per-machine/moritz-server/user-password-root/user-password-hash/secret create mode 120000 vars/per-machine/moritz-server/user-password-root/user-password-hash/users/moritz create mode 100644 vars/per-machine/moritz-server/user-password-root/user-password/secret create mode 120000 vars/per-machine/moritz-server/user-password-root/user-password/users/moritz diff --git a/vars/per-machine/moritz-server/user-password-root/user-password-hash/machines/moritz-server b/vars/per-machine/moritz-server/user-password-root/user-password-hash/machines/moritz-server new file mode 120000 index 0000000..f18ca49 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-root/user-password-hash/machines/moritz-server @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-server \ No newline at end of file diff --git a/vars/per-machine/moritz-server/user-password-root/user-password-hash/secret b/vars/per-machine/moritz-server/user-password-root/user-password-hash/secret new file mode 100644 index 0000000..5559301 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-root/user-password-hash/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:gXO0JAJEuPyNe9inXIVruJpa7K6lCl8AbNv7m3oF1zqFDKzVStOy0J051L5YRCPWM9x4XTRAp0gzRvM888AD+qw9s3dRLw9JOE0vLiy7h+adC8qbYr1wPKuSgU49UEYOra4Iy/ipDJBrwg==,iv:qh/W20OgxixJL9ihmLif6JBqSZie0/Scfkn+gD5KU/g=,tag:99fy1mHFhkD6t7XUVDbn4Q==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJd0dBVnAwcEFVREU3d0RV\nR0dOcFk5UGRJdjJkZmNwZU9yVjduV04wNkNVCkxSVmxoNUo1UzRFMlVTZTJOVnli\nMldodGYzNU5XanJxM2RRYXE0b3pqR0kKLS0tICtLU1R0Z1RVTUpLTVo5V05uNXQr\nSW1DV0hOUU9yRnBBdnhqamVZWTFiZW8K2aTL66YEZrRvV5OYTmMTUEVGSnaxMluk\nhtfqvESB+OjLj+AKH+hZE2LSI3pyLxpYaYbLpz3jJoo+orb0KKFTYA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1wwlwwv9gscl9z6k59z6pp8hcay7vehvqp6y5f85pjyd9seqe8s0q5dkmr4", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVZktWZkJiMDRLOVZ2UlVt\nNmZ6S0JPSk9aUUlHSFdONzdpb0Foc0Y2bGwwCkNnd1V2Nld4QVh0b0lzbXJ5ZVkx\nUUdoOHpWaXNmM3JGaXY2SWliNVFvWVkKLS0tIDF2NXRlUTdPaE4yUldqU3VXbXNy\ncW5aZnNhbGxLVVVlZFhkdWNkeGg3cGcKcViwq1vahgD7UrMlUNvCxNaEuaLcYi+M\nBSz/K4nJzgDjA3AiRmDGALusCgMZRZuDS83iw9k+dNPWMrMyNVj/iA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-07-26T16:57:48Z", + "mac": "ENC[AES256_GCM,data:xNrjsW9VUjL6ANlIhd9JolwMdCitinSFt9M3Z2App/KZa46YBoUFitYicKHncdqcAbmFfUQQ3u0JOXX09da5yiFUxP+3bTSkr5e5CAbmvRALSOA3Ukf1zRfopEp658jYZ34CaveWFphYbPVdcHpUEjS58d0TuxfM19zrCHpnri4=,iv:26Hu/hSnQexbmO0pwL4HXHUSoOpduKh5S3ty73yDLeI=,tag:LS89P61RObTlhxek2Q71Rg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-server/user-password-root/user-password-hash/users/moritz b/vars/per-machine/moritz-server/user-password-root/user-password-hash/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-root/user-password-hash/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-server/user-password-root/user-password/secret b/vars/per-machine/moritz-server/user-password-root/user-password/secret new file mode 100644 index 0000000..d404880 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-root/user-password/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:9aYWWQdBKO23wFjbqhcJK/5r/BEfoJFBSw==,iv:FEArZTg7CGKVZBOqsSmeoTfvRC9QyiOo2vw0EUVNDrI=,tag:xri/TZ1kIeB2J8PVUYXpzg==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpRTB2clpySTc1T0lWSXRl\nYjZFNWI3RnFnTXFORFpEcEkvM0tEWGNMMFJ3Clp5K0JtTDJwczlMWDRLeTZMdDl5\nVmZ1eXV5azRVMHJtSVVmM2dCUmczZDQKLS0tIFhpaUoxK29JTStlK25BU2hhZHk4\naUhMdTd3UjI3ajdrRGZDYUdxVmxSUXcKI36x2P0yQcvSpjH//P6HZulBRJ79FBhz\n30KBNyHZ+oKUBDsPA7J9svMNg30QJRaFiM8OQXXcY0OqfJhaS1A0vg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-07-26T16:57:47Z", + "mac": "ENC[AES256_GCM,data:2XgXqMEJmwid8Qs8S5de5aLHmelhft6mISMhOn+yiRwiZYZD82r+QU3RRHLSIZ7Rrr95o/vFVc1ZDmGL/X6nDvNKnW0Cu78iWQOqGNll3Qih0TrDxwyKKkkmA1+okgE18SOLW82Jszu5G9FTsGA1irf8sL3d2iC0DhRCc9lPN/8=,iv:uslmj8y53C+hf8n8IuDJe1BGnV1YHT6ukhbdmyKmank=,tag:g60+GZb3tgMncgqSnpRzjg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-server/user-password-root/user-password/users/moritz b/vars/per-machine/moritz-server/user-password-root/user-password/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-server/user-password-root/user-password/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file From 16c88ad28781fd1b2f0dc3b04a7a856fbcaa19e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Jul 2025 19:00:34 +0200 Subject: [PATCH 6/8] feat!: update inputs --- flake.lock | 262 +++++++++++-------------------- flake.nix | 47 ++++-- modules/moritz/programs/niri.nix | 2 +- modules/moritz/shared.nix | 22 +-- modules/shared.nix | 3 +- 5 files changed, 128 insertions(+), 208 deletions(-) diff --git a/flake.lock b/flake.lock index 616422c..8782ab7 100644 --- a/flake.lock +++ b/flake.lock @@ -124,14 +124,12 @@ "flake-parts": [ "flake-parts" ], - "flake-utils": "flake-utils", "nix-darwin": "nix-darwin", "nix-select": "nix-select", "nixos-facter-modules": "nixos-facter-modules", "nixpkgs": [ "nixpkgs" ], - "nuschtos": "nuschtos", "sops-nix": "sops-nix", "systems": [ "systems" @@ -141,11 +139,11 @@ ] }, "locked": { - "lastModified": 1750841178, - "narHash": "sha256-KAFvroXFgjaUSV8GKl8q/KUfAtcpLhfMF+CQhHIeMJ8=", + "lastModified": 1753447519, + "narHash": "sha256-Aj4/4z2Is7l/yrseAG4prKzk6dJ4UAHraOW7FwrJHD4=", "ref": "refs/heads/main", - "rev": "3e030a5199b77ca24be31110c4564974cc25352a", - "revCount": 7801, + "rev": "bac2f15668c69ef6c3a02efb2a3660e95266e7dc", + "revCount": 8682, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -179,21 +177,17 @@ "clan-core", "nixpkgs" ], - "systems": [ - "clan-core", - "systems" - ], "treefmt-nix": [ "clan-core", "treefmt-nix" ] }, "locked": { - "lastModified": 1750636936, - "narHash": "sha256-YrwZOt+0dMgMFUsGzIGJcKjyyb8r3VoyrhMIlmJq+IQ=", - "rev": "f072536dd857f5a8eefd4b5518e4f0919b42e9df", + "lastModified": 1753067306, + "narHash": "sha256-jyoEbaXa8/MwVQ+PajUdT63y3gYhgD9o7snO/SLaikw=", + "rev": "18dfd42bdb2cfff510b8c74206005f733e38d8b9", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/f072536dd857f5a8eefd4b5518e4f0919b42e9df.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/18dfd42bdb2cfff510b8c74206005f733e38d8b9.tar.gz" }, "original": { "type": "tarball", @@ -208,11 +202,11 @@ ] }, "locked": { - "lastModified": 1750680230, - "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -304,11 +298,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -326,11 +320,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -341,7 +335,6 @@ "flake-utils": { "inputs": { "systems": [ - "clan-core", "systems" ] }, @@ -360,26 +353,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems" }, @@ -483,11 +456,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750770554, - "narHash": "sha256-WokzB3u2Rfk2zXBEoSQo5gF0FHZFVth0BWr8PoE8KbU=", + "lastModified": 1753376980, + "narHash": "sha256-h7Say1U7r1ke3mfg3yvbzYnk3izmJ2g1zXzX5APNA8Q=", "owner": "helix-editor", "repo": "helix", - "rev": "974ac9eaf3797661880006fedc10933cec8d2e86", + "rev": "4281228da35b02b0dcca3b4772b93d48d79ce046", "type": "github" }, "original": { @@ -505,11 +478,11 @@ ] }, "locked": { - "lastModified": 1748000383, - "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", + "lastModified": 1752595130, + "narHash": "sha256-CNBgr4OZSuklGtNOa9CnTNo9+Xceqn/EDAC1Tc43fH8=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "231726642197817d20310b9d39dd4afb9e899489", + "rev": "5f2e09654b2e70ba643e41609d9f9b6640f22113", "type": "github" }, "original": { @@ -525,11 +498,11 @@ ] }, "locked": { - "lastModified": 1750798083, - "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", + "lastModified": 1753387274, + "narHash": "sha256-Y1hAI9h+9DLBbgKvZBsHaeptFIcRw4iC6ySPmzyqmlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", + "rev": "a35f6b60430ff0c7803bd2a727df84c87569c167", "type": "github" }, "original": { @@ -554,34 +527,6 @@ } }, "ixx": { - "inputs": { - "flake-utils": [ - "clan-core", - "nuschtos", - "flake-utils" - ], - "nixpkgs": [ - "clan-core", - "nuschtos", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.8", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { "inputs": { "flake-utils": [ "nixvim", @@ -617,11 +562,11 @@ ] }, "locked": { - "lastModified": 1750403547, - "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", + "lastModified": 1753418232, + "narHash": "sha256-fMVYDv0/7v4qrbZmzfqkFeEpelME4bT5JQBfXL9zl/E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", + "rev": "ca1145d927d177194fec4b0bf47a4b7dd2ed613d", "type": "github" }, "original": { @@ -632,11 +577,11 @@ }, "master": { "locked": { - "lastModified": 1750840667, - "narHash": "sha256-6k0vaFGB+zisVXcrhGTgXZu9TSgApU28K73Eck/rCp8=", + "lastModified": 1753451667, + "narHash": "sha256-9F6KC3S74kuVipcOjHby92DwKiNRECteaPrXSLN3ooE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c31d8f739b34c30a20c25acc245651c75d111533", + "rev": "42bf885286192fc8dc5a1a44f4681146ad3dc65c", "type": "github" }, "original": { @@ -688,11 +633,11 @@ ] }, "locked": { - "lastModified": 1750833445, - "narHash": "sha256-Kbx4eEirM4M9tdnlzBrFiroZ41XgJzOquFO0+8430rI=", + "lastModified": 1753435696, + "narHash": "sha256-WnFRQSzIUEt2QDpJ4QKe01ygU8EDxSfCp6EENWCBqeg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "bf72d8678a5d5aef73736ff0ee64f5800ca26bb7", + "rev": "57acedd7c9b2b2e6d23cc4c3110e541061a3b6d9", "type": "github" }, "original": { @@ -704,11 +649,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1750794136, - "narHash": "sha256-kihP/pMdpYn2DPNqlSa8UhuoOJzjhgbTgKJgde1JUdE=", + "lastModified": 1753357541, + "narHash": "sha256-GzQlU+hwtcHJF0KI2DWYIPSJ9zkHH7Erpe/ChPorZX8=", "owner": "neovim", "repo": "neovim", - "rev": "5ae41ddde35041e0601e94d1c6b348029c3b305b", + "rev": "e512efe3696b2ed18db55683fecf42bbc733c767", "type": "github" }, "original": { @@ -729,11 +674,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750826500, - "narHash": "sha256-smZR1izUug1UXl7f7PxHFbU6PAacGHDOMKxmwSN05Dw=", + "lastModified": 1753374784, + "narHash": "sha256-R6vHaUJiehdXSnzZqCOxmtmAnHA4GBOpS/UKydzAI38=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "999578e45337439013d38cededef32b1e5e38e6c", + "rev": "da95771a65821bc98118cf3478eb2fc6fbfe035a", "type": "github" }, "original": { @@ -762,11 +707,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750791124, - "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", + "lastModified": 1752870529, + "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", "owner": "YaLTeR", "repo": "niri", - "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", + "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", "type": "github" }, "original": { @@ -783,11 +728,11 @@ ] }, "locked": { - "lastModified": 1750618568, - "narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=", + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "type": "github" }, "original": { @@ -825,11 +770,11 @@ ] }, "locked": { - "lastModified": 1750565152, - "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", + "lastModified": 1752985182, + "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", + "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", "type": "github" }, "original": { @@ -901,11 +846,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1750643298, - "narHash": "sha256-zotsGV6sQIpEu/UGpoq8Ga2VHWFwKB/yBY6fF43q8JM=", + "lastModified": 1753285640, + "narHash": "sha256-ofa021NeHDXAxg5J8mSnn8rHa393PAlD85ZCetP4Qa0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b9e28e23af46f4b5c4ca287ea8ce46e5b39e723c", + "rev": "ce87c8a9771d1a20c3fa3b60113b9b0821627dcb", "type": "gitlab" }, "original": { @@ -916,11 +861,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750731501, - "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", + "lastModified": 1753399495, + "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "69dfebb3d175bde602f612915c5576a41b18486b", + "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", "type": "github" }, "original": { @@ -932,11 +877,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "29e290002bfff26af1db6f64d070698019460302", "type": "github" }, "original": { @@ -948,11 +893,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -963,11 +908,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -991,11 +936,11 @@ ] }, "locked": { - "lastModified": 1750788551, - "narHash": "sha256-7tQIndetzeVtTuYQ7vYTaABUS1muiigdXK3XyXuPzvg=", + "lastModified": 1752976861, + "narHash": "sha256-59HcrqHfbSJUdmpzrAa9x8fW1PoS+ZGhCjL5k5HbyV8=", "owner": "nix-community", "repo": "nixvim", - "rev": "6a15c2ffc50ca7998df2fd6b86c3c9f298e9137a", + "rev": "0c50ed9349199219583cb1ed1a972d71e06039ec", "type": "github" }, "original": { @@ -1011,17 +956,14 @@ ], "nixpkgs": [ "nixpkgs" - ], - "treefmt-nix": [ - "treefmt-nix" ] }, "locked": { - "lastModified": 1750838189, - "narHash": "sha256-zDA6vwUfkzTgJ+gWKANayOsLuXzHZwUNjY7p+33J02M=", + "lastModified": 1753449845, + "narHash": "sha256-gdRqSfE92ryPacbwlOB+9tLTTPj+Xv+DHezez+66Qrc=", "owner": "nix-community", "repo": "NUR", - "rev": "9f6c15cf757a2e68e84d799d1b8926d13d5c370f", + "rev": "5d2ec507162b53b1a947ca6e71bba25458d43756", "type": "github" }, "original": { @@ -1030,36 +972,10 @@ "type": "github" } }, - "nuschtos": { - "inputs": { - "flake-utils": [ - "clan-core", - "flake-utils" - ], - "ixx": "ixx", - "nixpkgs": [ - "clan-core", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749730855, - "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", - "owner": "NuschtOS", - "repo": "search", - "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", - "ixx": "ixx_2", + "flake-utils": "flake-utils_2", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" @@ -1088,7 +1004,7 @@ "filetags": "filetags", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "git-hooks": "git-hooks", "helix": "helix", "home-manager": "home-manager", @@ -1157,11 +1073,11 @@ ] }, "locked": { - "lastModified": 1750119275, - "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": { @@ -1172,11 +1088,11 @@ }, "stable": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -1393,11 +1309,11 @@ ] }, "locked": { - "lastModified": 1749194973, - "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", + "lastModified": 1753439394, + "narHash": "sha256-Bv9h1AJegLI8uAhiJ1sZ4XAndYxhgf38tMgCQwiEpmc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", + "rev": "2673921c03d6e75fdf4aa93e025772608d1482cf", "type": "github" }, "original": { @@ -1444,11 +1360,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1750821680, - "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=", + "lastModified": 1752338000, + "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac", + "rev": "ba78881a68182ce338041846164cbfed0d70935c", "type": "github" }, "original": { @@ -1460,11 +1376,11 @@ "zola-theme": { "flake": false, "locked": { - "lastModified": 1749164920, - "narHash": "sha256-XwggfJBnk9bxOVe6EIeerjebsqDXpqeAJ8umq5GPbIg=", + "lastModified": 1753053308, + "narHash": "sha256-vyB7gLKzTFLSEPPD4ylc3Uyj3WeKRFFklEnE58jn5JA=", "owner": "Speyll", "repo": "anemone", - "rev": "0fa77c2eeccd096f6def3b540a9417a1b54fdd5f", + "rev": "47b2085cb01f0e82fd83221aad79ab0b3d1702e0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8767a60..8231b75 100644 --- a/flake.nix +++ b/flake.nix @@ -80,19 +80,45 @@ inherit inputs self; }; - inventory = { - machines = { - moritz-desktop.tags = ["peer"]; - moritz-laptop.tags = ["peer"]; + inventory.instances = { + sshd-basic = { + module = { + name = "sshd"; + input = "clan-core"; + }; + roles.server.tags.all = {}; + roles.client.tags.all = {}; }; - services.zerotier.default = { - roles.peer.tags = [ - "peer" - ]; - roles.controller.machines = [ - "moritz-server" + zerotier = { + module = { + name = "zerotier"; + input = "clan-core"; + }; + roles.peer.tags.all = {}; + roles.controller.machines.moritz-server = {}; + }; + user-moritz = { + module = { + name = "users"; + input = "clan-core"; + }; + roles.default.tags.all = {}; + roles.default.settings.user = "moritz"; + roles.default.settings.groups = [ + "wheel" + "networkmanager" + "video" + "input" ]; }; + user-root = { + module = { + name = "users"; + input = "clan-core"; + }; + roles.default.tags.all = {}; + roles.default.settings.user = "root"; + }; }; }; }); @@ -175,7 +201,6 @@ nixvim.inputs.systems.follows = "systems"; nur.inputs.flake-parts.follows = "flake-parts"; nur.inputs.nixpkgs.follows = "nixpkgs"; - nur.inputs.treefmt-nix.follows = "treefmt-nix"; stylix.inputs.base16-helix.follows = "base16-helix"; stylix.inputs.flake-compat.follows = "flake-compat"; stylix.inputs.flake-parts.follows = "flake-parts"; diff --git a/modules/moritz/programs/niri.nix b/modules/moritz/programs/niri.nix index 4e311e1..1691133 100644 --- a/modules/moritz/programs/niri.nix +++ b/modules/moritz/programs/niri.nix @@ -238,7 +238,7 @@ in { input = { touchpad.natural-scroll = false; focus-follows-mouse.enable = true; - warp-mouse-to-focus = true; + warp-mouse-to-focus.enable = true; keyboard = { xkb.layout = "us, de"; }; diff --git a/modules/moritz/shared.nix b/modules/moritz/shared.nix index 0a32285..b619d68 100644 --- a/modules/moritz/shared.nix +++ b/modules/moritz/shared.nix @@ -1,26 +1,6 @@ -{ - config, - clan-core, - ... -}: { - imports = [ - clan-core.clanModules.user-password - clan-core.clanModules.root-password - clan-core.clanModules.user-password - ]; - - # generate a random password for our user below - # can be read using `clan secrets get -user-password` command - clan.user-password.user = "moritz"; - +{config, ...}: { users.users.moritz = { isNormalUser = true; - extraGroups = [ - "wheel" - "networkmanager" - "video" - "input" - ]; uid = 1000; openssh.authorizedKeys.keys = config.users.users.root.openssh.authorizedKeys.keys; }; diff --git a/modules/shared.nix b/modules/shared.nix index 92721ea..377ad63 100644 --- a/modules/shared.nix +++ b/modules/shared.nix @@ -1,11 +1,10 @@ {clan-core, ...}: { imports = [ - clan-core.clanModules.sshd - clan-core.clanModules.state-version clan-core.clanModules.static-hosts ]; clan.core.settings.machine-id.enable = true; + clan.core.settings.state-version.enable = true; networking.hosts."fd77:acc0:1d56:2265:499:9367:28e0:97d3" = ["moritz-remarkable"]; From 08060f117fdab9c151c39cc7580b66bbe5e57439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Jul 2025 19:04:33 +0200 Subject: [PATCH 7/8] fix: obsidian plugin --- .../moritz/programs/nvim/plugins/obsidian.nix | 140 +++++++++--------- 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/modules/moritz/programs/nvim/plugins/obsidian.nix b/modules/moritz/programs/nvim/plugins/obsidian.nix index 21b0c89..3ac86b8 100644 --- a/modules/moritz/programs/nvim/plugins/obsidian.nix +++ b/modules/moritz/programs/nvim/plugins/obsidian.nix @@ -1,69 +1,71 @@ -_: { - home-manager.users.moritz.programs.nixvim = { - plugins.obsidian = { - enable = true; - settings = { - ui.enable = false; - dir = "~/Documents/Nextcloud/Notes/zettelkasten/"; - note_id_func.__raw = '' - function(title) - if title ~= nil then - return title - else - suffix = "" - for _ = 1, 4 do - suffix = suffix .. string.char(math.random(65, 90)) - end - return tostring(os.date("%Y-%m-%d")) .. "-" .. suffix - end - end - ''; - mappings = { - "n" = { - action.__raw = ''function() return vim.cmd("ObsidianNew") end''; - opts.desc = "New Note"; - opts.buffer = true; - }; - "q" = { - action.__raw = ''function() return vim.cmd("ObsidianQuickSwitch") end''; - opts.desc = "Quick Switch"; - opts.buffer = true; - }; - "b" = { - action.__raw = ''function() return vim.cmd("ObsidianBacklinks") end''; - opts.desc = "Backlinks"; - opts.buffer = true; - }; - "l" = { - action.__raw = ''function() return vim.cmd("ObsidianLink") end''; - opts.desc = "Link"; - opts.buffer = true; - }; - "e" = { - action.__raw = ''function() return vim.cmd("ObsidianExtractNote") end''; - opts.desc = "Extract Note"; - opts.buffer = true; - }; - "r" = { - action.__raw = ''function() return vim.cmd("ObsidianRename") end''; - opts.desc = "Rename"; - opts.buffer = true; - }; - "" = { - action.__raw = ''function() return require("obsidian").util.smart_action() end''; - opts.buffer = true; - opts.expr = true; - }; - "gf" = { - action.__raw = ''function() return require("obsidian").util.gf_passthrough() end''; - opts = { - noremap = false; - expr = true; - buffer = true; - }; - }; - }; - }; - }; - }; -} +# TODO: fix this plugin +# _: { +# home-manager.users.moritz.programs.nixvim = { +# plugins.obsidian = { +# enable = true; +# settings = { +# ui.enable = false; +# dir = "~/Documents/Nextcloud/Notes/zettelkasten/"; +# note_id_func.__raw = '' +# function(title) +# if title ~= nil then +# return title +# else +# suffix = "" +# for _ = 1, 4 do +# suffix = suffix .. string.char(math.random(65, 90)) +# end +# return tostring(os.date("%Y-%m-%d")) .. "-" .. suffix +# end +# end +# ''; +# mappings = { +# "n" = { +# action.__raw = ''function() return vim.cmd("ObsidianNew") end''; +# opts.desc = "New Note"; +# opts.buffer = true; +# }; +# "q" = { +# action.__raw = ''function() return vim.cmd("ObsidianQuickSwitch") end''; +# opts.desc = "Quick Switch"; +# opts.buffer = true; +# }; +# "b" = { +# action.__raw = ''function() return vim.cmd("ObsidianBacklinks") end''; +# opts.desc = "Backlinks"; +# opts.buffer = true; +# }; +# "l" = { +# action.__raw = ''function() return vim.cmd("ObsidianLink") end''; +# opts.desc = "Link"; +# opts.buffer = true; +# }; +# "e" = { +# action.__raw = ''function() return vim.cmd("ObsidianExtractNote") end''; +# opts.desc = "Extract Note"; +# opts.buffer = true; +# }; +# "r" = { +# action.__raw = ''function() return vim.cmd("ObsidianRename") end''; +# opts.desc = "Rename"; +# opts.buffer = true; +# }; +# "" = { +# action.__raw = ''function() return require("obsidian").util.smart_action() end''; +# opts.buffer = true; +# opts.expr = true; +# }; +# "gf" = { +# action.__raw = ''function() return require("obsidian").util.gf_passthrough() end''; +# opts = { +# noremap = false; +# expr = true; +# buffer = true; +# }; +# }; +# }; +# }; +# }; +# }; +# } +{} From 0752d7175eec2f880217291f7d41e23aa755efee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Jul 2025 19:07:29 +0200 Subject: [PATCH 8/8] feat: add elixir phoenix template --- flake.nix | 4 ++ templates/elixir-phoenix/flake.nix | 103 +++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 templates/elixir-phoenix/flake.nix diff --git a/flake.nix b/flake.nix index 8231b75..9574d9a 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,10 @@ description = "Crane + Fenix flake with mold for faster local builds."; path = ./templates/rust; }; + templates.elixir-phoenix = { + description = "A flake for building development environment of Phoenix project."; + path = ./templates/elixir-phoenix; + }; }; # Define your clan diff --git a/templates/elixir-phoenix/flake.nix b/templates/elixir-phoenix/flake.nix new file mode 100644 index 0000000..8cdbd1c --- /dev/null +++ b/templates/elixir-phoenix/flake.nix @@ -0,0 +1,103 @@ +{ + description = "A flake for building development environment of Phoenix project."; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/master"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { + nixpkgs, + flake-utils, + ... + }: + flake-utils.lib.eachDefaultSystem ( + system: let + pkgs = nixpkgs.legacyPackages.${system}; + erl = pkgs.beam.interpreters.erlang_27; + erlangPackages = pkgs.beam.packagesWith erl; + elixir = erlangPackages.elixir; + in { + packages = let + version = "0.1.0"; + src = ./.; + mixFodDeps = erlangPackages.fetchMixDeps { + inherit version src; + pname = "example"; + sha256 = ""; + }; + translatedPlatform = + pkgs.lib.getAttr + system + { + aarch64-darwin = "macos-arm64"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armv7"; + x86_64-darwin = "macos-x64"; + x86_64-linux = "linux-x64"; + }; + in rec { + default = erlangPackages.mixRelease { + inherit version src mixFodDeps; + pname = "example"; + + preInstall = '' + ln -s ${pkgs.tailwindcss}/bin/tailwindcss _build/tailwind-${translatedPlatform} + ln -s ${pkgs.esbuild}/bin/esbuild _build/esbuild-${translatedPlatform} + + ${elixir}/bin/mix assets.deploy + ${elixir}/bin/mix phx.gen.release + ''; + }; + dockerImage = pkgs.dockerTools.buildImage { + name = "example"; + config = { + Entrypoint = "${default}/bin/example"; + Cmd = "start"; + }; + }; + }; + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; + [ + erl + elixir + lexical + erlangPackages.elixir-ls + next-ls + ] + ++ lib.optionals stdenv.isLinux [ + # For ExUnit Notifier on Linux. + libnotify + + # For file_system on Linux. + inotify-tools + ] + ++ lib.optionals stdenv.isDarwin [ + # For ExUnit Notifier on macOS. + terminal-notifier + + # For file_system on macOS. + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + ]; + + shellHook = '' + # allows mix to work on the local directory + mkdir -p .nix/{mix,hex} + export MIX_HOME=$PWD/.nix/mix + export HEX_HOME=$PWD/.nix/hex + export ERL_LIBS=$HEX_HOME/lib/erlang/lib + + # concats PATH + export PATH=$MIX_HOME/bin:$PATH + export PATH=$MIX_HOME/escripts:$PATH + export PATH=$HEX_HOME/bin:$PATH + + # enables history for IEx + export ERL_AFLAGS="-kernel shell_history enabled -kernel shell_history_path '\"$PWD/.nix/erlang-history\"'" + ''; + }; + } + ); +}