petrichor
/
boxen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meta: use standard "nixpkgs" instead of "nixos"

This commit is contained in:
Jez Cope 2021-09-22 13:31:11 +01:00
parent ca406b440e
commit 6cdac58f71
3 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.nix
View File

@ -30,7 +30,7 @@
options = "--delete-older-than 14d";
};
registry = {
current.flake = inputs.nixos;
nixpkgs.flake = inputs.nixpkgs;
nur.flake = inputs.nur;
};
};

8
flake.lock
View File

@ -33,7 +33,7 @@
"home-manager": {
"inputs": {
"nixpkgs": [
"nixos"
"nixpkgs"
]
},
"locked": {
@ -50,7 +50,7 @@
"type": "github"
}
},
"nixos": {
"nixpkgs": {
"locked": {
"lastModified": 1631962327,
"narHash": "sha256-h2fgtNHozEcB42BQ1QVWAJUpQ1FA3gpgq/RrOKAxbfE=",
@ -84,7 +84,7 @@
"inputs": {
"emacs-overlay": "emacs-overlay",
"home-manager": "home-manager",
"nixos": "nixos",
"nixpkgs": "nixpkgs",
"nur": "nur",
"sc3plugins": "sc3plugins"
}
@ -93,7 +93,7 @@
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixos"
"nixpkgs"
]
},
"locked": {

65
flake.nix
View File

@ -2,51 +2,50 @@
description = "My NixOS configuration";
inputs = {
nixos.url = "nixpkgs/nixos-unstable";
nixpkgs.url = "nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixos";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nur.url = "github:nix-community/NUR";
emacs-overlay.url = "github:nix-community/emacs-overlay";
sc3plugins.url =
"git+https://tildegit.org/petrichor/sc3plugins-nix.git?ref=main";
sc3plugins.inputs.nixpkgs.follows = "nixos";
sc3plugins.inputs.nixpkgs.follows = "nixpkgs";
};
outputs =
{ self, nixos, home-manager, nur, emacs-overlay, sc3plugins }@inputs: {
{ self, nixpkgs, home-manager, nur, emacs-overlay, sc3plugins }@inputs:
with nixpkgs.lib; {
nixosConfigurations = genAttrs [ "arianrhod" "gwydion" ] (hostName:
nixosSystem {
system = "x86_64-linux";
modules = [
./profiles
./configuration.nix
(./hosts + "/${hostName}")
(./secrets + "/${hostName}.nix")
nixosConfigurations =
nixos.lib.attrsets.genAttrs [ "arianrhod" "gwydion" ] (hostName:
nixos.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./profiles
./configuration.nix
(./hosts + "/${hostName}")
(./secrets + "/${hostName}.nix")
{
nixpkgs.overlays = [
nur.overlay
emacs-overlay.overlay
(final: prev: {
inherit (sc3plugins.packages.x86_64-linux)
supercolliderWithPlugins;
})
];
}
{
nixpkgs.overlays = [
nur.overlay
emacs-overlay.overlay
(final: prev: {
inherit (sc3plugins.packages.x86_64-linux)
supercolliderWithPlugins;
})
];
}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = false;
home-manager.users.jez = import ./home;
}
];
specialArgs = { inherit inputs hostName; };
});
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = false;
home-manager.users.jez = import ./home;
}
];
specialArgs = { inherit inputs hostName; };
});
};
}