mirror of
https://github.com/youwen5/nixos.git
synced 2025-01-17 20:52:09 -08:00
chore: reintegrate with main
This commit is contained in:
parent
593f2c75cb
commit
09c348eea1
3 changed files with 23 additions and 9 deletions
28
flake.lock
28
flake.lock
|
@ -791,16 +791,32 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736344531,
|
"lastModified": 1734978744,
|
||||||
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
|
"narHash": "sha256-R80xsDCKZOPJv5T+fB5G1ZVgS/51tJgUenGmGFjZat4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
|
"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": 1736320768,
|
||||||
|
"narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -1191,9 +1207,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"
|
||||||
},
|
},
|
||||||
|
|
|
@ -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/b74a56e2acce8fe88a575287a20ac196d8d01938";
|
||||||
# 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";
|
||||||
|
@ -67,7 +67,6 @@
|
||||||
|
|
||||||
viminal = {
|
viminal = {
|
||||||
url = "git+https://code.youwen.dev/youwen5/viminal2";
|
url = "git+https://code.youwen.dev/youwen5/viminal2";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
vesktop-bin = {
|
vesktop-bin = {
|
||||||
|
|
|
@ -6,4 +6,5 @@ final: prev: {
|
||||||
modrinth-app = callPackage ./by-name/modrinth-app { };
|
modrinth-app = callPackage ./by-name/modrinth-app { };
|
||||||
rdrview = callPackage ./by-name/rdrview { };
|
rdrview = callPackage ./by-name/rdrview { };
|
||||||
wine-discord-ipc-bridge = callPackage ./by-name/wine-discord-ipc-bridge { };
|
wine-discord-ipc-bridge = callPackage ./by-name/wine-discord-ipc-bridge { };
|
||||||
|
hyprland-qtutils = callPackage ./by-name/hyprland-qtutils { };
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue