parent
c2a28c043c
commit
1f45209acb
16
flake.lock
16
flake.lock
|
@ -267,6 +267,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-master": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1656851669,
|
||||||
|
"narHash": "sha256-PA3tWTz372vExgjxvbHV2xdCFOJx3XHcR77/kPF8jbA=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "9cd6911860e620e45da58b098703876d950f4e38",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"ref": "master",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1648219316,
|
"lastModified": 1648219316,
|
||||||
|
@ -482,6 +497,7 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"mara": "mara",
|
"mara": "mara",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
"printerfacts": "printerfacts",
|
"printerfacts": "printerfacts",
|
||||||
"rhea": "rhea",
|
"rhea": "rhea",
|
||||||
"utils": "utils_4",
|
"utils": "utils_4",
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
utils.url = "github:numtide/flake-utils";
|
utils.url = "github:numtide/flake-utils";
|
||||||
emacs-overlay.url = "github:nix-community/emacs-overlay";
|
emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||||
|
nixpkgs-master.url = "nixpkgs/master";
|
||||||
|
|
||||||
wsl = {
|
wsl = {
|
||||||
url = "github:nix-community/NixOS-WSL";
|
url = "github:nix-community/NixOS-WSL";
|
||||||
|
@ -43,9 +44,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, printerfacts, mara
|
outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, printerfacts, mara
|
||||||
, rhea, waifud, emacs-overlay, wsl, x, ... }:
|
, rhea, waifud, emacs-overlay, wsl, x, nixpkgs-master, ... }:
|
||||||
let
|
let
|
||||||
pkgs = nixpkgs.legacyPackages."x86_64-linux";
|
pkgs = nixpkgs.legacyPackages."x86_64-linux";
|
||||||
|
pkgsMaster = nixpkgs-master.legacyPackages."x86_64-linux";
|
||||||
|
|
||||||
mkSystem = extraModules:
|
mkSystem = extraModules:
|
||||||
nixpkgs.lib.nixosSystem rec {
|
nixpkgs.lib.nixosSystem rec {
|
||||||
|
@ -61,7 +63,9 @@
|
||||||
|
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
nixpkgs.overlays = [ emacs-overlay.overlay ];
|
nixpkgs.overlays = [
|
||||||
|
emacs-overlay.overlay
|
||||||
|
];
|
||||||
})
|
})
|
||||||
./common
|
./common
|
||||||
|
|
||||||
|
@ -77,6 +81,7 @@
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
deploy-rs.packages.x86_64-linux.deploy-rs
|
deploy-rs.packages.x86_64-linux.deploy-rs
|
||||||
agenix.packages.x86_64-linux.agenix
|
agenix.packages.x86_64-linux.agenix
|
||||||
|
pkgsMaster.vim
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue