diff --git a/flake.lock b/flake.lock index e9a545d..80d814f 100644 --- a/flake.lock +++ b/flake.lock @@ -12,7 +12,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1761656077, @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1767967164, - "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=", + "lastModified": 1771587924, + "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=", "owner": "catppuccin", "repo": "nix", - "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7", + "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1768881817, - "narHash": "sha256-yEG418W8a7C/bcmRI5Lgd03XbBc8K2yV0kp1WUHTYbA=", + "lastModified": 1771918157, + "narHash": "sha256-MU/9oxyXCRKyAskjSgku8P7r0XpQiE50tvDKkNDveJg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "bbd2046d41083954fd28c31cb4f2d3510c9e2b1e", + "rev": "921c0db962c553e972d59c3563d29fd575437f03", "type": "gitlab" }, "original": { @@ -326,6 +326,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -334,11 +350,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -364,7 +380,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_13" + "systems": "systems_11" }, "locked": { "lastModified": 1731533236, @@ -385,11 +401,11 @@ "systems": "systems_14" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -403,11 +419,11 @@ "systems": "systems_15" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -456,6 +472,24 @@ "inputs": { "systems": "systems_18" }, + "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_16": { + "inputs": { + "systems": "systems_19" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -639,11 +673,11 @@ ] }, "locked": { - "lastModified": 1768836546, - "narHash": "sha256-nJZkTamcXXMW+SMYiGFB6lB8l0aJw0xjssfN8xYd/Fs=", + "lastModified": 1771851181, + "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b56c5ad14fcf8b5bc887463552483bf000ca562a", + "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", "type": "github" }, "original": { @@ -660,11 +694,11 @@ ] }, "locked": { - "lastModified": 1768512489, - "narHash": "sha256-jZi945d3e6DYhrw3K5Pew+QaL3qSgq3O6xiVaEVLgXs=", + "lastModified": 1771851181, + "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "bba859cd85b90dd9e4e6fd44b2af4aa64ae801a1", + "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", "type": "github" }, "original": { @@ -739,11 +773,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1768781827, - "narHash": "sha256-IbWOHI/IlGC43Mg7AZUu6jCHjIEzFIPAoSlFDJG43A4=", + "lastModified": 1771879754, + "narHash": "sha256-X0DpLExFW+/0o+cNCnIJuQZUZGRuBC0Tr9QsbNVXQ1U=", "owner": "martinvonz", "repo": "jj", - "rev": "de8531b018a08fd1e2ee67b5c8848146c62be5f4", + "rev": "f89aebceb3a327e33c5ac732b7af548d32ba8199", "type": "github" }, "original": { @@ -795,16 +829,16 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1768585282, - "narHash": "sha256-JTH+wQTt8pyS5iPb7+r/70pYfLgi/OFTzimcRmMcs2g=", + "lastModified": 1770927856, + "narHash": "sha256-2jcqAU8QutF8AE15LYwd8cy7KjayGxUGHxvWnqAiS5M=", "owner": "InioX", "repo": "matugen", - "rev": "5905cae968e02d3c1d23ee556e9a0719e5231227", + "rev": "e65259d68edc034905da477b6c1a349e89e2aa8d", "type": "github" }, "original": { "owner": "InioX", - "ref": "main", + "ref": "v4.0.0", "repo": "matugen", "type": "github" } @@ -817,11 +851,11 @@ "nixpkgs-mozilla": "nixpkgs-mozilla" }, "locked": { - "lastModified": 1768926700, - "narHash": "sha256-/bANzWLzVAzdRDXua/p9wIDS/RGIHSBHqyduXoCd+P8=", + "lastModified": 1770456722, + "narHash": "sha256-2zjh754j9iCkhJiYIQgQhwkaDiXo+K8AfGCayJoQLDI=", "ref": "refs/heads/main", - "rev": "7c883e02e2a77061bfa048d249df0d39b362a5cf", - "revCount": 72, + "rev": "204bf6ed1f899f788c025c7dfc79ce82d3e32002", + "revCount": 74, "type": "git", "url": "ssh://forgejo@git.donsz.nl/jana/money.is.fckn.gay.git" }, @@ -880,11 +914,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768767453, - "narHash": "sha256-Omq1UHEJ1oxkTo2j8l6qQtmyPR7Uj+k7HC5Khd3jVVA=", + "lastModified": 1771917018, + "narHash": "sha256-igOZoXdb9wDhBtADaa8AfANZRgKzhW2lIq0mtqLVT0U=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8eab7c21ef4edc97cc56ddb8e76a842e0818d6d7", + "rev": "1f65cd89e65431c64b492e505033c4b48c94b20e", "type": "github" }, "original": { @@ -916,11 +950,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1768678265, - "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", + "lastModified": 1771849386, + "narHash": "sha256-CFvjBjS2LxbBMR3Lu6wZhME6ck3CXyKUufRoJA5tlmw=", "owner": "YaLTeR", "repo": "niri", - "rev": "d7184a04b904e07113f4623610775ae78d32394c", + "rev": "2dc6f4482c4eeed75ea8b133d89cad8658d38429", "type": "github" }, "original": { @@ -958,11 +992,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1771734689, + "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "8f590b832326ab9699444f3a48240595954a4b10", "type": "github" }, "original": { @@ -993,13 +1027,36 @@ "type": "github" } }, + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_10", + "nixpkgs": [ + "p1n3appl3", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769912969, + "narHash": "sha256-RtH34gy6R12oXcmBlUWXygdNeC+KuX3beEsLBXV44Qs=", + "owner": "Yeshey", + "repo": "nix-minecraft", + "rev": "7e3a114dd267e9303d092e29af67ca30c1db86ca", + "type": "github" + }, + "original": { + "owner": "Yeshey", + "repo": "nix-minecraft", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1768499669, - "narHash": "sha256-jJr/zDxu5evfQxlXtMrFFF68/RNj1UrctS/eIsay4k0=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7297dfc69ae9b06e984a6f69900ce25e67c76f46", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -1074,11 +1131,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1768621446, - "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", + "lastModified": 1771714954, + "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", + "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620", "type": "github" }, "original": { @@ -1090,16 +1147,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "lastModified": 1771714954, + "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -1122,11 +1179,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1771067046, - "narHash": "sha256-fYZMOngn9UX4dyhKcMEqqLjjw3x8T3v3hlYnnbEZh2E=", + "lastModified": 1771932323, + "narHash": "sha256-3PadsTzuMJT/x0KmiD/Me1GG6rW8kaHoWVduSs0ue7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75c4807ebe5f9cad5622862f4f26ca73c069be06", + "rev": "89bb5c5da7a857869cc88ef9b856bffdff8af264", "type": "github" }, "original": { @@ -1137,11 +1194,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -1185,11 +1242,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -1231,11 +1288,11 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1769248673, - "narHash": "sha256-oyxrDiV2yFToXpzwiJUYkxCjFHvL21tMQ2BpQMyMDTw=", + "lastModified": 1771931193, + "narHash": "sha256-IRPLf3y0HxdLirCVYoOYXQyoUBIM8llw7/96OHvyQoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0301d62ba146fee37e79fbc4b6323af52a2834e", + "rev": "12e7188b8c774804377e7b82f45fa95ee87836cb", "type": "github" }, "original": { @@ -1247,11 +1304,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1768569498, - "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", + "lastModified": 1771207753, + "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", + "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", "type": "github" }, "original": { @@ -1405,11 +1462,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -1428,11 +1485,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1768795384, - "narHash": "sha256-gZIXLzhupxAwRMMRTFgrl669ciYiiPmnA3PwocJ+6jQ=", + "lastModified": 1771135771, + "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=", "owner": "nix-community", "repo": "nixvim", - "rev": "57d393deb53af1b28b14973d3e3885c3d17e7bbe", + "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba", "type": "github" }, "original": { @@ -1448,11 +1505,11 @@ ] }, "locked": { - "lastModified": 1768845494, - "narHash": "sha256-PKlKrQMhk+ygsVPny9iOcttZRic870ZbFLTpZEz3MUg=", + "lastModified": 1771872869, + "narHash": "sha256-evn+p0+T9yNtjdRr5UnYwXnhlHgFB8ilzhGQoYvgXhs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "77aaf6923d19ec824ea142ce02018bfe9a967da4", + "rev": "90e44d6edd604a0877310b01ff20006abcf67e77", "type": "github" }, "original": { @@ -1489,6 +1546,7 @@ "flake-utils": "flake-utils_9", "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", + "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_12", "nixpkgs-stable": "nixpkgs-stable_2", @@ -1500,11 +1558,11 @@ "slippi": "slippi" }, "locked": { - "lastModified": 1768515258, - "narHash": "sha256-MBDxLHOIIminP+BPP74UQ3WBDnkbFguoW6MV6WXaepE=", + "lastModified": 1771898420, + "narHash": "sha256-8EhIWQZRL55RpAgydge71fk+frXroDdWX1Smt5E0MBI=", "owner": "p1n3appl3", "repo": "config", - "rev": "e6de5bc3c0a67c2a0ed51231df0cd9e0adcfac60", + "rev": "cf988820ffaaa44d0f8607f2417f9527d142b52c", "type": "github" }, "original": { @@ -1515,7 +1573,7 @@ }, "pipethon": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_11", "nixpkgs": "nixpkgs_13" }, "locked": { @@ -1595,7 +1653,7 @@ "inputs": { "agenix": "agenix_2", "darwin": "darwin_2", - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_12", "home-manager": "home-manager_3", "impermanence": "impermanence", "nix-index-database": "nix-index-database_2", @@ -1619,7 +1677,7 @@ }, "raw-data": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_13", "nixpkgs": "nixpkgs_15" }, "locked": { @@ -1638,7 +1696,7 @@ }, "reviewqueue": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "naersk": "naersk_2", "nixpkgs": "nixpkgs_17", "nixpkgs-mozilla": "nixpkgs-mozilla_2" @@ -1732,11 +1790,11 @@ ] }, "locked": { - "lastModified": 1762915112, - "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", + "lastModified": 1769482338, + "narHash": "sha256-SVwjMqR981PEdEdRvYj5Mefnd61GLinWmIr7GMu7LW8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", + "rev": "dc9c76a75a6d382613cdcb1a3f95640e9cedcdea", "type": "github" }, "original": { @@ -1817,7 +1875,7 @@ }, "secrets": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_15", "nixpkgs": "nixpkgs_18" }, "locked": { @@ -1849,11 +1907,11 @@ ] }, "locked": { - "lastModified": 1760294822, - "narHash": "sha256-VSzDcCkS/kGrALPv81x5yjqjt5o7n4lVjE/gknlz+1w=", + "lastModified": 1768682904, + "narHash": "sha256-d4VEGrKHx9EisLHdGDN15w1PsuS5ZImvewwucTM3rUo=", "owner": "lytedev", "repo": "slippi-nix", - "rev": "abee78f6ad931c2a2f18dae102f51abcaf1a26c6", + "rev": "1f309afd4be00afedf34add3645ba2c1b97bdb40", "type": "github" }, "original": { @@ -1867,11 +1925,11 @@ "nixpkgs": "nixpkgs_19" }, "locked": { - "lastModified": 1768709255, - "narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=", + "lastModified": 1771889317, + "narHash": "sha256-YV17Q5lEU0S9ppw08Y+cs4eEQJBuc79AzblFoHORLMU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9", + "rev": "b027513c32e5b39b59f64626b87fbe168ae02094", "type": "github" }, "original": { @@ -2046,6 +2104,21 @@ "type": "github" } }, + "systems_19": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2168,7 +2241,7 @@ }, "t": { "inputs": { - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_16", "nixpkgs": "nixpkgs_20" }, "locked": { @@ -2205,7 +2278,7 @@ }, "utils": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -2256,11 +2329,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1768765571, - "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=", + "lastModified": 1771787042, + "narHash": "sha256-7bM6Y4KldhKnfopSALF8XALxcX7ehkomXH9sPl4MXp0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69", + "rev": "33c344fee50504089a447a8fef5878cf4f6215fc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0d7fbe1..025fd47 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,7 @@ inputs.niri-unstable.follows = "niri-unstable"; }; matugen = { - url = "github:/InioX/matugen/main"; + url = "github:/InioX/matugen/v4.0.0"; inputs.nixpkgs.follows = "nixpkgs"; }; noctalia = { diff --git a/hosts/fili/services/immich.nix b/hosts/fili/services/immich.nix index 00553d1..304feb7 100644 --- a/hosts/fili/services/immich.nix +++ b/hosts/fili/services/immich.nix @@ -68,10 +68,21 @@ settings = { server.externalDomain = "https://photos.donsz.nl"; - logging.level = "verbose"; + logging.level = "log"; passwordLogin.enabled = false; + storageTemplate = { + enabled = true; + # year / album name or "Other" / y m d / filename + template = "{{y}}/{{#if album}}{{album}}{{else}}Other{{/if}}/{{y}}-{{MM}}-{{dd}}/{{filename}}"; + hashVerificationEnabled = true; + }; + + reverseGeocoding = { + enabled = true; + }; + oauth = { enabled = true; @@ -84,10 +95,7 @@ roleClaim = "immich_role"; scope = "openid email profile groups"; tokenEndpointAuthMethod = "client_secret_post"; - # storageLabelClaim: "", - # "mobileOverrideEnabled": false, - # "mobileRedirectUri": "", - + storageLabelClaim = "preferred_username"; }; }; mediaLocation = "/storage/storage/media-server/photos"; diff --git a/hosts/kili/configuration.nix b/hosts/kili/configuration.nix index 07b9cdc..89ec9e7 100644 --- a/hosts/kili/configuration.nix +++ b/hosts/kili/configuration.nix @@ -61,6 +61,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + gcc firefox kitty @@ -87,6 +88,9 @@ ''; } ) { }) + + config.boot.kernelPackages.perf + rr ]; services.xserver.enable = true; diff --git a/programs/default.nix b/programs/default.nix index 9d21ca5..f7b039d 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -21,7 +21,7 @@ _: { spotify obsidian element-desktop - chromium + # chromium bind.dnsutils mpv vlc diff --git a/programs/niri/default.nix b/programs/niri/default.nix index b99944f..e3c2b5a 100644 --- a/programs/niri/default.nix +++ b/programs/niri/default.nix @@ -45,6 +45,7 @@ _: { playerctl # brightness control brightnessctl + pavucontrol fira jetbrains-mono @@ -112,6 +113,13 @@ _: { click-method = "clickfinger"; natural-scroll = false; }; + + focus-follows-mouse = { + enable = true; + max-scroll-amount = "0%"; + }; + + workspace-auto-back-and-forth = true; }; debug = { @@ -123,10 +131,10 @@ _: { size = 10; }; - gestures.hot-corners.enable = false; + gestures.hot-corners.enable = true; layout = { - gaps = 5; + gaps = 8; center-focused-column = "never"; always-center-single-column = true; @@ -152,29 +160,29 @@ _: { focus-ring = { width = 1; - active.color = "#${config.programs.matugen.theme.colors.primary.default}"; - inactive.color = "#${config.programs.matugen.theme.colors.surface.default}"; - urgent.color = "#${config.programs.matugen.theme.colors.error.default}"; + active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; + inactive.color = "${config.programs.matugen.theme.colors.surface.default.color}"; + urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; }; border = { - active.color = "#${config.programs.matugen.theme.colors.primary.default}"; - inactive.color = "#${config.programs.matugen.theme.colors.surface.default}"; - urgent.color = "#${config.programs.matugen.theme.colors.error.default}"; + active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; + inactive.color = "${config.programs.matugen.theme.colors.surface.default.color}"; + urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; }; shadow = { - color = "#${config.programs.matugen.theme.colors.shadow.default}70"; + color = "${config.programs.matugen.theme.colors.shadow.default.color}70"; }; tab-indicator = { - active.color = "#${config.programs.matugen.theme.colors.primary.default}"; - inactive.color = "#${config.programs.matugen.theme.colors.primary_container.default}"; - urgent.color = "#${config.programs.matugen.theme.colors.error.default}"; + active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; + inactive.color = "${config.programs.matugen.theme.colors.primary_container.default.color}"; + urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; }; insert-hint = { - display.color = "#${config.programs.matugen.theme.colors.primary.default}80"; + display.color = "${config.programs.matugen.theme.colors.primary.default.color}80"; }; }; @@ -194,11 +202,26 @@ _: { window-rules = [ { - matches = [ { title = "Extension: (Bitwarden Password Manager).*"; } ]; + matches = [ + { + + app-id = "firefox$"; + title = "Extension: (Bitwarden Password Manager)"; + } + ]; open-floating = true; open-focused = true; block-out-from = "screen-capture"; } + { + matches = [ + { + app-id = "firefox$"; + title = "^Picture-in-Picture$"; + } + ]; + open-floating = true; + } { matches = [ { app-id = "firefox"; } ]; @@ -215,6 +238,7 @@ _: { app-id = "steam"; title = "Steam Settings"; } + { app-id = "pavucontrol"; } ]; open-floating = true; } @@ -289,11 +313,11 @@ _: { "XF86AudioRaiseVolume" = { allow-when-locked = true; - action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+"; + action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+"; }; "XF86AudioLowerVolume" = { allow-when-locked = true; - action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; + action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-"; }; "XF86AudioMute" = { allow-when-locked = true; @@ -321,15 +345,15 @@ _: { }; "Mod+Period" = { allow-when-locked = true; - action.spawn-sh = "playerctl previous"; + action.spawn-sh = "playerctl nest"; }; "Mod+Comma" = { allow-when-locked = true; - action.spawn-sh = "playerctl next"; + action.spawn-sh = "playerctl previous"; }; "Mod+Slash" = { allow-when-locked = true; - action.spawn-sh = "playerctl next"; + action.spawn-sh = "playerctl play-pause"; }; # TODO @@ -532,9 +556,6 @@ _: { { id = "plugin:catwalk"; } - { - id = "plugin:brightness"; - } ]; center = [ { @@ -554,6 +575,12 @@ _: { { id = "Bluetooth"; } + { + id = "Brightness"; + } + { + id = "Volume"; + } ] ++ [ { id = "Battery"; } ] ++ [ @@ -613,7 +640,7 @@ _: { # appearance "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; - enable-hot-corners = false; + enable-hot-corners = true; gtk-enable-primary-paste = false; }; }; diff --git a/programs/zed/default.nix b/programs/zed/default.nix index 051c56d..f028d5a 100644 --- a/programs/zed/default.nix +++ b/programs/zed/default.nix @@ -125,6 +125,9 @@ _: { refreshSupport = true; }; }; + binary = { + path_lookup = true; + }; }; nil = { binary = { diff --git a/users/default.nix b/users/default.nix index e22a5f8..8b87d45 100644 --- a/users/default.nix +++ b/users/default.nix @@ -19,6 +19,16 @@ ]; }; + mara = { + shell = pkgs.zsh; + keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAzf3UCwTWJlF878EWqlrLUOBsxw/b/6PoLjbKkA8Xh" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHi5YnRt1VgK8tt6oSPsKo1X+0gcBXVyvCKXM03/vEh" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFWF1MtDV5HJT+GhD8wrKICyDwQK8ZPQTxZdnsfaqWcs" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHi1EEGRry1aD6uPmdlcRqdiTiIty0JlnfoXeM0qKBC" + ]; + }; + jana = { shell = pkgs.fish; keys = [