Merge remote-tracking branch 'origin/asahi-safe'

This commit is contained in:
Youwen Wu 2025-01-10 13:26:49 -08:00
commit 3dca28c8f2
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
2 changed files with 22 additions and 8 deletions

View file

@ -778,16 +778,32 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1735834308, "lastModified": 1734978744,
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "narHash": "sha256-R80xsDCKZOPJv5T+fB5G1ZVgS/51tJgUenGmGFjZat4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6df24922a1400241dae323af55f30e4318a6ca65", "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "repo": "nixpkgs",
"rev": "b74a56e2acce8fe88a575287a20ac196d8d01938",
"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", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1160,9 +1176,7 @@
"viminal": { "viminal": {
"inputs": { "inputs": {
"nixCats": "nixCats", "nixCats": "nixCats",
"nixpkgs": [ "nixpkgs": "nixpkgs_3",
"nixpkgs"
],
"plugins-blink-ripgrep": "plugins-blink-ripgrep", "plugins-blink-ripgrep": "plugins-blink-ripgrep",
"plugins-pomo-nvim": "plugins-pomo-nvim" "plugins-pomo-nvim": "plugins-pomo-nvim"
}, },

View file

@ -2,7 +2,7 @@
description = "System configuration flake."; description = "System configuration flake.";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs";
# stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# bleedingpkgs.url = "github:nixos/nixpkgs/master"; # bleedingpkgs.url = "github:nixos/nixpkgs/master";
# nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; # nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";