From bae5c73b90a0cf00666fc630fb9a952848f4b3d1 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Fri, 12 Sep 2025 13:09:12 +0200 Subject: [PATCH] update flake --- flake.lock | 81 ++++++++++++++++++++++-------------------------------- flake.nix | 9 ++++-- 2 files changed, 39 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 3e1284c..751dbaa 100644 --- a/flake.lock +++ b/flake.lock @@ -920,7 +920,9 @@ }, "niri": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, "locked": { @@ -985,7 +987,7 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1757639838, @@ -1064,22 +1066,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1756911493, - "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1756819007, "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", @@ -1160,22 +1146,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1754028485, "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", @@ -1191,23 +1161,23 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757674516, + "narHash": "sha256-U4BVKgXJ8XJuWRpDGzyyTxEzPTehGiYACF6DiBUHWi0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "7f9bf6f84462128090b4ba3a7be6966bbf31b28e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -1223,9 +1193,25 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1756911493, + "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixsg": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1746574841, @@ -1337,19 +1323,18 @@ "inputs": { "booktheme": "booktheme", "export_templates": "export_templates", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1757509969, - "narHash": "sha256-REVjNzIxTBRRlPyCHAE48zOi+uh4Kl6CSruZjqPxneA=", + "lastModified": 1757673940, + "narHash": "sha256-TdaSqVyU8dPM8ututTvMVbCWA+IMBejV7ya50e/fLU4=", "owner": "itepastra", "repo": "Quantum-surface-application", - "rev": "b8664751b6c88fdf9b6f18151f46c432f21403ee", + "rev": "22342cb7e1fb14385938c6ae787509793754e90b", "type": "github" }, "original": { "owner": "itepastra", - "ref": "qubit-controls", "repo": "Quantum-surface-application", "type": "github" } @@ -1368,7 +1353,7 @@ "lix-module": "lix-module", "niri": "niri", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixsg": "nixsg", "qubit-quilt": "qubit-quilt", "stylix": "stylix", @@ -1405,7 +1390,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "nur": "nur", "systems": "systems_7", "tinted-foot": "tinted-foot", diff --git a/flake.nix b/flake.nix index 0ca86f6..8f9efc3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/master"; # nix based ssg nixsg.url = "github:itepastra/nixsg/no-md-parser"; @@ -44,7 +44,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; # scrolling window manager - niri.url = "github:YaLTeR/niri"; + niri = { + url = "github:YaLTeR/niri"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # alternative nix implementation lix = { url = "git+https://git.lix.systems/lix-project/lix.git"; @@ -57,7 +60,7 @@ inputs.lix.follows = "lix"; }; qubit-quilt = { - url = "github:itepastra/Quantum-surface-application/qubit-controls"; + url = "github:itepastra/Quantum-surface-application"; }; # declarative vencord client nixcord.url = "github:kaylorben/nixcord";