colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NixOS] Tweak lock file

Browse Source
This commit is contained in:
Ivan Malison 2021-07-17 15:47:04 -06:00
parent bd6a19a769
commit ad5c70c957
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
nixos/flake.lock
View File

@ -2,7 +2,7 @@
"nodes": {
"gitIgnoreNix": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1626413882,
@ -21,7 +21,7 @@
},
"gitIgnoreNix_2": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1626413882,
@ -39,7 +39,7 @@
},
"gitIgnoreNix_3": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1626413882,
@ -58,7 +58,7 @@
"home-manager": {
"inputs": {
"nixpkgs": [
"my_unstable"
"nixpkgs"
]
},
"locked": {
@ -88,22 +88,11 @@
"type": "github"
}
},
"my_unstable": {
"locked": {
"narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
"path": "./nixpkgs",
"type": "path"
},
"original": {
"path": "./nixpkgs",
"type": "path"
}
},
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": [
"my_unstable"
"nixpkgs"
]
},
"locked": {
@ -139,12 +128,12 @@
"nixpkgs": {
"locked": {
"narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
"path": "/nix/store/z30j15qd7l90y8c9fb3nd2703g65dskp-source",
"path": "./nixpkgs",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
"path": "./nixpkgs",
"type": "path"
}
},
"nixpkgs_2": {
@ -169,12 +158,23 @@
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
"path": "/nix/store/z30j15qd7l90y8c9fb3nd2703g65dskp-source",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"my_unstable": "my_unstable",
"nix": "nix",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"taffybar": "taffybar",
"xmonad": "xmonad",
"xmonad-contrib": "xmonad-contrib"
@ -184,7 +184,7 @@
"inputs": {
"gitIgnoreNix": "gitIgnoreNix",
"nixpkgs": [
"my_unstable"
"nixpkgs"
]
},
"locked": {
@ -201,7 +201,7 @@
"inputs": {
"gitIgnoreNix": "gitIgnoreNix_2",
"nixpkgs": [
"my_unstable"
"nixpkgs"
]
},
"locked": {
@ -218,7 +218,7 @@
"inputs": {
"gitIgnoreNix": "gitIgnoreNix_3",
"nixpkgs": [
"my_unstable"
"nixpkgs"
]
},
"locked": {

22
nixos/flake.nix
View File

@ -3,30 +3,30 @@
nixos-hardware.url = github:nixos/nixos-hardware;
nix = {
url = github:IvanMalison/nix/master;
inputs.nixpkgs.follows = "my_unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
my_unstable = {
nixpkgs = {
url = path:./nixpkgs;
};
home-manager = {
url = path:./home-manager;
inputs.nixpkgs.follows = "my_unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
xmonad-contrib = {
url = path:../dotfiles/config/xmonad/xmonad-contrib;
inputs.nixpkgs.follows = "my_unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
xmonad = {
url = path:../dotfiles/config/xmonad/xmonad;
inputs.nixpkgs.follows = "my_unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
taffybar = {
url = path:../dotfiles/config/taffybar/taffybar;
inputs.nixpkgs.follows = "my_unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
self, nix, my_unstable, nixos-hardware, home-manager, taffybar, xmonad,
self, nix, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad,
xmonad-contrib
}:
let forAll = ({ ... }: {
@ -34,7 +34,7 @@
extraOptions = ''
experimental-features = nix-command flakes
'';
registry.nixpkgs.flake = my_unstable;
registry.nixpkgs.flake = nixpkgs;
};
nixpkgs.overlays = [
nix.overlay taffybar.overlay xmonad.overlay xmonad-contrib.overlay
@ -51,15 +51,15 @@
in
{
nixosConfigurations = {
ivanm-dfinity-razer = my_unstable.lib.nixosSystem {
ivanm-dfinity-razer = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ forAll ./machines/ivanm-dfinity-razer.nix ];
};
ryzen-shine = my_unstable.lib.nixosSystem {
ryzen-shine = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ forAll ./machines/ryzen-shine.nix ];
};
biskcomp = my_unstable.lib.nixosSystem {
biskcomp = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [ forAll piHardware ./machines/biskcomp.nix ];
};