mynix/system
1
1
Fork 0
Code Issues 2 Pull requests Activity

nix: fix overlays

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2023-03-31 15:20:17 +03:00
parent 6ed972043e
commit 9eb203cdbc
Signed by: pleshevskiy
GPG key ID: 79C4487B44403985
4 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock
View file

@ -466,22 +466,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1680122840,
"narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a575c243c23e2851b78c00e9fa245232926ec32f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1680110233, "lastModified": 1680110233,
@ -498,6 +482,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1680122840,
"narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a575c243c23e2851b78c00e9fa245232926ec32f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nlsp-settings-nvim": { "nlsp-settings-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {

2
flake.nix
View file

@ -113,7 +113,7 @@
}; };
}) })
// { // {
overlays.default = import ./packages; overlays.default = final: prev: import ./packages { inherit (prev) lib callPackage; };
nixosConfigurations = nixosConfigurations =
nixpkgs.lib.mapAttrs nixpkgs.lib.mapAttrs

2
nixos/modules/nix.nix
View file

@ -29,7 +29,7 @@ in
(pkg: elem (lib.getName pkg) cfg.allowUnfreePackages); (pkg: elem (lib.getName pkg) cfg.allowUnfreePackages);
nixpkgs.overlays = lib.mkBefore [ nixpkgs.overlays = lib.mkBefore [
# inputs.self.overlays.default inputs.self.overlays.default
(final: prev: { (final: prev: {
unstable = import inputs.nixpkgs-unstable { unstable = import inputs.nixpkgs-unstable {
inherit (config.nixpkgs) config overlays system; inherit (config.nixpkgs) config overlays system;

11
packages/default.nix
View file

@ -1,10 +1,7 @@
{ lib, callPackage }: { lib, callPackage }:
lib.mkMerge [ (import ./woodpecker { inherit callPackage; }) //
(callPackage ./woodpecker { }) {
myip = callPackage ./myip.nix { };
{ }
myip = callPackage ./myip.nix { };
}
]