diff --git a/flake.lock b/flake.lock index 99efa8a..f83ea24 100644 --- a/flake.lock +++ b/flake.lock @@ -12,7 +12,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_16" + "systems": "systems_14" }, "locked": { "lastModified": 1761656077, @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1774616169, - "narHash": "sha256-fP4bU3SOH5sefSl6EagqULFs+bXoo3h3VLQCCyJplo4=", + "lastModified": 1771587924, + "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=", "owner": "catppuccin", "repo": "nix", - "rev": "e616c61cd9f7b05b32af266bc005fa266860dacf", + "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3", "type": "github" }, "original": { @@ -278,11 +278,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1775707386, - "narHash": "sha256-1tNzciseW4+JQTSUxCVz1UhW//LuosLb9f3liFOhrL8=", + "lastModified": 1771918157, + "narHash": "sha256-MU/9oxyXCRKyAskjSgku8P7r0XpQiE50tvDKkNDveJg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c1db0626fa993fe4e773d4c83df4cbb9684e434f", + "rev": "921c0db962c553e972d59c3563d29fd575437f03", "type": "gitlab" }, "original": { @@ -381,7 +381,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_17" + "systems": "systems_15" }, "locked": { "lastModified": 1731533236, @@ -399,25 +399,7 @@ }, "flake-utils_11": { "inputs": { - "systems": "systems_18" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { - "inputs": { - "systems": "systems_19" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -433,9 +415,27 @@ "type": "github" } }, + "flake-utils_12": { + "inputs": { + "systems": "systems_17" + }, + "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_13": { "inputs": { - "systems": "systems_20" + "systems": "systems_18" }, "locked": { "lastModified": 1731533236, @@ -453,7 +453,7 @@ }, "flake-utils_14": { "inputs": { - "systems": "systems_21" + "systems": "systems_19" }, "locked": { "lastModified": 1731533236, @@ -471,25 +471,7 @@ }, "flake-utils_15": { "inputs": { - "systems": "systems_22" - }, - "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_23" + "systems": "systems_20" }, "locked": { "lastModified": 1710146030, @@ -546,11 +528,11 @@ "systems": "systems_5" }, "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": { @@ -581,24 +563,6 @@ "inputs": { "systems": "systems_7" }, - "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_7": { - "inputs": { - "systems": "systems_8" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -613,9 +577,27 @@ "type": "github" } }, + "flake-utils_7": { + "inputs": { + "systems": "systems_9" + }, + "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_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1731533236, @@ -633,7 +615,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -674,11 +656,11 @@ ] }, "locked": { - "lastModified": 1775762219, - "narHash": "sha256-e7BhggoWhg3Ok7dDI5kY1XZzORBQc0Rclcs3IWzux3w=", + "lastModified": 1771851181, + "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c975a66a56306b38eaa3108f54bbc11e213f42f6", + "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", "type": "github" }, "original": { @@ -695,11 +677,11 @@ ] }, "locked": { - "lastModified": 1774647770, - "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=", + "lastModified": 1771851181, + "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "02371c05a04a2876cf92e2d67a259e8f87399068", + "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", "type": "github" }, "original": { @@ -736,11 +718,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1777713116, - "narHash": "sha256-XpjszOlSIN85uSR4Ch0byPLFLGpwKgJTsKHBQzRadBc=", + "lastModified": 1774683773, + "narHash": "sha256-4GyL+ZtAZEKX9FwSvNrOGSUJ9eaHE0Pdy3N3C9Xjlu8=", "owner": "jdonszelmann", "repo": "homepage", - "rev": "f685b368dbf8c46570ad959fb4ad21cd686f0e2a", + "rev": "9755ae38ec713888bc18b64227116031cd71e0af", "type": "github" }, "original": { @@ -765,39 +747,20 @@ "type": "github" } }, - "isadle": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1775411699, - "narHash": "sha256-eUyn9ejgMYx4FmoRcs+Feqx6a4I+yQrmXTet3dUkmMY=", - "ref": "refs/heads/main", - "rev": "b461faf5d9c545f696386ac05b4a27d59fb54ccf", - "revCount": 1, - "type": "git", - "url": "ssh://forgejo@git.donsz.nl/jana/isadle.git" - }, - "original": { - "type": "git", - "url": "ssh://forgejo@git.donsz.nl/jana/isadle.git" - } - }, "jujutsu": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1775736212, - "narHash": "sha256-c0GcnFJhnTV0id7/Jrf3AclL55AFMjl/4rsz/Q8h954=", + "lastModified": 1771879754, + "narHash": "sha256-X0DpLExFW+/0o+cNCnIJuQZUZGRuBC0Tr9QsbNVXQ1U=", "owner": "martinvonz", "repo": "jj", - "rev": "3eea1ed0914d3aa65d4ab1b27860452e7d395df1", + "rev": "f89aebceb3a327e33c5ac732b7af548d32ba8199", "type": "github" }, "original": { @@ -824,8 +787,8 @@ }, "mapf": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1757529600, @@ -846,7 +809,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1770927856, @@ -865,9 +828,9 @@ }, "mifg": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "naersk": "naersk", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-mozilla": "nixpkgs-mozilla" }, "locked": { @@ -887,7 +850,7 @@ "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1763384566, @@ -906,7 +869,7 @@ "naersk_2": { "inputs": { "fenix": "fenix_2", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1752689277, @@ -928,17 +891,17 @@ "niri-unstable": [ "niri-unstable" ], - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775710668, - "narHash": "sha256-pi2TWoWZR22vzr5RBAgIdl1LDwgLX+fh+Hqngt/Kkt8=", + "lastModified": 1771917018, + "narHash": "sha256-igOZoXdb9wDhBtADaa8AfANZRgKzhW2lIq0mtqLVT0U=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bef414577a6a745543989716df478afec96486bd", + "rev": "1f65cd89e65431c64b492e505033c4b48c94b20e", "type": "github" }, "original": { @@ -966,15 +929,15 @@ }, "niri-unstable": { "inputs": { - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1775561155, - "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=", + "lastModified": 1771849386, + "narHash": "sha256-CFvjBjS2LxbBMR3Lu6wZhME6ck3CXyKUufRoJA5tlmw=", "owner": "YaLTeR", "repo": "niri", - "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1", + "rev": "2dc6f4482c4eeed75ea8b133d89cad8658d38429", "type": "github" }, "original": { @@ -991,11 +954,11 @@ ] }, "locked": { - "lastModified": 1774156144, - "narHash": "sha256-gdYe9wTPl4ignDyXUl1LlICWj41+S0GB5lG1fKP17+A=", + "lastModified": 1771734689, + "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "55b588747fa3d7fc351a11831c4b874dab992862", + "rev": "8f590b832326ab9699444f3a48240595954a4b10", "type": "github" }, "original": { @@ -1029,34 +992,33 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_9", "nixpkgs": [ "p1n3appl3", "nixpkgs" - ], - "systems": "systems_14" + ] }, "locked": { - "lastModified": 1774547566, - "narHash": "sha256-0vpd60stH9nhNC6AkArVxqIKF7bpPDxKmpQHNoLyGas=", - "owner": "p1n3appl3", + "lastModified": 1769912969, + "narHash": "sha256-RtH34gy6R12oXcmBlUWXygdNeC+KuX3beEsLBXV44Qs=", + "owner": "Yeshey", "repo": "nix-minecraft", - "rev": "4439800733784533831604b0663eff1f081a9643", + "rev": "7e3a114dd267e9303d092e29af67ca30c1db86ca", "type": "github" }, "original": { - "owner": "p1n3appl3", - "ref": "lazymc", + "owner": "Yeshey", "repo": "nix-minecraft", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1774567711, - "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -1131,11 +1093,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1775595990, - "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", + "lastModified": 1771714954, + "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2", + "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620", "type": "github" }, "original": { @@ -1147,11 +1109,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1774388614, - "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", + "lastModified": 1771714954, + "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", + "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620", "type": "github" }, "original": { @@ -1178,22 +1140,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1757967192, "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", @@ -1209,13 +1155,13 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { - "lastModified": 1775761142, - "narHash": "sha256-sBq8nsDsj1/i2rKsd2Gg2cgTv/J+5uk4wxCtxaCsGiA=", + "lastModified": 1771932323, + "narHash": "sha256-3PadsTzuMJT/x0KmiD/Me1GG6rW8kaHoWVduSs0ue7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96e87bd250d5f4f3447b87ab7e94689ea19e0c2a", + "rev": "89bb5c5da7a857869cc88ef9b856bffdff8af264", "type": "github" }, "original": { @@ -1224,13 +1170,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -1240,7 +1186,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1767379071, "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", @@ -1256,23 +1202,7 @@ "type": "github" } }, - "nixpkgs_15": { - "locked": { - "lastModified": 1692414505, - "narHash": "sha256-sSTuyR9JYSxmUcYcj0Jvw1hIq1tz/Canw9mK0hEJvnE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4cdad15f34e6321a2f789b99d42815b9142ac2ba", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_16": { + "nixpkgs_14": { "locked": { "lastModified": 1722062969, "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", @@ -1288,7 +1218,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_15": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -1304,7 +1234,7 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_16": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -1320,7 +1250,7 @@ "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_17": { "locked": { "lastModified": 1755020227, "narHash": "sha256-gGmm+h0t6rY88RPTaIm3su95QvQIVjAJx558YUG4Id8=", @@ -1334,6 +1264,38 @@ "type": "indirect" } }, + "nixpkgs_18": { + "locked": { + "lastModified": 1771931193, + "narHash": "sha256-IRPLf3y0HxdLirCVYoOYXQyoUBIM8llw7/96OHvyQoM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "12e7188b8c774804377e7b82f45fa95ee87836cb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { + "locked": { + "lastModified": 1771207753, + "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1743014863, @@ -1351,38 +1313,6 @@ } }, "nixpkgs_20": { - "locked": { - "lastModified": 1777660448, - "narHash": "sha256-zc8nX/kHG7BsrJtjKE4Mlxy10w2bEAbQrIAuOtBW3po=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4c42eb674941ccab1f84a5eac73f175457d998b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_21": { - "locked": { - "lastModified": 1775126147, - "narHash": "sha256-J0dZU4atgcfo4QvM9D92uQ0Oe1eLTxBVXjJzdEMQpD0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8d8c1fa5b412c223ffa47410867813290cdedfef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_22": { "locked": { "lastModified": 1710377395, "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", @@ -1396,7 +1326,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_21": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -1412,7 +1342,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_22": { "locked": { "lastModified": 1745930157, "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", @@ -1462,11 +1392,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -1477,22 +1407,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1721379653, "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", @@ -1508,7 +1422,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -1524,7 +1438,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1766070988, "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", @@ -1540,20 +1454,36 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], - "systems": "systems_11" + "systems": "systems_10" }, "locked": { - "lastModified": 1775307257, - "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=", + "lastModified": 1771135771, + "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=", "owner": "nix-community", "repo": "nixvim", - "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff", + "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba", "type": "github" }, "original": { @@ -1566,15 +1496,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "noctalia-qs": "noctalia-qs" + ] }, "locked": { - "lastModified": 1775689927, - "narHash": "sha256-UVL4JnAHXs90AiKfhjXBQ83KhiXHAyZ4TdaPkA/ts/g=", + "lastModified": 1771872869, + "narHash": "sha256-evn+p0+T9yNtjdRr5UnYwXnhlHgFB8ilzhGQoYvgXhs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "0fcaa49875bf0c994bb5c604320454ef72e6ba8b", + "rev": "90e44d6edd604a0877310b01ff20006abcf67e77", "type": "github" }, "original": { @@ -1583,29 +1512,6 @@ "type": "github" } }, - "noctalia-qs": { - "inputs": { - "nixpkgs": [ - "noctalia", - "nixpkgs" - ], - "systems": "systems_12", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1775491791, - "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "type": "github" - } - }, "obs-gamepad": { "inputs": { "nixpkgs": [ @@ -1631,12 +1537,12 @@ "p1n3appl3": { "inputs": { "catppuccin": "catppuccin", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "nixpkgs-stable": "nixpkgs-stable_2", "obs-gamepad": "obs-gamepad", "ragenix": "ragenix", @@ -1646,11 +1552,11 @@ "slippi": "slippi" }, "locked": { - "lastModified": 1774657004, - "narHash": "sha256-oDghflofxhE3L+Q9EGfmp9tEh44CRtcteCEfa5DDdJg=", + "lastModified": 1771898420, + "narHash": "sha256-8EhIWQZRL55RpAgydge71fk+frXroDdWX1Smt5E0MBI=", "owner": "p1n3appl3", "repo": "config", - "rev": "c8193ce824404a48ee676c9ad4b0a8282458c5ab", + "rev": "cf988820ffaaa44d0f8607f2417f9527d142b52c", "type": "github" }, "original": { @@ -1662,7 +1568,7 @@ "pipethon": { "inputs": { "flake-utils": "flake-utils_10", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1767634075, @@ -1678,25 +1584,6 @@ "url": "ssh://forgejo@git.donsz.nl/jana/pipethon.git" } }, - "probe-rs-rules": { - "inputs": { - "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_15" - }, - "locked": { - "lastModified": 1774797100, - "narHash": "sha256-Yg2mBbqI3yaXvO6dDUMs0QKGH2DLpag6FulMKsmuQ/A=", - "owner": "jneem", - "repo": "probe-rs-rules", - "rev": "5c601076adc309841ac7f6a932b59f296602410e", - "type": "github" - }, - "original": { - "owner": "jneem", - "repo": "probe-rs-rules", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", @@ -1760,12 +1647,12 @@ "inputs": { "agenix": "agenix_2", "darwin": "darwin_2", - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_11", "home-manager": "home-manager_3", "impermanence": "impermanence", "nix-index-database": "nix-index-database_2", "nixos-hardware": "nixos-hardware_2", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_14", "ragenix": "ragenix_2" }, "locked": { @@ -1784,8 +1671,8 @@ }, "raw-data": { "inputs": { - "flake-utils": "flake-utils_13", - "nixpkgs": "nixpkgs_17" + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1768919451, @@ -1803,9 +1690,9 @@ }, "reviewqueue": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_13", "naersk": "naersk_2", - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_17", "nixpkgs-mozilla": "nixpkgs-mozilla_2" }, "locked": { @@ -1833,7 +1720,6 @@ "harmonica": "harmonica", "home-manager": "home-manager", "homepage": "homepage", - "isadle": "isadle", "jujutsu": "jujutsu", "kitty-search": "kitty-search", "mapf": "mapf", @@ -1841,13 +1727,12 @@ "mifg": "mifg", "niri": "niri", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", "p1n3appl3": "p1n3appl3", "pipethon": "pipethon", - "probe-rs-rules": "probe-rs-rules", "rahul-config": "rahul-config", "raw-data": "raw-data", "reviewqueue": "reviewqueue", @@ -1901,11 +1786,11 @@ ] }, "locked": { - "lastModified": 1772939270, - "narHash": "sha256-HbxD5DJAKxzo0G8on5wdY+OZNiUWt3FTvGmXmVEmg7g=", + "lastModified": 1769482338, + "narHash": "sha256-SVwjMqR981PEdEdRvYj5Mefnd61GLinWmIr7GMu7LW8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bb93f191a07c0165992ed6d0b4197ee5c7e6e641", + "rev": "dc9c76a75a6d382613cdcb1a3f95640e9cedcdea", "type": "github" }, "original": { @@ -1986,15 +1871,15 @@ }, "secrets": { "inputs": { - "flake-utils": "flake-utils_15", - "nixpkgs": "nixpkgs_20" + "flake-utils": "flake-utils_14", + "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1777662519, - "narHash": "sha256-DTlipbEbUt0ZCpVt6e3KtAhVx5Pri/91B9q5yYROJvo=", + "lastModified": 1769256063, + "narHash": "sha256-fVFJ10YXPF8RfUuyL3OHOP6v0pzU78mTeKvlOCRCuuA=", "ref": "refs/heads/main", - "rev": "39383fdba62e6e6ab20ceb4ff927f712c94371d9", - "revCount": 8, + "rev": "179e0bf0028c929978a3fbe7f77a27b2254eeb18", + "revCount": 7, "type": "git", "url": "ssh://forgejo@git.donsz.nl/jana/server-secrets.git" }, @@ -2018,11 +1903,11 @@ ] }, "locked": { - "lastModified": 1774370155, - "narHash": "sha256-emNcbleHPyUszpRFV5mHnU3q4E0aq7FNJxPtIAvsJqE=", + "lastModified": 1768682904, + "narHash": "sha256-d4VEGrKHx9EisLHdGDN15w1PsuS5ZImvewwucTM3rUo=", "owner": "lytedev", "repo": "slippi-nix", - "rev": "c1f16cb34f7e09e8a9c7fe49744305c2f65a5b5f", + "rev": "1f309afd4be00afedf34add3645ba2c1b97bdb40", "type": "github" }, "original": { @@ -2033,14 +1918,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_19" }, "locked": { - "lastModified": 1775682595, - "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", + "lastModified": 1771889317, + "narHash": "sha256-YV17Q5lEU0S9ppw08Y+cs4eEQJBuc79AzblFoHORLMU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", + "rev": "b027513c32e5b39b59f64626b87fbe168ae02094", "type": "github" }, "original": { @@ -2096,16 +1981,16 @@ }, "systems_12": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2244,51 +2129,6 @@ "type": "github" } }, - "systems_21": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_22": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_23": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -2365,21 +2205,6 @@ } }, "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2394,10 +2219,25 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "t": { "inputs": { - "flake-utils": "flake-utils_16", - "nixpkgs": "nixpkgs_22" + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1710410762, @@ -2415,7 +2255,7 @@ }, "totpal": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1737322813, @@ -2431,28 +2271,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "noctalia", - "noctalia-qs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_2" @@ -2473,7 +2291,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_15" + "systems": "systems_13" }, "locked": { "lastModified": 1731533236, @@ -2491,7 +2309,7 @@ }, "vimium-options": { "inputs": { - "nixpkgs": "nixpkgs_24" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1746118178, @@ -2542,11 +2360,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1773622265, - "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", + "lastModified": 1771787042, + "narHash": "sha256-7bM6Y4KldhKnfopSALF8XALxcX7ehkomXH9sPl4MXp0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a879e5e0896a326adc79c474bf457b8b99011027", + "rev": "33c344fee50504089a447a8fef5878cf4f6215fc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ec886a4..9b6d375 100644 --- a/flake.nix +++ b/flake.nix @@ -20,10 +20,6 @@ reviewqueue.url = "github:jdonszelmann/review-queue"; compiler-construction-2021.url = "git+ssh://forgejo@git.donsz.nl/jana/eelco-visser-compiler-construction.git"; mifg.url = "git+ssh://forgejo@git.donsz.nl/jana/money.is.fckn.gay.git"; - isadle.url = "git+ssh://forgejo@git.donsz.nl/jana/isadle.git"; - - # desktop/laptop - probe-rs-rules.url = "github:jneem/probe-rs-rules"; # server raw-data.url = "git+ssh://forgejo@git.donsz.nl/jana/raw-data.git"; @@ -34,7 +30,7 @@ # home nixvim = { url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; t.url = "github:jdonszelmann/t-rs"; dumpasm.url = "github:jdonszelmann/dumpasm"; diff --git a/hosts/fili/services/databases.nix b/hosts/fili/services/databases.nix index 06e3198..2e75d8e 100644 --- a/hosts/fili/services/databases.nix +++ b/hosts/fili/services/databases.nix @@ -19,7 +19,7 @@ host all all 10.0.0.0/24 trust # and the local network - host all all 192.168.178.0/24 trust + host all all 192.168.0.0/24 trust ''; settings = { listen_addresses = "*"; @@ -58,10 +58,6 @@ name = "immich"; ensureDBOwnership = true; } - { - name = "homepage"; - ensureDBOwnership = true; - } ]; ensureDatabases = map (i: i.name) ensureUsers; }; diff --git a/hosts/fili/services/metrics.nix b/hosts/fili/services/metrics.nix index d041622..1626cc7 100644 --- a/hosts/fili/services/metrics.nix +++ b/hosts/fili/services/metrics.nix @@ -146,6 +146,118 @@ in }; }; + systemd.services.promtail.serviceConfig.User = lib.mkForce "nginx"; + services.promtail = { + enable = true; + configuration = { + server = { + http_listen_port = 3031; + grpc_listen_port = 0; + }; + positions = { + filename = "/tmp/positions.yaml"; + }; + clients = [ + { + url = "http://127.0.0.1:${toString config.services.loki.configuration.server.http_listen_port}/loki/api/v1/push"; + } + ]; + scrape_configs = [ + { + job_name = "nginx"; + static_configs = [ + { + targets = [ "localhost" ]; + labels = { + job = "nginx"; + host = "fili"; + __path__ = "/var/log/nginx/json_access.log"; + }; + } + ]; + pipeline_stages = [ + { + json = { + expressions = { + msec = "msec"; + connection = "connection"; + connection_requests = "connection_requests"; + pid = "pid"; + request_id = "request_id"; + request_length = "request_length"; + remote_addr = "remote_addr"; + remote_user = "remote_user"; + remote_port = "remote_port"; + time_local = "time_local"; + time_iso8601 = "time_iso8601"; + request = "request"; + request_uri = "request_uri"; + args = "args"; + status = "status"; + body_bytes_sent = "body_bytes_sent"; + bytes_sent = "bytes_sent"; + http_referer = "http_referer"; + http_user_agent = "http_user_agent"; + http_x_forwarded_for = "http_x_forwarded_for"; + http_host = "http_host"; + server_name = "server_name"; + request_time = "request_time"; + upstream = "upstream"; + upstream_connect_time = "upstream_connect_time"; + upstream_header_time = "upstream_header_time"; + upstream_response_time = "upstream_response_time"; + upstream_response_length = "upstream_response_length"; + upstream_cache_status = "upstream_cache_status"; + ssl_protocol = "ssl_protocol"; + ssl_cipher = "ssl_cipher"; + scheme = "scheme"; + request_method = "request_method"; + server_protocol = "server_protocol"; + pipe = "pipe"; + gzip_ratio = "gzip_ratio"; + http_cf_ray = "http_cf_ray"; + }; + }; + } + { + timestamp = { + source = "msec"; + format = "Unix"; + }; + } + # { + # geoip = { + # db = "/var/lib/geoip-databases/GeoLite2-City.mmdb"; + # source = "remote_addr"; + # db_type = "city"; + # }; + # } + # { + # pack = { + # labels = [ "geoip_country_name" ]; + # }; + # } + ]; + } + { + job_name = "journal"; + journal = { + max_age = "12h"; + labels = { + job = "systemd-journal"; + host = "fili"; + }; + }; + relabel_configs = [ + { + source_labels = [ "__journal__systemd_unit" ]; + target_label = "unit"; + } + ]; + } + ]; + }; + }; services.grafana = { enable = false; diff --git a/hosts/fili/services/websites/default.nix b/hosts/fili/services/websites/default.nix index b03e997..668d7f5 100644 --- a/hosts/fili/services/websites/default.nix +++ b/hosts/fili/services/websites/default.nix @@ -8,6 +8,5 @@ _: { ./compiler-construction-2021.nix ./mapfm-poster.nix ./money-is-fckn-gay.nix - ./isadle.nix ]; } diff --git a/hosts/fili/services/websites/homepage.nix b/hosts/fili/services/websites/homepage.nix index f0db3b5..3a843a7 100644 --- a/hosts/fili/services/websites/homepage.nix +++ b/hosts/fili/services/websites/homepage.nix @@ -1,10 +1,4 @@ -{ - flakes, - pkgs, - config, - secrets, - ... -}: +{ flakes, pkgs, ... }: let cache = pkg: '' location ~* \.(png|jpg|jpeg|gif|svg|ico|woff|woff2|ttf)$ { @@ -38,52 +32,15 @@ let locations."/".return = return; } // ssl; - - package = flakes.homepage.packages.${pkgs.system}; in { - sops.secrets.homepage = { - sopsFile = "${secrets}/homepage.env"; - }; - - systemd.services.homepage = { - description = "homepage"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - DynamicUser = "yes"; - ExecStart = "${pkgs.bash}/bin/bash ${package.website}/bin/run"; - Restart = "on-failure"; - RestartSec = "5s"; - EnvironmentFile = config.sops.secrets.homepage.path; - WorkingDirectory = "${package.website}"; - StateDirectory = "homepage"; - }; - - environment = { - BETTER_AUTH_URL = "https://donsz.nl"; - DATABASE_LOCATION = "/var/lib/homepage/db.sqlite"; - HOST = "localhost"; - PORT = "11020"; + services.nginx = { + virtualHosts = { + "donsz.nl" = site regular; + "jdonszelmann.nl" = site regular; + "blog.donsz.nl" = redirect "301 https://donsz.nl/blog"; + "gay.donsz.nl" = site gay; + "jana.is.fckn.gay" = site gay; }; }; - - services.nginx.virtualHosts = { - "donsz.nl" = { - forceSSL = true; - enableACME = true; - extraConfig = '' - ${cache "${package.website}/homepage/client"} - ''; - locations."/".proxyPass = "http://localhost:${toString 11020}"; - }; - "blog.donsz.nl" = redirect "301 https://donsz.nl/blog"; - }; - # services.nginx = { - # virtualHosts = { - # "donsz.nl" = site regular; - # "jdonszelmann.nl" = site regular; - # "gay.donsz.nl" = site gay; - # "jana.is.fckn.gay" = site gay; - # }; - # }; } diff --git a/hosts/fili/services/websites/isadle.nix b/hosts/fili/services/websites/isadle.nix deleted file mode 100644 index da33566..0000000 --- a/hosts/fili/services/websites/isadle.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, flakes, ... }: -{ - services.nginx = { - virtualHosts."isadle.donsz.nl" = { - forceSSL = true; - http2 = true; - enableACME = true; - - locations."/" = { - root = flakes.isadle.packages.${pkgs.system}.isadle; - extraConfig = '' - autoindex on; - ''; - }; - }; - }; -} diff --git a/hosts/kili/configuration.nix b/hosts/kili/configuration.nix index a661b0a..378d6d1 100644 --- a/hosts/kili/configuration.nix +++ b/hosts/kili/configuration.nix @@ -1,15 +1,11 @@ -{ - pkgs, - config, - flakes, - ... +{ pkgs +, config +, ... }: { imports = [ ./hardware-configuration.nix ./kanata.nix - - flakes.probe-rs-rules.nixosModules.${pkgs.system}.default ]; boot.loader.systemd-boot.enable = true; @@ -41,14 +37,11 @@ variant = ""; }; - users.groups.plugdev = { }; - users.users.jana = { extraGroups = [ "networkmanager" "wheel" "docker" - "plugdev" ]; packages = with pkgs; [ ]; }; @@ -68,32 +61,31 @@ signal-desktop nautilus - probe-rs-tools - adwaita-icon-theme - (pkgs.callPackage ( - { stdenv }: - stdenv.mkDerivation { - name = "global-cursor-theme"; - unpackPhase = "true"; - outputs = [ "out" ]; - installPhase = '' - mkdir -p $out/share/icons/default - cat << EOF > $out/share/icons/default/index.theme - [Icon Theme] - Name=Default - Comment=Default Cursor Theme - Inherits=Adwaita - EOF - ''; - } - ) { }) + (pkgs.callPackage + ( + { stdenv }: + stdenv.mkDerivation { + name = "global-cursor-theme"; + unpackPhase = "true"; + outputs = [ "out" ]; + installPhase = '' + mkdir -p $out/share/icons/default + cat << EOF > $out/share/icons/default/index.theme + [Icon Theme] + Name=Default + Comment=Default Cursor Theme + Inherits=Adwaita + EOF + ''; + } + ) + { }) perf rr ]; - hardware.probe-rs.enable = true; virtualisation.docker.enable = true; services.xserver.enable = true; @@ -117,8 +109,6 @@ hardware.graphics = { enable = true; - enable32Bit = true; - extraPackages = with pkgs; [ libva-vdpau-driver intel-media-driver @@ -168,12 +158,10 @@ programs.steam = { enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers }; - programs.nix-ld.enable = true; # programs.mtr.enable = true; # programs.gnupg.agent = { diff --git a/pkgs/custom.nix b/pkgs/custom.nix index 9efd206..c87f02f 100644 --- a/pkgs/custom.nix +++ b/pkgs/custom.nix @@ -6,7 +6,6 @@ niri-unstable, raw-data, p1n3appl3, - isadle, pkgs, ... }@inputs: @@ -21,6 +20,5 @@ in pipethon = pipethon.packages.${system}.python; raw-data = raw-data.packages.${system}.default; p1n3appl3 = p1n3appl3.packages.${system}; - isadle = isadle.packages.${system}.default; } // (import ./maple.nix inputs) diff --git a/programs/default.nix b/programs/default.nix index ac84270..fd72c8b 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -214,7 +214,7 @@ just uv llvmPackages.bintools - nodejs_22 + nodejs (writeShellScriptBin "nas" '' mkdir -p ~/Documents/nas diff --git a/programs/firefox/default.nix b/programs/firefox/default.nix index cc01c45..09df2cd 100644 --- a/programs/firefox/default.nix +++ b/programs/firefox/default.nix @@ -168,18 +168,6 @@ inputs@{ machine, ... }: keyword = "!no"; url = "https://search.nixos.org/options?query=%s"; } - { - keyword = "!ri"; - url = "https://github.com/rust-lang/rust/issues/%s"; - } - { - keyword = "!tf"; - url = "https://rust.tf/%s"; - } - { - keyword = "!dg"; - url = "https://rustc-dev-guide.rust-lang.org/?search=%s"; - } # { # name = "bank"; diff --git a/programs/fish/default.nix b/programs/fish/default.nix index ef7be17..e478e52 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -20,7 +20,6 @@ inputs@{ machine, ... }: "cp-ser" = cp-media "ser" "shows"; "cp-ani" = cp-media "ani" "anime"; "ragdoll" = ragdoll; - "jjj" = jjj; "dumpasm" = "${pkgs.custom.dumpasm}/bin/dumpasm"; "p" = calc; "s" = "systemctl"; diff --git a/programs/fish/scripts.nix b/programs/fish/scripts.nix index d033d14..c5324d8 100644 --- a/programs/fish/scripts.nix +++ b/programs/fish/scripts.nix @@ -34,21 +34,4 @@ SSH_TMUX_SESSION_NAME="ssh-from-$(hostname)-$TMUX_SESSION_NAME" tmux detach -E "kitten ssh -t ragdoll \"export TMUX_SESSION_NAME=$SSH_TMUX_SESSION_NAME; tmux attach -t $SSH_TMUX_SESSION_NAME || tmux new -e TMUX_SESSION_NAME=$SSH_TMUX_SESSION_NAME -s $SSH_TMUX_SESSION_NAME\"; exec tmux attach -t $TMUX_SESSION_NAME" ''}/bin/ragdoll"; - jjj = "${pkgs.writeScriptBin "jjj" '' - cmd="\${"1:-show"}" - shift - - selected=$( - jj log -r 'all()' --color=always \ - | fzf \ - --min-height=15 \ - --cycle \ - --ansi \ - --prompt "jj $cmd> " - ) || exit 0 - - rev=$(echo "$selected" | awk '{for(i=1;i<=NF;i++) if(length($i)>=7){print $i; exit}}') - - jj "$cmd" -r "$rev" "$@" - ''}/bin/jjj"; } diff --git a/programs/jj/default.nix b/programs/jj/default.nix index 6e84825..0a0cc6e 100644 --- a/programs/jj/default.nix +++ b/programs/jj/default.nix @@ -85,8 +85,7 @@ inputs@{ machine, ... }: ''; # if(.contained_in('first_parent(@)'), label("git_head", "HEAD")), status_summary = "'\n' ++ self.diff().summary() ++ '\n'"; - space = "'\n\n\n'"; - log_oneline_with_status_summary = "if(self.current_working_copy(), space) ++ log_oneline ++ if(self.current_working_copy() && self.diff().files().len() > 0, status_summary)"; + log_oneline_with_status_summary = "log_oneline ++ if(self.current_working_copy() && self.diff().files().len() > 0, status_summary)"; }; aliases = @@ -168,15 +167,15 @@ inputs@{ machine, ... }: ]; t = tug; - d = [ "describe" ]; + d = "describe"; dm = [ "describe" "-m" ]; - e = [ "edit" ]; - s = [ "squash" ]; - si = [ "squash -i" ]; - sp = [ "split" ]; + e = "edit"; + s = "squash"; + si = "squash -i"; + sp = "split"; }; templates = { diff --git a/programs/niri/default.nix b/programs/niri/default.nix index 15f66dc..5138e96 100644 --- a/programs/niri/default.nix +++ b/programs/niri/default.nix @@ -364,7 +364,7 @@ inputs@{ machine, ... }: }; "Mod+Period" = { allow-when-locked = true; - action.spawn-sh = "playerctl next"; + action.spawn-sh = "playerctl nest"; }; "Mod+Comma" = { allow-when-locked = true; diff --git a/programs/nvim/config.lua b/programs/nvim/config.lua index 30a097f..749e528 100644 --- a/programs/nvim/config.lua +++ b/programs/nvim/config.lua @@ -30,10 +30,6 @@ vim.cmd([[ inoremap FloatermToggle nnoremap FloatermToggle tnoremap FloatermToggle - - inoremap FloatermHide - nnoremap FloatermHide - tnoremap FloatermHide ]]) vim.keymap.set('n', 'gr', (function() builtin.lsp_references({}) end), {}) @@ -111,7 +107,7 @@ vim.cmd([[ ]]) vim.cmd([[ - " let g:suda_smart_edit = 1 + let g:suda_smart_edit = 1 filetype plugin indent on ]]) diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix index d146370..b8c6151 100644 --- a/programs/nvim/default.nix +++ b/programs/nvim/default.nix @@ -36,7 +36,7 @@ inputs@{ machine, ... }: EDITOR = "nvim"; }; - packages = with pkgs; [ + packages = with pkgs-unstable; [ tree-sitter (pkgs.stdenv.mkDerivation { name = "editor-hax"; @@ -83,7 +83,7 @@ inputs@{ machine, ... }: clipboard.providers.wl-copy.enable = true; performance = { - byteCompileLua.enable = false; + byteCompileLua.enable = true; combinePlugins = { enable = false; @@ -93,12 +93,12 @@ inputs@{ machine, ... }: }; }; - # extraLuaPackages = ps: [ ps.magick ]; + extraLuaPackages = ps: [ ps.magick ]; extraPackages = [ pkgs.imagemagick ]; # package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped; # package = pkgs.neovim-unwrapped; - # package = with pkgs-unstable; neovim-unwrapped; + package = with pkgs-unstable; neovim-unwrapped; colorschemes.onedark = { enable = true; diff --git a/programs/nvim/editor-hax.py b/programs/nvim/editor-hax.py index eb83738..a35f59e 100755 --- a/programs/nvim/editor-hax.py +++ b/programs/nvim/editor-hax.py @@ -39,7 +39,7 @@ def find_or_create_pane(window, args): run(f"tmux send-keys -t {pane} Escape") # note the space, this tells nvim not to save it in history - run(f"tmux send-keys -t {pane} F9 \": drop {args}\" Enter") + run(f"tmux send-keys -t {pane} \": drop {args}\" Enter") run(f"tmux select-pane -t {pane} -Z") else: create_pane(args) diff --git a/programs/nvim/keys.nix b/programs/nvim/keys.nix index 3c8ab96..fd9ac3f 100644 --- a/programs/nvim/keys.nix +++ b/programs/nvim/keys.nix @@ -30,7 +30,7 @@ in (luamap "n" "/" "${telescope}.current_buffer_fuzzy_find()") # last used pickers/searches (luamap "n" "p" "${telescope}.pickers()") - (luamap "n" "m" "${telescope}.marks()") + (luamap "n" "m" "${telescope}.search_history()") # open buffers (luamap "n" "b" "${telescope}.buffers({sort_mru = true})") (luamap "n" "" "${telescope}.buffers({sort_mru = true})") diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix index 43f0deb..1a7429c 100644 --- a/programs/nvim/plugins.nix +++ b/programs/nvim/plugins.nix @@ -30,7 +30,7 @@ in ansiesc.enable = true; treesitter-textobjects = { - enable = true; + enable = false; settings = { lsp_interop.enable = true; select = { @@ -168,13 +168,6 @@ in }; }; - marks = { - enable = true; - settings = { - cyclic = true; - }; - }; - rainbow-delimiters.enable = true; lsp-format.enable = true; fugitive.enable = true; @@ -184,7 +177,7 @@ in nvim-autopairs.enable = true; spider.enable = true; origami = { - enable = false; + enable = true; settings.autofold.enabled = false; }; @@ -806,7 +799,7 @@ in telescope-ui-select-nvim telescope-fzf-native-nvim - # vim-suda + vim-suda render-markdown telescope-file-browser vim-astro diff --git a/programs/ssh.nix b/programs/ssh.nix index 5504c3b..fca7d4c 100644 --- a/programs/ssh.nix +++ b/programs/ssh.nix @@ -18,8 +18,8 @@ inputs@{ machine, ... }: proxyJump = "fili"; }; ragdoll = { - hostname = "hexcat.nl"; - port = 4455; + hostname = "192.168.178.138"; + proxyJump = "fili"; }; "*" = { diff --git a/programs/xdg/default.nix b/programs/xdg/default.nix index e2823f9..f0b35d8 100644 --- a/programs/xdg/default.nix +++ b/programs/xdg/default.nix @@ -46,12 +46,7 @@ in home-config = { config, pkgs, ... }: { - home.packages = with pkgs; [ - glib - (pkgs.writeShellScriptBin "xdg-open" '' - gio open "$@" - '') - ]; + home.packages = with pkgs; [ xdg-utils ]; xdg = { enable = true; diff --git a/server exited unexpectedly b/server exited unexpectedly index 110d82d..c29f9e9 100644 --- a/server exited unexpectedly +++ b/server exited unexpectedly @@ -1 +1 @@ -Ptmux;_Gd=a,a=d,q=2\\ \ No newline at end of file +Ptmux;_Ga=d,q=2,d=a\\ \ No newline at end of file