From b2db1b524d935f3a86e892c5946d3fff3daa913e Mon Sep 17 00:00:00 2001 From: kiri Date: Sun, 30 Nov 2025 01:24:55 +0100 Subject: [PATCH] Update flake inputs --- flake.lock | 433 +++++++++-------------------------------------------- flake.nix | 66 +++++--- 2 files changed, 114 insertions(+), 385 deletions(-) diff --git a/flake.lock b/flake.lock index 414ea24..428ae29 100644 --- a/flake.lock +++ b/flake.lock @@ -124,17 +124,19 @@ }, "copyparty": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1764155739, - "narHash": "sha256-WVhJZiZ8VsTMAYYPYO0MpvMt2h2wgge15MLDZUrRMWE=", + "lastModified": 1764399292, + "narHash": "sha256-9owZJMGhnBEwS/o/KkhpUPGx2l7Px360/4qD08mEaoE=", "owner": "9001", "repo": "copyparty", - "rev": "c7345308f5ef0e4375c9d6a305d4b8e14c9d7a5a", + "rev": "3f4b79ffb8e02a7808fb0171fc9c49e93d250944", "type": "github" }, "original": { @@ -150,11 +152,11 @@ ] }, "locked": { - "lastModified": 1764110879, - "narHash": "sha256-xanUzIb0tf3kJ+PoOFmXEXV1jM3PjkDT/TQ5DYeNYRc=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "aecba248f9a7d68c5d1ed15de2d1c8a4c994a3c5", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -163,25 +165,6 @@ "type": "github" } }, - "eleakxir": { - "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1762173278, - "narHash": "sha256-rw+n05+dgC1rLpQR5RKRTM57RPTuhjyVVsV4bvsbZc4=", - "owner": "anotherhadi", - "repo": "eleakxir", - "rev": "7a29929eb3bd0f89f2fd654405f9680bfd084151", - "type": "github" - }, - "original": { - "owner": "anotherhadi", - "repo": "eleakxir", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -214,56 +197,16 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1751685974, - "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", - "ref": "refs/heads/main", - "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", - "revCount": 92, - "type": "git", - "url": "https://git.lix.systems/lix-project/flake-compat.git" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/flake-compat.git" - } - }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "nvf", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -291,12 +234,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -325,7 +271,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -405,32 +351,11 @@ ] }, "locked": { - "lastModified": 1764194569, - "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750798083, - "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { @@ -507,17 +432,19 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_3", "xdph": "xdph" }, "locked": { - "lastModified": 1764258724, - "narHash": "sha256-frlRI04fRjujZgx1UjZbIeleQdc7hSqqgn5q+0/2O3M=", + "lastModified": 1764451009, + "narHash": "sha256-EYJ1FVbr5Zg8bsyHq7Im3WY4IDmsjGtWwPvRclhf6d8=", "ref": "refs/heads/main", - "rev": "a51918fd275badfa2b68d7c25fc7f4555a4a468e", - "revCount": 6657, + "rev": "f11cf6f1de708b6b3811788e8ff7984ff05a9546", + "revCount": 6663, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -631,8 +558,10 @@ "hyprpanel": { "inputs": { "flake-utils": "flake-utils_3", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3" + "home-manager": [ + "home-manager" + ], + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1762493267, @@ -750,21 +679,6 @@ "type": "github" } }, - "mnw": { - "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", - "owner": "Gerg-L", - "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "mnw", - "type": "github" - } - }, "nixCats": { "locked": { "lastModified": 1764009888, @@ -780,33 +694,13 @@ "type": "github" } }, - "nixarr": { - "inputs": { - "nixpkgs": "nixpkgs_4", - "vpnconfinement": "vpnconfinement", - "website-builder": "website-builder" - }, - "locked": { - "lastModified": 1764066022, - "narHash": "sha256-YY9UdoNN/Iu9HTYsUWuZQiuRyQYOtcvnsT5X/+LuV1M=", - "owner": "rasmus-kirk", - "repo": "nixarr", - "rev": "3ea7ad8a1ca9d67df206cda19775ce711a55add4", - "type": "github" - }, - "original": { - "owner": "rasmus-kirk", - "repo": "nixarr", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1764080039, - "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da17006633ca9cda369be82893ae36824a2ddf1a", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -817,38 +711,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1750776420, "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", @@ -864,93 +726,28 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs-lib": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_2": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1761880412, - "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -985,28 +782,6 @@ "type": "github" } }, - "nvf": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "mnw": "mnw", - "nixpkgs": "nixpkgs_6", - "systems": "systems_5" - }, - "locked": { - "lastModified": 1762622004, - "narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", - "owner": "notashelf", - "repo": "nvf", - "rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", - "type": "github" - }, - "original": { - "owner": "notashelf", - "repo": "nvf", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -1035,26 +810,26 @@ "community-website": "community-website", "copyparty": "copyparty", "disko": "disko", - "eleakxir": "eleakxir", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "hyprland": "hyprland", "hyprpanel": "hyprpanel", "nixCats": "nixCats", - "nixarr": "nixarr", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", - "nvf": "nvf", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "stylix": "stylix", "vicinae": "vicinae", - "zen-browser": "zen-browser", "zentire-website": "zentire-website" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1764021963, @@ -1075,7 +850,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1763985453, @@ -1098,11 +873,15 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_2", + "flake-parts": [ + "flake-parts" + ], "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_8", + "nixpkgs": [ + "nixpkgs" + ], "nur": "nur", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1110,11 +889,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764254063, - "narHash": "sha256-V22JzkaTLF/GAL2LgqvOsJhAr8JbJsKaD8hnHjGwXfE=", + "lastModified": 1764451865, + "narHash": "sha256-d4tfTm3ccp4rx7W1WW1BzSkTgEeMd4cZvhAJ7lP145M=", "owner": "danth", "repo": "stylix", - "rev": "a1451bc40413870f0c7b576b751c1ca92055e323", + "rev": "8a096ccec828c68bfb870295d186ad994ea0ae2c", "type": "github" }, "original": { @@ -1243,21 +1022,6 @@ "type": "github" } }, - "systems_9": { - "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": { @@ -1341,8 +1105,10 @@ }, "vicinae": { "inputs": { - "nixpkgs": "nixpkgs_9", - "systems": "systems_8" + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_7" }, "locked": { "lastModified": 1763934927, @@ -1358,42 +1124,6 @@ "type": "github" } }, - "vpnconfinement": { - "locked": { - "lastModified": 1759956062, - "narHash": "sha256-NUZu0Rb0fwUjfdp51zMm0xM3lcK8Kw4c97LLog7+JjA=", - "owner": "Maroka-chan", - "repo": "VPN-Confinement", - "rev": "fabe7247b720b5eb4c3c053e24a2b3b70e64c52b", - "type": "github" - }, - "original": { - "owner": "Maroka-chan", - "repo": "VPN-Confinement", - "type": "github" - } - }, - "website-builder": { - "inputs": { - "nixpkgs": [ - "nixarr", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753958235, - "narHash": "sha256-Rd27XQJKv8Z4BCr3gdbaHFd0TmumiGxdjGRzsEf/mOg=", - "owner": "rasmus-kirk", - "repo": "website-builder", - "rev": "00a14b7ae7baef2197978ba7c3fe72dfca7bc475", - "type": "github" - }, - "original": { - "owner": "rasmus-kirk", - "repo": "website-builder", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1435,29 +1165,6 @@ "type": "github" } }, - "zen-browser": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764217570, - "narHash": "sha256-vgqUC6lI/gW70uekA0bpNFU6yR0tcZRfLIZcxGfN76g=", - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "rev": "3dc281d86044322f9182b20abbc21db8824c130a", - "type": "github" - }, - "original": { - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "type": "github" - } - }, "zentire-website": { "inputs": { "flake-utils": "flake-utils_4", diff --git a/flake.nix b/flake.nix index b036253..e374e3a 100644 --- a/flake.nix +++ b/flake.nix @@ -6,42 +6,64 @@ ''; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # NixOS + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; - stylix.url = "github:danth/stylix"; - #apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; - sops-nix.url = "github:Mic92/sops-nix"; - nixarr.url = "github:rasmus-kirk/nixarr"; - vicinae.url = "github:vicinaehq/vicinae"; - nvf.url = "github:notashelf/nvf"; + + # Home Manager home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + + # Flakes + flake-utils.url = "github:numtide/flake-utils"; + flake-parts.url = "github:hercules-ci/flake-parts"; + + # Others + nixCats.url = "github:BirdeeHub/nixCats-nvim"; + + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + }; + + hyprland = { + url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + hyprpanel = { + url = "github:Jas-SinghFSU/HyprPanel"; + inputs.home-manager.follows = "home-manager"; + }; + + vicinae = { + url = "github:vicinaehq/vicinae"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - eleakxir.url = "github:anotherhadi/eleakxir"; - zen-browser = { - url = "github:0xc000022070/zen-browser-flake"; - inputs = { - nixpkgs.follows = "nixpkgs"; - home-manager.follows = "home-manager"; - }; + + copyparty = { + url = "github:9001/copyparty"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; }; + disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - copyparty = { - url = "github:9001/copyparty"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nixCats.url = "github:BirdeeHub/nixCats-nvim"; # Websites community-website = {