From 5d40d3176830ecfae89106e6eb32366ddbda13dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 25 Jun 2025 11:31:31 +0200 Subject: [PATCH 1/2] chore: update inputs --- flake.lock | 330 +++++++++++++++---------- flake.nix | 2 +- machines/moritz-server/mail-server.nix | 1 + modules/moritz/profiles/desktop.nix | 4 +- modules/shared.nix | 3 +- 5 files changed, 210 insertions(+), 130 deletions(-) diff --git a/flake.lock b/flake.lock index 7c5ec08..616422c 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748362709, - "narHash": "sha256-jscXRZsI5o4BsiZuHN7sK9Ks3NHsmdoiWE5hy8sS6E0=", + "lastModified": 1748363529, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "MoritzBoehme", "repo": "base16-helix", - "rev": "b2867cbb1d3ede1629955e57f63c8ad2314a91b7", + "rev": "8d3f33566cc7cf5d77c8d58caab52bc8c24a9718", "type": "github" }, "original": { @@ -124,12 +124,14 @@ "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" @@ -139,11 +141,11 @@ ] }, "locked": { - "lastModified": 1747759997, - "narHash": "sha256-JlqsOmy/vRCFg2r7ZLbC2LrRpjSq7DrDbIt76hrhkgQ=", + "lastModified": 1750841178, + "narHash": "sha256-KAFvroXFgjaUSV8GKl8q/KUfAtcpLhfMF+CQhHIeMJ8=", "ref": "refs/heads/main", - "rev": "4eac7ad86d817087e7f30627b4a8ff2e9df45e04", - "revCount": 7106, + "rev": "3e030a5199b77ca24be31110c4564974cc25352a", + "revCount": 7801, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -187,11 +189,11 @@ ] }, "locked": { - "lastModified": 1747612895, - "narHash": "sha256-6niXZ5gTe456bq6udlP6QWe7MJgNybqCHqMzhkFf2gA=", - "rev": "54989ab33b3b5ff5e21e89ce11f0b72b3979ffd6", + "lastModified": 1750636936, + "narHash": "sha256-YrwZOt+0dMgMFUsGzIGJcKjyyb8r3VoyrhMIlmJq+IQ=", + "rev": "f072536dd857f5a8eefd4b5518e4f0919b42e9df", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/54989ab33b3b5ff5e21e89ce11f0b72b3979ffd6.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/f072536dd857f5a8eefd4b5518e4f0919b42e9df.tar.gz" }, "original": { "type": "tarball", @@ -206,11 +208,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1750680230, + "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01", "type": "github" }, "original": { @@ -269,11 +271,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -302,11 +304,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -339,6 +341,7 @@ "flake-utils": { "inputs": { "systems": [ + "clan-core", "systems" ] }, @@ -357,6 +360,26 @@ } }, "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" }, @@ -401,11 +424,11 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -460,11 +483,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1748359092, - "narHash": "sha256-bfQVlnTe1PZ3DfulcHUwJzh6qcir0n1F8B0xYUV+Vu0=", + "lastModified": 1750770554, + "narHash": "sha256-WokzB3u2Rfk2zXBEoSQo5gF0FHZFVth0BWr8PoE8KbU=", "owner": "helix-editor", "repo": "helix", - "rev": "2bd7452fe0309e273d06280d15caad6943034377", + "rev": "974ac9eaf3797661880006fedc10933cec8d2e86", "type": "github" }, "original": { @@ -482,11 +505,11 @@ ] }, "locked": { - "lastModified": 1747284884, - "narHash": "sha256-lTSKhRrassMcJ1ZsuUVunyl/F04vvCKY80HB/4rvvm4=", + "lastModified": 1748000383, + "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "7168f6002a6b48a9b6151e1e97e974a0722ecfdc", + "rev": "231726642197817d20310b9d39dd4afb9e899489", "type": "github" }, "original": { @@ -502,11 +525,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1750798083, + "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", "type": "github" }, "original": { @@ -531,6 +554,34 @@ } }, "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", @@ -544,16 +595,16 @@ ] }, "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.7", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -566,11 +617,11 @@ ] }, "locked": { - "lastModified": 1747466853, - "narHash": "sha256-/evYltwuF8Kz1odgocWnguh/8VQV1i76VB4yMTU9m7k=", + "lastModified": 1750403547, + "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0ba1a34fa6d995fe433109f0ad66de8d5613d46e", + "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", "type": "github" }, "original": { @@ -581,11 +632,11 @@ }, "master": { "locked": { - "lastModified": 1747762468, - "narHash": "sha256-I8l6r639PrDpEpAFgY64GmuQ+4NK+nxqAoSUnAEKw9E=", + "lastModified": 1750840667, + "narHash": "sha256-6k0vaFGB+zisVXcrhGTgXZu9TSgApU28K73Eck/rCp8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6bd7ba77ef6015853d67a89bd59f01b2880e9050", + "rev": "c31d8f739b34c30a20c25acc245651c75d111533", "type": "github" }, "original": { @@ -637,11 +688,11 @@ ] }, "locked": { - "lastModified": 1747699547, - "narHash": "sha256-hmYehhzkE04WGkqfJ6dTMdIz99LFQzoZ3maQD2GHb5U=", + "lastModified": 1750833445, + "narHash": "sha256-Kbx4eEirM4M9tdnlzBrFiroZ41XgJzOquFO0+8430rI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "bf7aeca255059203738909aa24fed3e675a2e749", + "rev": "bf72d8678a5d5aef73736ff0ee64f5800ca26bb7", "type": "github" }, "original": { @@ -653,11 +704,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1747676223, - "narHash": "sha256-WhwauKZwrMviNpPQs5FjAGS1cehMDEajOCw5W59K0HQ=", + "lastModified": 1750794136, + "narHash": "sha256-kihP/pMdpYn2DPNqlSa8UhuoOJzjhgbTgKJgde1JUdE=", "owner": "neovim", "repo": "neovim", - "rev": "2045e9700c7324cbd3772bc40b3b30b10cf65cc9", + "rev": "5ae41ddde35041e0601e94d1c6b348029c3b305b", "type": "github" }, "original": { @@ -678,11 +729,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747748806, - "narHash": "sha256-l9QFObh9tCuMGlPlUwuYFRCyhwYhK6Wx7H7zI1++H4k=", + "lastModified": 1750826500, + "narHash": "sha256-smZR1izUug1UXl7f7PxHFbU6PAacGHDOMKxmwSN05Dw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b8a51a59528c974de04b246cfb4b1bdf52cd2f91", + "rev": "999578e45337439013d38cededef32b1e5e38e6c", "type": "github" }, "original": { @@ -694,16 +745,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1740117926, - "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "lastModified": 1748151941, + "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", "owner": "YaLTeR", "repo": "niri", - "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.02", + "ref": "v25.05.1", "repo": "niri", "type": "github" } @@ -711,11 +762,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747635487, - "narHash": "sha256-za7ctGh4MaW1h5Drm1WtwNZxiXvQK9yXZAeeIyY9b2Q=", + "lastModified": 1750791124, + "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", "owner": "YaLTeR", "repo": "niri", - "rev": "3f2b7e63ba15cf33475116d32e8b7d22208a8438", + "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", "type": "github" }, "original": { @@ -732,11 +783,11 @@ ] }, "locked": { - "lastModified": 1747752313, - "narHash": "sha256-Z5OnPIZ3/ijo5xLCOpWoVbUE5JNnGxSHGhnJ3u9f2GE=", + "lastModified": 1750618568, + "narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "9ed53ae9abb5b125e453f37e475da5b8c368e676", + "rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5", "type": "github" }, "original": { @@ -774,11 +825,11 @@ ] }, "locked": { - "lastModified": 1747540584, - "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", + "lastModified": 1750565152, + "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", + "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", "type": "github" }, "original": { @@ -822,11 +873,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1743671943, - "narHash": "sha256-7sYig0+RcrR3sOL5M+2spbpFUHyEP7cnUvCaqFOBjyU=", + "lastModified": 1750412875, + "narHash": "sha256-uP9Xxw5XcFwjX9lNoYRpybOnIIe1BHfZu5vJnnPg3Jc=", "owner": "nix-community", "repo": "nixos-facter-modules", - "rev": "58ad9691670d293a15221d4a78818e0088d2e086", + "rev": "14df13c84552a7d1f33c1cd18336128fbc43f920", "type": "github" }, "original": { @@ -847,14 +898,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1747694655, - "narHash": "sha256-j8CjLoM2sEt9iTlV3FP0dgIEc8RNdLO/MQjuemvuLcA=", + "lastModified": 1750643298, + "narHash": "sha256-zotsGV6sQIpEu/UGpoq8Ga2VHWFwKB/yBY6fF43q8JM=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "dceb60ea7dce3eee2682e3c838405456c24fe72f", + "rev": "b9e28e23af46f4b5c4ca287ea8ce46e5b39e723c", "type": "gitlab" }, "original": { @@ -865,11 +916,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747696584, - "narHash": "sha256-TvJjbLlQ5aAHS3ZdP8mztNs28cMGWdT3J9g/6li3/4I=", + "lastModified": 1750731501, + "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "359c442b7d1f6229c1dc978116d32d6c07fe8440", + "rev": "69dfebb3d175bde602f612915c5576a41b18486b", "type": "github" }, "original": { @@ -879,29 +930,29 @@ "type": "github" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -912,16 +963,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1750622754, + "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -940,11 +991,11 @@ ] }, "locked": { - "lastModified": 1747743401, - "narHash": "sha256-AXk6mf9ySe44faNUGhD1mZud/kB7X+Nipzo2YxHet4s=", + "lastModified": 1750788551, + "narHash": "sha256-7tQIndetzeVtTuYQ7vYTaABUS1muiigdXK3XyXuPzvg=", "owner": "nix-community", "repo": "nixvim", - "rev": "47dba84e0d068a2b8c07faa0ec737ea98a226537", + "rev": "6a15c2ffc50ca7998df2fd6b86c3c9f298e9137a", "type": "github" }, "original": { @@ -966,11 +1017,11 @@ ] }, "locked": { - "lastModified": 1747756205, - "narHash": "sha256-bS0BPhwULgL/GSY39toDi125bktaIo4AalMfgA+bqIw=", + "lastModified": 1750838189, + "narHash": "sha256-zDA6vwUfkzTgJ+gWKANayOsLuXzHZwUNjY7p+33J02M=", "owner": "nix-community", "repo": "NUR", - "rev": "b5814fa35e56ce5f94997206d07db45a012e8881", + "rev": "9f6c15cf757a2e68e84d799d1b8926d13d5c370f", "type": "github" }, "original": { @@ -979,21 +1030,47 @@ "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_2", - "ixx": "ixx", + "flake-utils": "flake-utils_3", + "ixx": "ixx_2", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { @@ -1011,7 +1088,7 @@ "filetags": "filetags", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "helix": "helix", "home-manager": "home-manager", @@ -1080,11 +1157,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1750119275, + "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", "type": "github" }, "original": { @@ -1095,11 +1172,11 @@ }, "stable": { "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", + "lastModified": 1750622754, + "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", + "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "type": "github" }, "original": { @@ -1147,16 +1224,17 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747763404, - "narHash": "sha256-+1p3EekoosBc95rLErEEjaW5iDp16Pdk/GYTDl1+Jmk=", + "lastModified": 1750774546, + "narHash": "sha256-fLwoiW7goj6eqUhi6RRxsuGDwvQfjnq9G3OKdVsuSew=", "owner": "nix-community", "repo": "stylix", - "rev": "c7feebc34ab7374cadea1a5da7ee3393ee692d68", + "rev": "79e816c2e63df5024e28292fee0d92dc106ff66c", "type": "github" }, "original": { "owner": "nix-community", "repo": "stylix", + "rev": "79e816c2e63df5024e28292fee0d92dc106ff66c", "type": "github" } }, @@ -1263,11 +1341,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -1279,11 +1357,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { @@ -1315,11 +1393,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1749194973, + "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", "type": "github" }, "original": { @@ -1349,16 +1427,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "lastModified": 1748488455, + "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.5.1", + "ref": "v0.6", "repo": "xwayland-satellite", "type": "github" } @@ -1366,11 +1444,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1747111562, - "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=", + "lastModified": 1750821680, + "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72", + "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac", "type": "github" }, "original": { @@ -1382,11 +1460,11 @@ "zola-theme": { "flake": false, "locked": { - "lastModified": 1745542545, - "narHash": "sha256-hXNJaz/F5t1ZwbCq61eMxoA8MlKZM8ZXoyMJb27+5QI=", + "lastModified": 1749164920, + "narHash": "sha256-XwggfJBnk9bxOVe6EIeerjebsqDXpqeAJ8umq5GPbIg=", "owner": "Speyll", "repo": "anemone", - "rev": "b5ecf8e3063c9e57c2d83b90ffd67b5037bba395", + "rev": "0fa77c2eeccd096f6def3b540a9417a1b54fdd5f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cfa9694..8767a60 100644 --- a/flake.nix +++ b/flake.nix @@ -121,7 +121,7 @@ flake-compat.url = "github:edolstra/flake-compat"; niri.url = "github:sodiboo/niri-flake"; systems.url = "github:nix-systems/default"; - stylix.url = "github:nix-community/stylix"; + stylix.url = "github:nix-community/stylix/79e816c2e63df5024e28292fee0d92dc106ff66c"; # HACK: to fix upstream issue base16-helix.url = "github:MoritzBoehme/base16-helix/fix-primary-cursor-color"; base16-helix.flake = false; diff --git a/machines/moritz-server/mail-server.nix b/machines/moritz-server/mail-server.nix index 44e327b..b4db7a3 100644 --- a/machines/moritz-server/mail-server.nix +++ b/machines/moritz-server/mail-server.nix @@ -10,6 +10,7 @@ ]; mailserver = { enable = true; + stateVersion = 3; enableSubmission = false; enableSubmissionSsl = false; fqdn = "mail.moritz.place"; diff --git a/modules/moritz/profiles/desktop.nix b/modules/moritz/profiles/desktop.nix index 1cf258f..e6f5cfa 100644 --- a/modules/moritz/profiles/desktop.nix +++ b/modules/moritz/profiles/desktop.nix @@ -74,8 +74,8 @@ in { (inputs.filetags.packages.${pkgs.system}.default) keepassxc pavucontrol - stable.libreoffice # NOTE breaks often - stable.signal-desktop # NOTE breaks often + stable.libreoffice # NOTE: breaks often + signal-desktop vlc ]; diff --git a/modules/shared.nix b/modules/shared.nix index a91f462..92721ea 100644 --- a/modules/shared.nix +++ b/modules/shared.nix @@ -3,9 +3,10 @@ clan-core.clanModules.sshd clan-core.clanModules.state-version clan-core.clanModules.static-hosts - clan-core.clanModules.machine-id ]; + clan.core.settings.machine-id.enable = true; + networking.hosts."fd77:acc0:1d56:2265:499:9367:28e0:97d3" = ["moritz-remarkable"]; # Locale service discovery and mDNS From 365196caf6d185c0c7e7a237e9f70b195e15c52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 25 Jun 2025 13:54:17 +0200 Subject: [PATCH 2/2] feat: add beets --- machines/moritz-server/configuration.nix | 20 +++++++++++++++++++- machines/moritz-server/navidrome.nix | 24 +++++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/machines/moritz-server/configuration.nix b/machines/moritz-server/configuration.nix index f7e7752..f587a99 100644 --- a/machines/moritz-server/configuration.nix +++ b/machines/moritz-server/configuration.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { imports = [ ../../modules/zfs_unencrypted.nix ../../modules/shared.nix @@ -8,6 +12,7 @@ ./mail-server.nix ./website/root ./navidrome.nix + inputs.home-manager.nixosModules.default ]; time.timeZone = "Europe/Berlin"; @@ -33,6 +38,19 @@ }; }; + home-manager = { + users.moritz = { + programs.home-manager.enable = true; + home = { + username = "moritz"; + homeDirectory = "/home/moritz"; + stateVersion = "25.05"; + }; + }; + useGlobalPkgs = true; + useUserPackages = true; + }; + # You can get your disk id by running the following command on the installer: # Replace with the IP of the installer printed on the screen or by running the `ip addr` command. # ssh root@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT diff --git a/machines/moritz-server/navidrome.nix b/machines/moritz-server/navidrome.nix index d03fb98..5b52614 100644 --- a/machines/moritz-server/navidrome.nix +++ b/machines/moritz-server/navidrome.nix @@ -22,9 +22,31 @@ }; }; + home-manager.users.moritz.programs.beets = { + enable = true; + settings = { + directory = config.services.navidrome.settings.MusicFolder; + library = "/mnt/music/beet/musiclibrary.db"; + plugins = [ + "autobpm" + "mbsync" + "badfiles" + "chroma" + "duplicates" + "lyrics" + "replaygain" + ]; + musicbrainz.genres = true; + lyrics.synced = true; + }; + }; + services.borgbackup.jobs = { music = { - paths = config.services.navidrome.settings.MusicFolder; + paths = [ + config.services.navidrome.settings.MusicFolder + config.home-manager.users.moritz.programs.beets.settings.library + ]; repo = "u461386-sub1@u461386.your-storagebox.de:music"; doInit = true; encryption = {