From eb6a3662832adb606745215a1ec8953c10971482 Mon Sep 17 00:00:00 2001 From: Jurn Wubben Date: Thu, 1 May 2025 15:05:15 +0200 Subject: [PATCH] Updated flake; Removed gale overlay port 8000 now always open for temporary services. updated mpv config Added mount.yazi plugin --- flake.lock | 516 +++++++----------------------- flake.nix | 15 +- home/programs/games.nix | 1 + home/programs/mpv.nix | 4 +- home/shell/other.nix | 5 + home/shell/yazi.nix | 21 ++ system/network/temporary-port.nix | 7 + system/programs/games.nix | 64 ++-- 8 files changed, 188 insertions(+), 445 deletions(-) create mode 100644 system/network/temporary-port.nix diff --git a/flake.lock b/flake.lock index d97f924..1a1b419 100644 --- a/flake.lock +++ b/flake.lock @@ -4,15 +4,17 @@ "inputs": { "darwin": "darwin", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -26,11 +28,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1745523430, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "type": "github" }, "original": { @@ -96,11 +98,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -129,11 +131,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1739223196, - "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -144,12 +146,12 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -157,38 +159,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -208,11 +178,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -240,24 +210,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -299,7 +251,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -316,24 +268,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_6" - }, - "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_4": { "inputs": { "systems": [ "stylix", @@ -376,18 +310,18 @@ "stylix", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "stylix", "nixpkgs" ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -397,28 +331,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "nur-xddxdd", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "stylix", @@ -464,11 +376,11 @@ ] }, "locked": { - "lastModified": 1741526102, - "narHash": "sha256-w1VBhX21NgK82Dbafd35AjSfOXgLAxZDotWlwO5PS+c=", + "lastModified": 1745858959, + "narHash": "sha256-B1FQwPCFLL3cbHc2nxT3/UI1uprHp2h1EA6M2JVe0oQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "07f505f91e0c7112550845425222f41865c4260a", + "rev": "d0d9d0a1454d5a0200693570618084d80a8b336c", "type": "github" }, "original": { @@ -486,11 +398,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -507,11 +419,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1745439012, + "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8", "type": "github" }, "original": { @@ -522,11 +434,11 @@ }, "mnw": { "locked": { - "lastModified": 1738852285, - "narHash": "sha256-8Y1uyE6gGHxdU0Vcx2CMg/dAmDSxJw19aAl3TKbbo54=", + "lastModified": 1745705214, + "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=", "owner": "Gerg-L", "repo": "mnw", - "rev": "6ae73dc9cb72cea17bcc2e3d4670825f483e80e8", + "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924", "type": "github" }, "original": { @@ -537,7 +449,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1739824009, @@ -566,11 +478,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1732053863, - "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=", + "lastModified": 1741118843, + "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "owner": "oxalica", "repo": "nil", - "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362", + "rev": "577d160da311cc7f5042038456a0713e9863d09e", "type": "github" }, "original": { @@ -579,40 +491,19 @@ "type": "github" } }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nur-xddxdd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744518957, - "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, "nixcord": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741307969, - "narHash": "sha256-JxWxScHu0g/ltTas3ZvwPX/J6xhHm540+FY8ZfTigDg=", + "lastModified": 1745757380, + "narHash": "sha256-MfA53mffVwGd1uZlFmUHwrGFSdggXfGzTuOH1DP+vY4=", "owner": "kaylorben", "repo": "nixcord", - "rev": "269b69665a78f57f2bc1b62e05e823815f41cea9", + "rev": "ab84b94df09d4ec856a89083cc8f629db5a2d8d9", "type": "github" }, "original": { @@ -623,43 +514,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-24_05": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -683,25 +558,13 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1743161759, - "narHash": "sha256-AJJy0SKtqLld9JPYi/yvI2P6qCNpcjExHuniZbRSklk=", + "lastModified": 1745788595, + "narHash": "sha256-XTtT/LzX+mUqRsnuHtzygWfG9HXnOVBQC2vMfpT5AYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "873f4b2202bdac3845fa5ae294cfa2748ef0667e", + "rev": "66d3e172fa7bc69432a540ffd04825d0b358b04d", "type": "github" }, "original": { @@ -713,53 +576,21 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737003892, - "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", - "owner": "NixOS", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { - "locked": { - "lastModified": 1735554305, - "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1741516043, - "narHash": "sha256-Hv0S630U4GVZBM1Q+NCEwyN5ct7cic+8r6qLIaUaVqI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8adda98a4e637d0d8a867f19ace5ed6680ecc94a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1741516043, "narHash": "sha256-Hv0S630U4GVZBM1Q+NCEwyN5ct7cic+8r6qLIaUaVqI=", @@ -772,7 +603,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1742707865, "narHash": "sha256-RVQQZy38O3Zb8yoRJhuFgWo/iDIDj0hEdRTVfhOtzRk=", @@ -788,13 +619,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { @@ -804,89 +635,46 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "nixpkgs": [ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_3" - }, - "locked": { - "lastModified": 1740408283, - "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=", - "owner": "nix-community", - "repo": "NUR", - "rev": "496a4a11162bdffb9a7b258942de138873f019f7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "nur-xddxdd": { - "inputs": { - "flake-parts": "flake-parts_2", - "nix-index-database": "nix-index-database", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-24_05": "nixpkgs-24_05", - "nvfetcher": "nvfetcher", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1744798043, - "narHash": "sha256-Z4bd90BOo7b6uD6mJ/dbwqVg8RkXPQVDgA9ujT+mzMA=", - "owner": "xddxdd", - "repo": "nur-packages", - "rev": "c536bd168abfac67e027fe51707ddb502e218ed6", + "lastModified": 1745459908, + "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", + "owner": "nix-community", + "repo": "NUR", + "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", "type": "github" }, "original": { - "owner": "xddxdd", - "repo": "nur-packages", + "owner": "nix-community", + "repo": "NUR", "type": "github" } }, "nvf": { "inputs": { - "flake-parts": "flake-parts_3", - "flake-utils": "flake-utils_2", + "flake-parts": "flake-parts_2", + "flake-utils": "flake-utils", "mnw": "mnw", "nil": "nil", "nixpkgs": [ "nixpkgs" ], - "nmd": "nmd", - "systems": "systems_5" + "systems": "systems_4" }, "locked": { - "lastModified": 1741477095, - "narHash": "sha256-aiaCmDReL34ViSB7ArVq8vB2VdTDVft1+vKfWkWeyUo=", + "lastModified": 1745819184, + "narHash": "sha256-+v+MOVFYDQCJdP67gLrIdrLGKqBUp37KGhvcqd9ZFqA=", "owner": "notashelf", "repo": "nvf", - "rev": "6576509cd559aec3da271d12fa911d04d44708ec", + "rev": "efa859381f60132db976d2501bfdb4e6f8d5a8c5", "type": "github" }, "original": { @@ -895,52 +683,6 @@ "type": "github" } }, - "nvfetcher": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nur-xddxdd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732501185, - "narHash": "sha256-Z0BpHelaGQsE5VD9hBsBHsvMU9h+Xt0kfkDJyFivZOU=", - "owner": "berberman", - "repo": "nvfetcher", - "rev": "bdb14eab6fe9cefc29efe01e60c3a3f616d6b62a", - "type": "github" - }, - "original": { - "owner": "berberman", - "repo": "nvfetcher", - "type": "github" - } - }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore", - "nixpkgs": [ - "nur-xddxdd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -948,9 +690,8 @@ "flake-parts": "flake-parts", "hm": "hm", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", - "nur-xddxdd": "nur-xddxdd", "nvf": "nvf", "somcli": "somcli", "stylix": "stylix" @@ -965,11 +706,11 @@ ] }, "locked": { - "lastModified": 1731983527, - "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=", + "lastModified": 1741055476, + "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b", + "rev": "aefb7017d710f150970299685e8d8b549d653649", "type": "github" }, "original": { @@ -980,16 +721,16 @@ }, "somcli": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "naersk": "naersk", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1743031501, - "narHash": "sha256-LF4J5P+tDhEv3els7PIBa+2+peSeURNzx4I1MwCHWy8=", + "lastModified": 1745864947, + "narHash": "sha256-0Hx9YIOMD4rsn2pWF+Z8St4v2JEtuxCGd9LVrcbC7Zk=", "owner": "jsw08", "repo": "somcli", - "rev": "aa84a75691e3098000e7b885b966d7af1e81318f", + "rev": "5c6f8fe0fddef66073cb2d49148602973c2edb6e", "type": "github" }, "original": { @@ -1005,14 +746,14 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "nur": "nur", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1020,11 +761,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1741392477, - "narHash": "sha256-6ySHuduGhlZBv1uxEOlOeHWDEkKuLQ/O63DI+ZRfAmg=", + "lastModified": 1745618823, + "narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=", "owner": "danth", "repo": "stylix", - "rev": "6eea250b10386be0fc23496d1039d76b3147680e", + "rev": "11ceb2fde1901dc227421bbbef2d0800339f5126", "type": "github" }, "original": { @@ -1122,21 +863,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1174,11 +900,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1740351358, - "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -1190,11 +916,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740272597, - "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -1221,14 +947,17 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixcord", + "nixpkgs" + ] }, "locked": { - "lastModified": 1737103437, - "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { @@ -1238,27 +967,6 @@ } }, "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nur-xddxdd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744707583, - "narHash": "sha256-IPFcShGro/UUp8BmwMBkq+6KscPlWQevZi9qqIwVUWg=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49d05555ccdd2592300099d6a657cc33571f4fe0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "stylix", diff --git a/flake.nix b/flake.nix index 5075e4d..b8f2b35 100644 --- a/flake.nix +++ b/flake.nix @@ -28,18 +28,18 @@ inputs = { # Nixpkgs and other core shit - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; # build error unrelated to config. + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # build error unrelated to config. nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11-small"; # build error unrelated to config. flake-parts.url = "github:hercules-ci/flake-parts"; - nur-xddxdd = { # FIXME: Used by flaresolverr as the nixpkgs version is broken. - url = "github:xddxdd/nur-packages"; - inputs.nixpkgs.follows = "nixpkgs"; - }; hm = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + agenix = { + url = "github:ryantm/agenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Ricing stylix.url = "github:danth/stylix"; @@ -51,12 +51,11 @@ nixcord.url = "github:kaylorben/nixcord"; somcli.url = "github:jsw08/somcli"; + + # Non-flake dcbot = { url = "github:jsw08/dcbot"; flake = false; }; - - agenix.url = "github:ryantm/agenix"; - }; } diff --git a/home/programs/games.nix b/home/programs/games.nix index d57229f..fbfb04e 100644 --- a/home/programs/games.nix +++ b/home/programs/games.nix @@ -8,6 +8,7 @@ home.packages = lib.mkIf osConfig.niksos.games [ pkgs.dolphin-emu pkgs.suyu + pkgs.gale # ( # pkgs.appimageTools.wrapType1 rec { diff --git a/home/programs/mpv.nix b/home/programs/mpv.nix index b28aa10..f59a5d5 100644 --- a/home/programs/mpv.nix +++ b/home/programs/mpv.nix @@ -10,10 +10,11 @@ profile = "gpu-hq"; hwdec = "auto-safe"; gpu-context = "wayland"; - ytdl-format = "bestvideo+bestaudio"; + ytdl-format = "bestvideo[height<=?1440]+bestaudio/best"; volume-max = 200; fs = true; save-position-on-quit = true; + webui-port = 9090; }; scripts = with pkgs.mpvScripts; [ @@ -22,6 +23,7 @@ thumbfast sponsorblock mpv-cheatsheet + simple-mpv-webui ]; }; } diff --git a/home/shell/other.nix b/home/shell/other.nix index 1bac84d..cb84e56 100644 --- a/home/shell/other.nix +++ b/home/shell/other.nix @@ -14,9 +14,14 @@ pkgs.usbutils pkgs.pciutils pkgs.inetutils + pkgs.aria2 + pkgs.dua + pkgs.file ] ++ lib.optionals osConfig.niksos.desktop [ inputs.somcli.defaultPackage.${pkgs.system} + pkgs.ffmpeg + pkgs.gurk-rs ] ++ lib.optionals osConfig.niksos.bluetooth [ pkgs.ear2ctl diff --git a/home/shell/yazi.nix b/home/shell/yazi.nix index 15a37b5..cba4c92 100644 --- a/home/shell/yazi.nix +++ b/home/shell/yazi.nix @@ -1,5 +1,26 @@ { + osConfig, + pkgs, + lib, + ... +}: let + inherit (lib) mkIf; + udisks2 = osConfig.services.udisks2.enable; + yPlugins = pkgs.yaziPlugins; +in { programs.yazi = { enable = true; + plugins = { + full-border = yPlugins.full-border; + mount = mkIf udisks2 yPlugins.mount; + }; + keymap.manager.prepend_keymap = + lib.optionals udisks2 + [ + { + on = "M"; + run = "plugin mount"; + } + ]; }; } diff --git a/system/network/temporary-port.nix b/system/network/temporary-port.nix new file mode 100644 index 0000000..3cd8865 --- /dev/null +++ b/system/network/temporary-port.nix @@ -0,0 +1,7 @@ +{ + config, + lib, + ... +}: { + networking.firewall.allowedTCPPorts = lib.mkOptionals config.niksos.desktop [8080]; # Handy for temporary web servers and stuff. +} diff --git a/system/programs/games.nix b/system/programs/games.nix index d8a0f4a..abf54a7 100644 --- a/system/programs/games.nix +++ b/system/programs/games.nix @@ -6,38 +6,38 @@ }: { options.niksos.games = lib.mkEnableOption "gaming related stuff."; config = lib.mkIf config.niksos.games { - nixpkgs.overlays = [ - (final: prev: let - version = "1.4.2"; - hash = "sha256-xe0qlbtt06CUK8bXyaGDtCcHOXpSnkbuvcxaDJjeS/c="; - npmHash = "sha256-/+NhlQydGS6+2jEjpbwycwKplVo/++wcdPiBNY3R3FI="; - cargoHash = "sha256-VwzGbm34t7mg9ndmTkht6Ho32NQ+6uxuPTKi3+VrhYo="; - in { - gale = prev.gale.overrideAttrs (new: old: { - src = prev.fetchFromGitHub { - inherit version hash; - owner = "Kesomannen"; - repo = "gale"; - rev = "1.4.2"; - }; - npmDeps = prev.fetchNpmDeps { - hash = npmHash; - name = "${new.pname}-${new.version}-npm-deps"; - inherit (new) src; - }; - cargoDeps = prev.rustPlatform.fetchCargoVendor { - inherit - (new) - pname - version - src - cargoRoot - ; - hash = cargoHash; - }; - }); - }) - ]; + # nixpkgs.overlays = [ + # (final: prev: let + # version = "1.4.2"; + # hash = "sha256-xe0qlbtt06CUK8bXyaGDtCcHOXpSnkbuvcxaDJjeS/c="; + # npmHash = "sha256-/+NhlQydGS6+2jEjpbwycwKplVo/++wcdPiBNY3R3FI="; + # cargoHash = "sha256-VwzGbm34t7mg9ndmTkht6Ho32NQ+6uxuPTKi3+VrhYo="; + # in { + # gale = prev.gale.overrideAttrs (new: old: { + # src = prev.fetchFromGitHub { + # inherit version hash; + # owner = "Kesomannen"; + # repo = "gale"; + # rev = "1.4.2"; + # }; + # npmDeps = prev.fetchNpmDeps { + # hash = npmHash; + # name = "${new.pname}-${new.version}-npm-deps"; + # inherit (new) src; + # }; + # cargoDeps = prev.rustPlatform.fetchCargoVendor { + # inherit + # (new) + # pname + # version + # src + # cargoRoot + # ; + # hash = cargoHash; + # }; + # }); + # }) + # ]; users.users.jsw.packages = [pkgs.gale]; programs = {