From 9bec2ed2628280c43fef4143f80278ebff4d18d3 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sat, 30 Nov 2024 15:40:26 -0500 Subject: [PATCH 1/3] stop mc server update nix-janitor and nix update lockfile fix nerd-fonts --- flake.lock | 153 +++++++-------------- flake.nix | 7 +- hosts/gerg-desktop/services/minecraft.nix | 2 +- hosts/gerg-desktop/services/reboot-bot.nix | 1 + modules/misc.nix | 10 +- modules/theming.nix | 2 +- 6 files changed, 68 insertions(+), 107 deletions(-) diff --git a/flake.lock b/flake.lock index 4d0afb1..470afaf 100644 --- a/flake.lock +++ b/flake.lock @@ -1,33 +1,5 @@ { "nodes": { - "cargo2nix": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nix-janitor", - "nixpkgs" - ], - "rust-overlay": [ - "nix-janitor", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1712112199, - "narHash": "sha256-5ur7bE90d+6Ny6PzC/6R0bDAa6B1+gDAk2XIFSDfAjY=", - "owner": "cargo2nix", - "repo": "cargo2nix", - "rev": "da5f5d796af00fe818aa12f3b2d46a4800e6fec8", - "type": "github" - }, - "original": { - "owner": "cargo2nix", - "ref": "release-0.12", - "repo": "cargo2nix", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1730652660, @@ -50,11 +22,11 @@ ] }, "locked": { - "lastModified": 1732919362, - "narHash": "sha256-3SxlMD3nSI90+pHOF27SuLEt3+wew8xl+sUJaJMeHOI=", + "lastModified": 1732988076, + "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=", "owner": "nix-community", "repo": "disko", - "rev": "b71e3faca99b40fb801f03fd950fbefbbba691a4", + "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1", "type": "github" }, "original": { @@ -118,11 +90,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -148,22 +120,6 @@ } }, "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1732722421, - "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -179,7 +135,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1732722421, @@ -282,21 +238,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -316,7 +257,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "gitignore": "gitignore_2", "nixpkgs": [ "nvim-flake", @@ -486,11 +427,11 @@ }, "master": { "locked": { - "lastModified": 1732942656, - "narHash": "sha256-64wbhC0jrYUH7dNmpXw1xYVMI9AX6xxBES91M7crX3A=", + "lastModified": 1732990138, + "narHash": "sha256-Z7NT+HFb/VQqdORpTWIDugrk3dc129jAcuqOLjRiuzA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ad72fe6962ef77520833dc2a03eb2580cf7fc77", + "rev": "130bb06af1b749f0b53468fc91421c467424a182", "type": "github" }, "original": { @@ -517,12 +458,12 @@ }, "neovim-nightly": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1732925246, @@ -567,16 +508,16 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1728310575, - "narHash": "sha256-R13o8hNhzuTuEwUBViVOmT4OM0/I2d9DxnkxQOip1yg=", + "lastModified": 1732892090, + "narHash": "sha256-Ka/uNdaqpTAiVL++4MPHg8fG5o1tiJeY6G2t5UiKhd8=", "owner": "NixOS", "repo": "nix", - "rev": "26c3fc11eada3fa7df0284190095868a947fefe2", + "rev": "64000481168d1da9d2519f055dd1fdee22275c21", "type": "github" }, "original": { "owner": "NixOS", - "ref": "26c3fc11eada3fa7df0284190095868a947fefe2", + "ref": "64000481168d1da9d2519f055dd1fdee22275c21", "repo": "nix", "type": "github" } @@ -603,24 +544,20 @@ }, "nix-janitor": { "inputs": { - "cargo2nix": "cargo2nix", - "nixpkgs": [ - "unstable" - ], + "nixpkgs": "nixpkgs", "parts": "parts", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1716802118, - "narHash": "sha256-KRXz2qUDWmyglXk56jL0twOQ3pWdpacddyVn95W7wl0=", + "lastModified": 1732982517, + "narHash": "sha256-PeFMHcQVxkMx1Yl25qo9fZVjWTjRbElZLxPpcCCi/wE=", "owner": "Nobbz", "repo": "nix-janitor", - "rev": "d49fd7486d5597d2e854154bf643e7f86c5f1f6c", + "rev": "07d6547d69d5d40a9397ddaece76c97f86ed022d", "type": "github" }, "original": { "owner": "Nobbz", - "ref": "d49fd7486d5597d2e854154bf643e7f86c5f1f6c", "repo": "nix-janitor", "type": "github" } @@ -663,15 +600,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", - "owner": "NixOS", + "lastModified": 1689601424, + "narHash": "sha256-WEqoSflQP65MF9O9k+JEkvUXMEoyCatmMAoLOowcEoE=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "d0f2758381caca8b4fb4a6cac61721cc9de06bd9", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -744,6 +681,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1732617236, "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", @@ -761,7 +714,7 @@ }, "nvim-flake": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "mnw": "mnw", "neovim-nightly": "neovim-nightly", "nixpkgs": [ @@ -889,8 +842,8 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1715998563, @@ -928,7 +881,7 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "nixpkgs": [ "unstable" ] @@ -949,16 +902,16 @@ }, "stable": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1732824227, + "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -1000,11 +953,11 @@ }, "unstable": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d63a92a..488d2bc 100644 --- a/flake.nix +++ b/flake.nix @@ -17,14 +17,14 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-24.05"; + ref = "nixos-24.11"; }; #nix itself nix = { type = "github"; owner = "NixOS"; repo = "nix"; - ref = "26c3fc11eada3fa7df0284190095868a947fefe2"; + ref = "64000481168d1da9d2519f055dd1fdee22275c21"; inputs.nixpkgs.follows = "stable"; }; nixos-generators = { @@ -61,8 +61,7 @@ type = "github"; owner = "Nobbz"; repo = "nix-janitor"; - ref = "d49fd7486d5597d2e854154bf643e7f86c5f1f6c"; - inputs.nixpkgs.follows = "unstable"; + #inputs.nixpkgs.follows = "unstable"; }; #my own packages spicetify-nix = { diff --git a/hosts/gerg-desktop/services/minecraft.nix b/hosts/gerg-desktop/services/minecraft.nix index dcaa444..448a439 100644 --- a/hosts/gerg-desktop/services/minecraft.nix +++ b/hosts/gerg-desktop/services/minecraft.nix @@ -1,7 +1,7 @@ { lib, self' }: { # I manually switch this sometimes - config = lib.mkIf true { + config = lib.mkIf false { networking.firewall = { allowedUDPPorts = [ 24454 ]; allowedTCPPorts = [ diff --git a/hosts/gerg-desktop/services/reboot-bot.nix b/hosts/gerg-desktop/services/reboot-bot.nix index 35d9644..8c5a758 100644 --- a/hosts/gerg-desktop/services/reboot-bot.nix +++ b/hosts/gerg-desktop/services/reboot-bot.nix @@ -7,6 +7,7 @@ sops.secrets.reboot_token = { }; systemd.services.reboot_bot = { + enable = false; wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; diff --git a/modules/misc.nix b/modules/misc.nix index e4f6bec..21d37b8 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -32,7 +32,15 @@ nix-tree # view packages pciutils # lspci ; - inherit (nix-janitor.packages) default; + nix-janitor = pkgs.symlinkJoin { + name = "nix-janitor"; + paths = [ nix-janitor.packages.default ]; + nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; + postBuild = '' + wrapProgram "$out/bin/janitor" \ + --suffix PATH : ${lib.makeBinPath [ config.nix.package ]} + ''; + }; } ); diff --git a/modules/theming.nix b/modules/theming.nix index e656b07..00ff435 100644 --- a/modules/theming.nix +++ b/modules/theming.nix @@ -66,7 +66,7 @@ in fonts = { packages = [ pkgs.overpass - (pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) + pkgs.nerd-fonts.symbols-only ]; enableDefaultPackages = false; fontDir.enable = true; From cbd55667d00e96fab884ae7dc4998681a85de881 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sat, 30 Nov 2024 15:43:47 -0500 Subject: [PATCH 2/3] my kernel isn't broken --- hosts/gerg-desktop/boot.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hosts/gerg-desktop/boot.nix b/hosts/gerg-desktop/boot.nix index dc2d358..51cc1aa 100644 --- a/hosts/gerg-desktop/boot.nix +++ b/hosts/gerg-desktop/boot.nix @@ -112,13 +112,16 @@ in configfile = ./kernelConfig; }).overrideAttrs (old: { - passthru = (old.passthru or { }) // { - features = lib.foldr (x: y: (x.features or { }) // y) { + passthru = old.passthru or { } // { + features = lib.foldr (x: y: x.features or { } // y) { efiBootStub = true; netfilterRPFilter = true; ia32Emulation = true; } config.boot.kernelPatches; }; + meta = old.meta or { } // { + broken = false; + }; }) ); }; From af888b800a98828d4606a0eb8ee6a937c16c7bdc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 1 Dec 2024 05:13:08 +0000 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'fetch-rs': 'github:Gerg-L/fetch-rs/b58b827999c2baab8b718a203b5b0569735be9fe?narHash=sha256-4fITQAIxcHeHKjA%2B/xb5mz2EXAic9jBg0qNS9Xd12Uo%3D' (2024-08-04) → 'github:Gerg-L/fetch-rs/02da86995b637f55faec4df702111acd8b29e700?narHash=sha256-bpK503lmU1RPtqNhRENjafAdQeGYWUvUaAl7womFuOQ%3D' (2024-11-30) • Updated input 'master': 'github:NixOS/nixpkgs/130bb06af1b749f0b53468fc91421c467424a182?narHash=sha256-Z7NT%2BHFb/VQqdORpTWIDugrk3dc129jAcuqOLjRiuzA%3D' (2024-11-30) → 'github:NixOS/nixpkgs/2c27ab2e60502d1ebb7cf38909de38663f762a79?narHash=sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw%3D' (2024-12-01) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/f4a5ca5771ba9ca31ad24a62c8d511a405303436?narHash=sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q%3D' (2024-11-25) → 'github:nix-community/nix-index-database/6e0b7f81367069589a480b91603a10bcf71f3103?narHash=sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE%3D' (2024-12-01) • Updated input 'nix-janitor': 'github:Nobbz/nix-janitor/07d6547d69d5d40a9397ddaece76c97f86ed022d?narHash=sha256-PeFMHcQVxkMx1Yl25qo9fZVjWTjRbElZLxPpcCCi/wE%3D' (2024-11-30) → 'github:Nobbz/nix-janitor/8898c37337465e8a0cc063d8dcfe1079f534c53f?narHash=sha256-zN7FRz6wpS/5C3RE0wQN0bBtFdgrZv9GUK87cjZ9mDQ%3D' (2024-11-30) • Updated input 'nix-janitor/nixpkgs': 'github:nixos/nixpkgs/d0f2758381caca8b4fb4a6cac61721cc9de06bd9?narHash=sha256-WEqoSflQP65MF9O9k%2BJEkvUXMEoyCatmMAoLOowcEoE%3D' (2023-07-17) → 'github:nixos/nixpkgs/4703b8d2c708e13a8cab03d865f90973536dcdf5?narHash=sha256-B5pYT%2BIVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4%3D' (2024-11-30) • Updated input 'nix-janitor/parts': 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec?narHash=sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0%3D' (2023-07-04) → 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90?narHash=sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS%2Bb4tfNFCwE%3D' (2024-11-01) • Updated input 'nix-janitor/parts/nixpkgs-lib': 'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib&narHash=sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4%3D' (2023-06-29) → 'https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz?narHash=sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s%3D' (2024-11-01) • Updated input 'nix-janitor/rust-overlay': 'github:oxalica/rust-overlay/4731829dec4859921bfc0e1548478207d6c9c8fa?narHash=sha256-krjs9VkDoRrYNQVyCTXUGUfAJziCk0Fkki1ZnnmNgjk%3D' (2024-05-18) → 'github:oxalica/rust-overlay/c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1?narHash=sha256-dge02pUSe2QeC/B3PriA0R8eAX%2BEU3aDoXj9FcS3XDw%3D' (2024-11-30) • Removed input 'nix-janitor/rust-overlay/flake-utils' • Removed input 'nix-janitor/rust-overlay/flake-utils/systems' • Updated input 'nix-janitor/rust-overlay/nixpkgs': 'github:NixOS/nixpkgs/90f456026d284c22b3e3497be980b2e47d0b28ac?narHash=sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg%3D' (2024-01-29) → 'github:NixOS/nixpkgs/b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221?narHash=sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU%3D' (2024-10-10) • Updated input 'nvim-flake': 'github:Gerg-L/nvim-flake/628b7dc449230380060c53c9761bb081915b428d?narHash=sha256-Hobt5yUAGoEWvgCVBJ5y0%2Bmorq6TMUZB9lKKe3zQq58%3D' (2024-11-30) → 'github:Gerg-L/nvim-flake/dd1ef9594c5ebaf6a3856f99f1f3b85b09b47eba?narHash=sha256-DtdrZiRh5rapnBHl5r/uG0GFNuZi5yzSeSJ52jBRVhA%3D' (2024-12-01) • Updated input 'nvim-flake/mnw': 'github:gerg-l/mnw/5d4d187cf739a7d80b3b38646d8dd4ae98f857a8?narHash=sha256-fG8ozQpH48S8WBYilbq4iIZRuVUy2kxQVJs4y4e%2Be/o%3D' (2024-11-23) → 'github:gerg-l/mnw/6841d93fe50eb335da45e11d4dabaa1844f3f79a?narHash=sha256-bc%2BreHXXfdn94MnDsqBrNm2ojOnJfbd64e00nzsP0EI%3D' (2024-12-01) • Updated input 'nvim-flake/neovim-nightly': 'github:nix-community/neovim-nightly-overlay/7461a0b228bb48bb02af086f8b9ee9a83583120b?narHash=sha256-MjqyzOEa6s9OGO8SMh5C2kqo57%2BiSNsgDbzPBbpi4QU%3D' (2024-11-30) → 'github:nix-community/neovim-nightly-overlay/0d545972c93c044bed52c27cc4035054793d913a?narHash=sha256-uA/KX/TVlreFS/xZjjAPBoRzybQQWUX%2BUr5mOzsF7FE%3D' (2024-12-01) • Updated input 'nvim-flake/neovim-nightly/neovim-src': 'github:neovim/neovim/2833925cfc688786759d6a980a1ad62b62d20570?narHash=sha256-JF8zmoLdqmbKCSS5Smf/Yj0jEl5f%2BqKhSubhPo/BvUM%3D' (2024-11-29) → 'github:neovim/neovim/ab9cfc4dc3422af5235759efef456d3e02745217?narHash=sha256-VKk53/3aTk91s1OmSfUt6RqFpxBjUy8ZYoYrechTUns%3D' (2024-11-30) • Updated input 'nvim-flake/neovim-nightly/nixpkgs': 'github:NixOS/nixpkgs/af51545ec9a44eadf3fe3547610a5cdd882bc34e?narHash=sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS%2Bs3NVclJw7YC43w%3D' (2024-11-26) → 'github:NixOS/nixpkgs/4703b8d2c708e13a8cab03d865f90973536dcdf5?narHash=sha256-B5pYT%2BIVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4%3D' (2024-11-30) • Updated input 'spicetify-nix': 'github:Gerg-L/spicetify-nix/0b712938230ab50d2e0cf961cc0f3660f7b18041?narHash=sha256-0at0wkwsaJfJBCGlwtXfg2JdeY30mZXhrWeoNqhLEYc%3D' (2024-11-30) → 'github:Gerg-L/spicetify-nix/c7a940a0152bdd9914c02f8f1eea2697d548cc16?narHash=sha256-hxjD%2BdVnL2W9n1kZlmYAx2ou4ttLgzfPuEdoCsiy7cE%3D' (2024-12-01) --- flake.lock | 136 +++++++++++++++++++---------------------------------- 1 file changed, 48 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 470afaf..095377e 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1722794965, - "narHash": "sha256-4fITQAIxcHeHKjA+/xb5mz2EXAic9jBg0qNS9Xd12Uo=", + "lastModified": 1732994874, + "narHash": "sha256-bpK503lmU1RPtqNhRENjafAdQeGYWUvUaAl7womFuOQ=", "owner": "Gerg-L", "repo": "fetch-rs", - "rev": "b58b827999c2baab8b718a203b5b0569735be9fe", + "rev": "02da86995b637f55faec4df702111acd8b29e700", "type": "github" }, "original": { @@ -237,24 +237,6 @@ "type": "indirect" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_5", @@ -427,11 +409,11 @@ }, "master": { "locked": { - "lastModified": 1732990138, - "narHash": "sha256-Z7NT+HFb/VQqdORpTWIDugrk3dc129jAcuqOLjRiuzA=", + "lastModified": 1733024928, + "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130bb06af1b749f0b53468fc91421c467424a182", + "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", "type": "github" }, "original": { @@ -443,11 +425,11 @@ }, "mnw": { "locked": { - "lastModified": 1732376520, - "narHash": "sha256-fG8ozQpH48S8WBYilbq4iIZRuVUy2kxQVJs4y4e+e/o=", + "lastModified": 1733021555, + "narHash": "sha256-bc+reHXXfdn94MnDsqBrNm2ojOnJfbd64e00nzsP0EI=", "owner": "gerg-l", "repo": "mnw", - "rev": "5d4d187cf739a7d80b3b38646d8dd4ae98f857a8", + "rev": "6841d93fe50eb335da45e11d4dabaa1844f3f79a", "type": "github" }, "original": { @@ -466,11 +448,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1732925246, - "narHash": "sha256-MjqyzOEa6s9OGO8SMh5C2kqo57+iSNsgDbzPBbpi4QU=", + "lastModified": 1733012044, + "narHash": "sha256-uA/KX/TVlreFS/xZjjAPBoRzybQQWUX+Ur5mOzsF7FE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7461a0b228bb48bb02af086f8b9ee9a83583120b", + "rev": "0d545972c93c044bed52c27cc4035054793d913a", "type": "github" }, "original": { @@ -482,11 +464,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732903628, - "narHash": "sha256-JF8zmoLdqmbKCSS5Smf/Yj0jEl5f+qKhSubhPo/BvUM=", + "lastModified": 1732970806, + "narHash": "sha256-VKk53/3aTk91s1OmSfUt6RqFpxBjUy8ZYoYrechTUns=", "owner": "neovim", "repo": "neovim", - "rev": "2833925cfc688786759d6a980a1ad62b62d20570", + "rev": "ab9cfc4dc3422af5235759efef456d3e02745217", "type": "github" }, "original": { @@ -529,11 +511,11 @@ ] }, "locked": { - "lastModified": 1732519917, - "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", + "lastModified": 1733024876, + "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", + "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "type": "github" }, "original": { @@ -549,11 +531,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732982517, - "narHash": "sha256-PeFMHcQVxkMx1Yl25qo9fZVjWTjRbElZLxPpcCCi/wE=", + "lastModified": 1732999881, + "narHash": "sha256-zN7FRz6wpS/5C3RE0wQN0bBtFdgrZv9GUK87cjZ9mDQ=", "owner": "Nobbz", "repo": "nix-janitor", - "rev": "07d6547d69d5d40a9397ddaece76c97f86ed022d", + "rev": "8898c37337465e8a0cc063d8dcfe1079f534c53f", "type": "github" }, "original": { @@ -600,11 +582,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689601424, - "narHash": "sha256-WEqoSflQP65MF9O9k+JEkvUXMEoyCatmMAoLOowcEoE=", + "lastModified": 1732937961, + "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0f2758381caca8b4fb4a6cac61721cc9de06bd9", + "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", "type": "github" }, "original": { @@ -632,20 +614,14 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", - "type": "github" + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-regression": { @@ -682,11 +658,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { @@ -698,11 +674,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732617236, - "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", + "lastModified": 1732937961, + "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", + "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", "type": "github" }, "original": { @@ -722,11 +698,11 @@ ] }, "locked": { - "lastModified": 1732940475, - "narHash": "sha256-Hobt5yUAGoEWvgCVBJ5y0+morq6TMUZB9lKKe3zQq58=", + "lastModified": 1733026985, + "narHash": "sha256-DtdrZiRh5rapnBHl5r/uG0GFNuZi5yzSeSJ52jBRVhA=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "628b7dc449230380060c53c9761bb081915b428d", + "rev": "dd1ef9594c5ebaf6a3856f99f1f3b85b09b47eba", "type": "github" }, "original": { @@ -740,11 +716,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -842,15 +818,14 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1715998563, - "narHash": "sha256-krjs9VkDoRrYNQVyCTXUGUfAJziCk0Fkki1ZnnmNgjk=", + "lastModified": 1732933841, + "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4731829dec4859921bfc0e1548478207d6c9c8fa", + "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", "type": "github" }, "original": { @@ -887,11 +862,11 @@ ] }, "locked": { - "lastModified": 1732940172, - "narHash": "sha256-0at0wkwsaJfJBCGlwtXfg2JdeY30mZXhrWeoNqhLEYc=", + "lastModified": 1733026768, + "narHash": "sha256-hxjD+dVnL2W9n1kZlmYAx2ou4ttLgzfPuEdoCsiy7cE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0b712938230ab50d2e0cf961cc0f3660f7b18041", + "rev": "c7a940a0152bdd9914c02f8f1eea2697d548cc16", "type": "github" }, "original": { @@ -936,21 +911,6 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "unstable": { "locked": { "lastModified": 1732837521,