From f65a6d0dd5e5f62d5110738304b4d14fc890d54c Mon Sep 17 00:00:00 2001 From: xunuwu Date: Wed, 28 May 2025 06:19:12 +0200 Subject: [PATCH] remove nvfetcher and unused authentik import --- _sources/generated.json | 17 --- _sources/generated.nix | 12 -- flake.lock | 323 +++++---------------------------------- flake.nix | 5 - pkgs/default.nix | 6 +- pkgs/krunker/default.nix | 35 +++-- shells/default.nix | 1 - 7 files changed, 60 insertions(+), 339 deletions(-) delete mode 100644 _sources/generated.json delete mode 100644 _sources/generated.nix diff --git a/_sources/generated.json b/_sources/generated.json deleted file mode 100644 index e8f717d..0000000 --- a/_sources/generated.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "krunker": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "krunker", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-yG8E3a6AaX0TBK23TlBBLmiCfqzS8FldTfl7As4Dcvo=", - "type": "url", - "url": "https://client2.krunker.io/setup.AppImage" - }, - "version": "1626868370902057" - } -} \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix deleted file mode 100644 index 2db7b1f..0000000 --- a/_sources/generated.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by nvfetcher, please do not modify it manually. -{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: -{ - krunker = { - pname = "krunker"; - version = "1626868370902057"; - src = fetchurl { - url = "https://client2.krunker.io/setup.AppImage"; - sha256 = "sha256-yG8E3a6AaX0TBK23TlBBLmiCfqzS8FldTfl7As4Dcvo="; - }; - }; -} diff --git a/flake.lock b/flake.lock index 87e93f4..87de686 100644 --- a/flake.lock +++ b/flake.lock @@ -1,49 +1,5 @@ { "nodes": { - "authentik-nix": { - "inputs": { - "authentik-src": "authentik-src", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "napalm": "napalm", - "nixpkgs": "nixpkgs", - "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix", - "systems": "systems", - "uv2nix": "uv2nix" - }, - "locked": { - "lastModified": 1747386678, - "narHash": "sha256-+4pIDo56iXWUklX1U+biw/cfC8TiSXTMh2N6V/+JMUg=", - "owner": "nix-community", - "repo": "authentik-nix", - "rev": "f20474660332903be6b47f3c1fdfc531f6f75f1d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "authentik-nix", - "type": "github" - } - }, - "authentik-src": { - "flake": false, - "locked": { - "lastModified": 1747329052, - "narHash": "sha256-idShMSYIrf3ViG9VFNGNu6TSjBz3Q+GJMMeCzcJwfG4=", - "owner": "goauthentik", - "repo": "authentik", - "rev": "ae47624761f05040149d856d5e55a90cd7492740", - "type": "github" - }, - "original": { - "owner": "goauthentik", - "ref": "version/2025.4.1", - "repo": "authentik", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -204,22 +160,6 @@ } }, "flake-compat": { - "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-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -235,7 +175,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1747046372, @@ -251,7 +191,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -267,7 +207,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -283,24 +223,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -320,9 +242,9 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1743550720, @@ -338,7 +260,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nvim-config", @@ -360,7 +282,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nvim-config", @@ -382,9 +304,9 @@ "type": "indirect" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1743550720, @@ -400,7 +322,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -423,10 +345,7 @@ }, "flake-utils": { "inputs": { - "systems": [ - "authentik-nix", - "systems" - ] + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -444,25 +363,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -496,7 +397,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "nvim-config", @@ -623,7 +524,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nvim-config", "neovim-nightly-overlay", @@ -679,40 +580,14 @@ "type": "github" } }, - "napalm": { - "inputs": { - "flake-utils": [ - "authentik-nix", - "flake-utils" - ], - "nixpkgs": [ - "authentik-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725806412, - "narHash": "sha256-lGZjkjds0p924QEhm/r0BhAxbHBJE1xMOldB/HmQH04=", - "owner": "willibutz", - "repo": "napalm", - "rev": "b492440d9e64ae20736d3bec5c7715ffcbde83f5", - "type": "github" - }, - "original": { - "owner": "willibutz", - "ref": "avoid-foldl-stack-overflow", - "repo": "napalm", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -747,7 +622,7 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] @@ -788,8 +663,8 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -810,15 +685,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", - "owner": "NixOS", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -854,38 +729,7 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1747467164, "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", @@ -950,7 +794,7 @@ }, "own-website": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ] @@ -969,56 +813,6 @@ "type": "github" } }, - "pyproject-build-systems": { - "inputs": { - "nixpkgs": [ - "authentik-nix", - "nixpkgs" - ], - "pyproject-nix": [ - "authentik-nix", - "pyproject-nix" - ], - "uv2nix": [ - "authentik-nix", - "uv2nix" - ] - }, - "locked": { - "lastModified": 1744599653, - "narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=", - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "rev": "7dba6dbc73120e15b558754c26024f6c93015dd7", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "type": "github" - } - }, - "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "authentik-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746540146, - "narHash": "sha256-QxdHGNpbicIrw5t6U3x+ZxeY/7IEJ6lYbvsjXmcxFIM=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "e09c10c24ebb955125fda449939bfba664c467fd", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "roblox-playtime": { "inputs": { "crane": "crane", @@ -1043,18 +837,17 @@ }, "root": { "inputs": { - "authentik-nix": "authentik-nix", "cloudflare-ipv4": "cloudflare-ipv4", "cloudflare-ipv6": "cloudflare-ipv6", "firefox-addons": "firefox-addons", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "hardware": "hardware", "home-manager": "home-manager", "impermanence": "impermanence", "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nvim-config": "nvim-config", "own-website": "own-website", "roblox-playtime": "roblox-playtime", @@ -1113,8 +906,8 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_7", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_6", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": [ @@ -1124,7 +917,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_4", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1147,16 +940,16 @@ }, "systems": { "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" } }, @@ -1205,21 +998,6 @@ "type": "github" } }, - "systems_5": { - "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": { @@ -1347,7 +1125,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -1363,31 +1141,6 @@ "type": "github" } }, - "uv2nix": { - "inputs": { - "nixpkgs": [ - "authentik-nix", - "nixpkgs" - ], - "pyproject-nix": [ - "authentik-nix", - "pyproject-nix" - ] - }, - "locked": { - "lastModified": 1746649034, - "narHash": "sha256-gmv+ZiY3pQnwgI0Gm3Z1tNSux1CnOJ0De+xeDOol1+0=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "fe540e91c26f378c62bf6da365a97e848434d0cd", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } - }, "vpn-confinement": { "locked": { "lastModified": 1743810720, @@ -1418,7 +1171,7 @@ "wayland-appusage": { "inputs": { "crane": "crane_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 75d1392..019df2b 100644 --- a/flake.nix +++ b/flake.nix @@ -58,11 +58,6 @@ nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - authentik-nix.url = "github:nix-community/authentik-nix"; - - # nvfetcher.url = "github:berberman/nvfetcher"; - # nvfetcher.inputs.nixpkgs.follows = "nixpkgs"; - nix-gaming.url = "github:fufexan/nix-gaming"; nix-gaming.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/pkgs/default.nix b/pkgs/default.nix index ae61b4c..1222502 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,11 +1,9 @@ -{pkgs, ...}: let - nv_generated = pkgs.callPackage ../_sources/generated.nix {}; -in { +{pkgs, ...}: { packages = { jdnbtexplorer = pkgs.qt6Packages.callPackage ./jdnbtexplorer {}; gamesand = pkgs.callPackage ./gamesand {}; binaryninja-personal = pkgs.qt6Packages.callPackage ./binaryninja-personal {}; - krunker = pkgs.callPackage ./krunker {inherit nv_generated;}; + krunker = pkgs.callPackage ./krunker {}; ida-pro = pkgs.callPackage ./ida-pro {}; cartograph-cf = pkgs.callPackage ./cartograph-cf {}; }; diff --git a/pkgs/krunker/default.nix b/pkgs/krunker/default.nix index 9885fd6..ad7da67 100644 --- a/pkgs/krunker/default.nix +++ b/pkgs/krunker/default.nix @@ -1,24 +1,29 @@ { appimageTools, imagemagick, - nv_generated, + fetchurl, }: let - inherit (nv_generated.krunker) pname src version; + pname = "krunker"; + version = "1626868370902057"; + src = fetchurl { + url = "https://client2.krunker.io/setup.AppImage"; + sha256 = "sha256-yG8E3a6AaX0TBK23TlBBLmiCfqzS8FldTfl7As4Dcvo="; + }; appimageContents = appimageTools.extract { inherit pname src version; }; in - appimageTools.wrapType2 (nv_generated.krunker - // { - extraInstallCommands = '' - for i in 16 24 48 64 96 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - ${imagemagick}/bin/convert -background none -resize ''${i}x ${appimageContents}/io.krunker.desktop.png $out/share/icons/hicolor/''${i}x''${i}/apps/io.krunker.desktop.png - done + appimageTools.wrapType2 { + inherit pname src version; + extraInstallCommands = '' + for i in 16 24 48 64 96 128 256 512; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ${imagemagick}/bin/convert -background none -resize ''${i}x ${appimageContents}/io.krunker.desktop.png $out/share/icons/hicolor/''${i}x''${i}/apps/io.krunker.desktop.png + done - install -m 444 -D ${appimageContents}/io.krunker.desktop.desktop $out/share/applications/krunker.desktop - substituteInPlace $out/share/applications/krunker.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' \ - --replace 'Name=Official Krunker.io Client' 'Name=Krunker.io' - ''; - }) + install -m 444 -D ${appimageContents}/io.krunker.desktop.desktop $out/share/applications/krunker.desktop + substituteInPlace $out/share/applications/krunker.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' \ + --replace 'Name=Official Krunker.io Client' 'Name=Krunker.io' + ''; + } diff --git a/shells/default.nix b/shells/default.nix index 24d997b..23341b8 100644 --- a/shells/default.nix +++ b/shells/default.nix @@ -7,7 +7,6 @@ just home-manager sops - nvfetcher ]; }; }