From e1d9146c8304d31a4d6f791742ec174b5250e046 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Mon, 6 Jan 2025 12:08:16 -0800 Subject: [PATCH 1/4] fix: switch back to safe asahi nixpkgs --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1b3c5fd..54fbc7b 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "System configuration flake."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable/b74a56e2acce8fe88a575287a20ac196d8d01938"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # bleedingpkgs.url = "github:nixos/nixpkgs/master"; # nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; From 0f8e87a78a304a3ddd6dc3bcb5e4432c62b31f28 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Mon, 6 Jan 2025 12:08:50 -0800 Subject: [PATCH 2/4] fixup! fix: switch back to safe asahi nixpkgs --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 54fbc7b..1c7b482 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "System configuration flake."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable/b74a56e2acce8fe88a575287a20ac196d8d01938"; + nixpkgs.url = "github:nixos/nixpkgs/b74a56e2acce8fe88a575287a20ac196d8d01938"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # bleedingpkgs.url = "github:nixos/nixpkgs/master"; # nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; From 0c3c810942bbab5f35b3a502cb00315b448897e7 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Mon, 6 Jan 2025 12:10:30 -0800 Subject: [PATCH 3/4] fixup! fixup! fix: switch back to safe asahi nixpkgs --- flake.lock | 8 ++++---- flake.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index c750089..aee2c4b 100644 --- a/flake.lock +++ b/flake.lock @@ -778,17 +778,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1734978744, + "narHash": "sha256-R80xsDCKZOPJv5T+fB5G1ZVgS/51tJgUenGmGFjZat4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 1c7b482..5b5ca43 100755 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,6 @@ viminal = { url = "git+https://code.youwen.dev/youwen5/viminal2"; - inputs.nixpkgs.follows = "nixpkgs"; }; vesktop-bin = { From aced88b0a60931e0a93fafa819060b0e659158ce Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Wed, 8 Jan 2025 12:05:26 -0800 Subject: [PATCH 4/4] chore: sync flake.lock --- flake.lock | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index aee2c4b..74f3c1a 100644 --- a/flake.lock +++ b/flake.lock @@ -792,6 +792,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1736042175, + "narHash": "sha256-jdd5UWtLVrNEW8K6u5sy5upNAFmF3S4Y+OIeToqJ1X8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bf689c40d035239a489de5997a4da5352434632e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plugins-blink-ripgrep": { "flake": false, "locked": { @@ -1160,9 +1176,7 @@ "viminal": { "inputs": { "nixCats": "nixCats", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "plugins-blink-ripgrep": "plugins-blink-ripgrep", "plugins-pomo-nvim": "plugins-pomo-nvim" },