From 165d17312f91f2b29a2f47709dbbf35629e909da Mon Sep 17 00:00:00 2001 From: Isabella Bastaja Date: Fri, 27 Mar 2026 16:06:39 +0100 Subject: remove nur in favor of a plain nixpkgs overlay --- flake.lock | 188 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 102 insertions(+), 86 deletions(-) (limited to 'flake.lock') diff --git a/flake.lock b/flake.lock index 3ccd00e..4daf24b 100644 --- a/flake.lock +++ b/flake.lock @@ -23,17 +23,17 @@ "emacs-overlay": { "inputs": { "nixpkgs": [ - "sorrepkgs", + "xpkgs", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1739610734, - "narHash": "sha256-rmCJ6iUTn5XAE7T4w96a+sRQrHRfnv064NHu+8dVBB4=", + "lastModified": 1774197122, + "narHash": "sha256-eidCp9jr4doBF6v2hPwqZkt8fUtW14w7fqHFVtstR94=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "15fe2e796e097c4fda4ed481401ae80f2b714525", + "rev": "4f7b5653f8845eee7c41c9a029d7bc22aaca4e67", "type": "github" }, "original": { @@ -97,27 +97,27 @@ "type": "github" } }, - "futils": { + "flake-parts_3": { "inputs": { - "systems": "systems" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1722472559, - "narHash": "sha256-HqzEdURUwgCNDpopDC38NbChC0cOyj1L47EP+1aco8k=", - "ref": "refs/heads/main", - "rev": "aaa51589dd772073c6eb48d6b7bd51dc8be3b455", - "revCount": 4, - "type": "git", - "url": "https://git.sorre.xyz/isabella/futils.git" + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" }, "original": { - "type": "git", - "url": "https://git.sorre.xyz/isabella/futils.git" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, - "futils_2": { + "futils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1722472559, @@ -126,11 +126,11 @@ "rev": "aaa51589dd772073c6eb48d6b7bd51dc8be3b455", "revCount": 4, "type": "git", - "url": "https://git.sorre.xyz/miranb/futils" + "url": "https://git.sorre.xyz/isabella/futils.git" }, "original": { "type": "git", - "url": "https://git.sorre.xyz/miranb/futils" + "url": "https://git.sorre.xyz/isabella/futils.git" } }, "gitignore": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774201162, - "narHash": "sha256-th4i3X3P3yikPk3qu1A5DQ40tIztZKvAKPaa9hjXF+U=", + "lastModified": 1774622476, + "narHash": "sha256-lhx5jiMYRaBAkH5MmkWQ+VQjXGjeKIJqnvsPWa9fn40=", "owner": "nix-community", "repo": "home-manager", - "rev": "932ca46013acabbedd13c27dc278e3d043707e46", + "rev": "accd450fcdbb1e1018cd8701b4980b36d57f28f0", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774113359, - "narHash": "sha256-b7/LsPn5uZoFNjGVQ26q+6QPf8Q9IHHmRx+rGLZ8oyY=", + "lastModified": 1774620721, + "narHash": "sha256-QucawBaJ6Rl5JWAXAbpouXM1MsvlzwCsPGl3zOwLtzw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1c4a800bbe0c4cbcf99529fd88286a14450261a8", + "rev": "fb83d584532282f585cd02f3aa513e98b843e7e7", "type": "github" }, "original": { @@ -220,11 +220,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1773130184, - "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=", + "lastModified": 1774616418, + "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea", + "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -264,13 +264,28 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1773964973, - "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", + "lastModified": 1774388614, + "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", + "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", "type": "github" }, "original": { @@ -282,27 +297,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1773964973, + "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -318,11 +333,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1774207541, - "narHash": "sha256-I6P6g9+reKkl5GDElidDk/uySnA6k5vCM+arBbo+ciM=", + "lastModified": 1774616000, + "narHash": "sha256-fPtYDx+6NSvcrsR3kJ/s/4Exc/BRzOkNZT3E1PgL0Io=", "owner": "nix-community", "repo": "nur", - "rev": "876dd755052a387e790f23ac7e88d3772e5e610a", + "rev": "1fb4ca6ac4d9af7bceb2b132e98c0553bbebf8a1", "type": "github" }, "original": { @@ -364,8 +379,8 @@ "nur": "nur", "sops-nix": "sops-nix", "sorre-website": "sorre-website", - "sorrepkgs": "sorrepkgs", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_2", + "xpkgs": "xpkgs" } }, "sops-nix": { @@ -375,11 +390,11 @@ ] }, "locked": { - "lastModified": 1774154798, - "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=", + "lastModified": 1774303811, + "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170", + "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", "type": "github" }, "original": { @@ -411,28 +426,6 @@ "url": "https://git.sorre.xyz/isabella/sorre-website.git" } }, - "sorrepkgs": { - "inputs": { - "emacs-overlay": "emacs-overlay", - "futils": "futils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1740323134, - "narHash": "sha256-NsfswF61MhLFianT/5w3f5wmgduKs0YIdxTCUudl8+A=", - "ref": "refs/heads/main", - "rev": "a58bca8abf4c28072cfd95c0036bbf16a1339611", - "revCount": 12, - "type": "git", - "url": "https://git.sorre.xyz/isabella/xpkgs" - }, - "original": { - "type": "git", - "url": "https://git.sorre.xyz/isabella/xpkgs" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -448,21 +441,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -504,6 +482,44 @@ "type": "github" } }, + "wrapper-manager": { + "locked": { + "lastModified": 1772780728, + "narHash": "sha256-fCm4sOeTDf3kBtYMmU4OHsviI/oF8rMbPkUMcQf6lw4=", + "owner": "viperML", + "repo": "wrapper-manager", + "rev": "51ad0422b925d830bf4af36979fed51209f79c0a", + "type": "github" + }, + "original": { + "owner": "viperML", + "repo": "wrapper-manager", + "type": "github" + } + }, + "xpkgs": { + "inputs": { + "emacs-overlay": "emacs-overlay", + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "nixpkgs" + ], + "wrapper-manager": "wrapper-manager" + }, + "locked": { + "lastModified": 1774623359, + "narHash": "sha256-0mfkO7oGDKgDfzOzL0j8aD4KVeQ93yTj/s/peu81X38=", + "ref": "refs/heads/main", + "rev": "8cac6bc950b815ee483ca9cfaa2ab9f6002d110f", + "revCount": 24, + "type": "git", + "url": "https://git.sorre.xyz/isabella/xpkgs" + }, + "original": { + "type": "git", + "url": "https://git.sorre.xyz/isabella/xpkgs" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { -- cgit v1.3.1