From 356b8e696906a258096779271b592d35f05943d4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 2 Dec 2025 16:37:37 +0100 Subject: bump --- _sources/generated.json | 8 +-- _sources/generated.nix | 8 +-- flake.lock | 99 +++++++++++++---------------------- flake.nix | 10 ---- hosts/surtr/http/default.nix | 1 - hosts/vidhar/network/dhcp/default.nix | 6 +-- overlays/waybar.nix | 8 --- 7 files changed, 48 insertions(+), 92 deletions(-) delete mode 100644 overlays/waybar.nix diff --git a/_sources/generated.json b/_sources/generated.json index e2c9035a..cf6c6068 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -375,7 +375,7 @@ }, "quickshell": { "cargoLock": null, - "date": "2025-11-24", + "date": "2025-11-29", "extract": null, "name": "quickshell", "passthru": null, @@ -385,13 +385,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3", - "sha256": "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk=", + "rev": "d24e8e9736287d01ee73ef9d573d2bc316a62d5c", + "sha256": "sha256-ynV90KoBrPe38YFlKAHtPFk4Ee3IANUsIFGxRaq7H/s=", "sparseCheckout": [], "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, - "version": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3" + "version": "d24e8e9736287d01ee73ef9d573d2bc316a62d5c" }, "scutiger": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 3224783e..5db09106 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -237,17 +237,17 @@ }; quickshell = { pname = "quickshell"; - version = "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3"; + version = "d24e8e9736287d01ee73ef9d573d2bc316a62d5c"; src = fetchgit { url = "https://git.outfoxxed.me/quickshell/quickshell.git"; - rev = "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3"; + rev = "d24e8e9736287d01ee73ef9d573d2bc316a62d5c"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk="; + sha256 = "sha256-ynV90KoBrPe38YFlKAHtPFk4Ee3IANUsIFGxRaq7H/s="; }; - date = "2025-11-24"; + date = "2025-11-29"; }; scutiger = { pname = "scutiger"; diff --git a/flake.lock b/flake.lock index bb3f952a..be258840 100644 --- a/flake.lock +++ b/flake.lock @@ -406,11 +406,11 @@ ] }, "locked": { - "lastModified": 1762691701, - "narHash": "sha256-G4XxDQEg+nWQZuJ8fFspFWEwQKBNWp2qfwNerTqgPgo=", + "lastModified": 1764572102, + "narHash": "sha256-FfDSqzh5ASC1dgnGdcwRqNNEokNs9w+GJJ13ZVJPNIk=", "owner": "gkleen", "repo": "home-manager", - "rev": "d2e6122b484d43b6e87d4ea0578057507df380ab", + "rev": "8412ce7047c18625e7ad5fce50f3845e0aa791c0", "type": "github" }, "original": { @@ -507,11 +507,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763581369, - "narHash": "sha256-HTLoe4UvnG5fWruO+zjnZJNCnKcbVM8eeSPpIlKHOyI=", + "lastModified": 1764563982, + "narHash": "sha256-6pB9TEo5++jkowiajprT6kqDuEYlGrvyIjTc86hZn2M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ca75677ad47613f6afbbc2c6142601fef0ac7631", + "rev": "9b1ac5828fc04bd7b07f147f26908eeaebb31ca7", "type": "github" }, "original": { @@ -541,11 +541,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762690468, - "narHash": "sha256-JA7OTscpnkSPbmA211nYpkzueGLcTe01FfPZUpuCJiE=", + "lastModified": 1764516885, + "narHash": "sha256-+lCuXvlMjgcqT6N1yw2+LzkWdkh9AcR8fuA2C4Sia+Q=", "owner": "gkleen", "repo": "niri", - "rev": "e13a1ea28e4474bcae0324c154093249e03d0b73", + "rev": "8d5a6436c1234e5e431d27bfd998d6668d047b5f", "type": "github" }, "original": { @@ -583,11 +583,11 @@ ] }, "locked": { - "lastModified": 1763265660, - "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", + "lastModified": 1764475780, + "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "469ef53571ea80890c9497952787920c79c1ee6e", + "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -765,11 +765,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1763334038, - "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", + "lastModified": 1764316264, + "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", + "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", "type": "github" }, "original": { @@ -813,11 +813,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ ] }, "locked": { - "lastModified": 1761781027, - "narHash": "sha256-YDvxPAm2WnxrznRqWwHLjryBGG5Ey1ATEJXrON+TWt8=", + "lastModified": 1763662255, + "narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "795a980d25301e5133eca37adae37283ec3c8e66", + "rev": "042904167604c681a090c07eb6967b4dd4dae88c", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ ] }, "locked": { - "lastModified": 1763435975, - "narHash": "sha256-SKdpcVuJKMNEXloIpLXY+jDI42+6Ew21vdkl894DxHo=", + "lastModified": 1764134915, + "narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "7d3d8848358ccbd415afe2139f12b9e1508d3ace", + "rev": "2c8df1383b32e5443c921f61224b198a2282a657", "type": "github" }, "original": { @@ -1117,8 +1117,7 @@ "pyproject-build-systems": "pyproject-build-systems_2", "pyproject-nix": "pyproject-nix", "sops-nix": "sops-nix", - "uv2nix": "uv2nix", - "waybar": "waybar" + "uv2nix": "uv2nix" } }, "rust-overlay": { @@ -1149,11 +1148,11 @@ ] }, "locked": { - "lastModified": 1763607916, - "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -1224,11 +1223,11 @@ ] }, "locked": { - "lastModified": 1763421857, - "narHash": "sha256-8JurcmEzAkrpm+eUDm8W/+KkU/w/viAeyJhJlIX2qOQ=", + "lastModified": 1764546642, + "narHash": "sha256-pCzgOjGEZyH7xKmpckdJzWyO0kvTIlaTK+ed/wguv5Y=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "c9752c6c5915eece99505612d8f7805185cff990", + "rev": "0c56de7543459a23d0ebb7977fd555ced5d842ae", "type": "github" }, "original": { @@ -1237,30 +1236,6 @@ "type": "github" } }, - "waybar": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752562190, - "narHash": "sha256-zWOMCNe56H2PHUd3rJZ6tklZUZBLgRo85jd9IlK1g9o=", - "owner": "gkleen", - "repo": "Waybar", - "rev": "d008cd998369c40f2344a856caf39cdbbd7bd068", - "type": "github" - }, - "original": { - "owner": "gkleen", - "ref": "feat/niri-urgency", - "repo": "Waybar", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -1281,11 +1256,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1764560400, + "narHash": "sha256-Qz1WvGdawnoz4dG3JtCtlParmdQHM5xu6osnXeVOqYI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "9a71e77b1e06dbad4a472265e59b52ac83cbe00c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e358251c..d2d17316 100644 --- a/flake.nix +++ b/flake.nix @@ -186,16 +186,6 @@ repo = "impermanence"; ref = "master"; }; - waybar = { - type = "github"; - owner = "gkleen"; - repo = "Waybar"; - ref = "feat/niri-urgency"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-compat.follows = "flake-compat"; - }; - }; nixVirt = { type = "github"; owner = "AshleyYakeley"; diff --git a/hosts/surtr/http/default.nix b/hosts/surtr/http/default.nix index ea527cb5..4cbd3eae 100644 --- a/hosts/surtr/http/default.nix +++ b/hosts/surtr/http/default.nix @@ -7,7 +7,6 @@ config = { services.nginx = { enable = true; - package = pkgs.nginxQuic; recommendedGzipSettings = false; recommendedProxySettings = true; recommendedTlsSettings = true; diff --git a/hosts/vidhar/network/dhcp/default.nix b/hosts/vidhar/network/dhcp/default.nix index 11460393..eda27663 100644 --- a/hosts/vidhar/network/dhcp/default.nix +++ b/hosts/vidhar/network/dhcp/default.nix @@ -349,7 +349,7 @@ in { goto start :memtest - iseq ''${platform} efi && chain --autofree memtest.efi || chain --autofree memtest.bin + chain --autofree mt86plus.efi goto start ''} $out/installer-${system}.menu.ipxe ''))) @@ -360,7 +360,7 @@ in { mkdir $out install -m 0444 -t $out \ ${ipxe}/{ipxe.efi,i386-ipxe.efi,ipxe.lkrn} \ - ${pkgs.memtest86plus}/{memtest.efi,memtest.bin} + ${pkgs.memtest86plus}/mt86plus.efi install -m 0444 ${sources.netbootxyz-efi.src} $out/netboot.xyz.efi install -m 0444 ${sources.netbootxyz-lkrn.src} $out/netboot.xyz.lkrn '') @@ -411,7 +411,7 @@ in { goto start :memtest - iseq ''${platform} efi && chain --autofree memtest.efi || chain --autofree memtest.bin + chain --autofree mt86plus.efi goto start ''} $out/eostre.menu.ipxe ''))) diff --git a/overlays/waybar.nix b/overlays/waybar.nix deleted file mode 100644 index e7e3b807..00000000 --- a/overlays/waybar.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions - flakeInputs.waybar.overlays.default - (final: prev: { - waybar = prev.waybar.overrideAttrs (oldAttrs: { - dontVersionCheck = true; - }); - }) - final prev -- cgit v1.2.3