bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better nix flake configuration

Browse source
This commit is contained in:
Filippo Berto 2022-10-04 14:44:56 +02:00
parent 4627af9181
commit 4fca5c8cb1
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
6 changed files with 22 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

5
baldur/configuration.nix
View file

@ -257,11 +257,6 @@ with lib; {
'';
# nixpkgs.config.allowUnfree = true;
# nix = {
# package = pkgs.nixFlakes;
# extraOptions = optionalString (config.nix.package == pkgs.nixFlakes)
# "experimental-features = nix-command flakes";
# };
# system.autoUpgrade = {
# enable = true;

34
flake.lock generated
View file

@ -41,7 +41,9 @@
"flake-utils": [
"flake-utils"
],
"nixpkgs": "nixpkgs",
"nixpkgs": [
"nixpkgs-u"
],
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
@ -75,16 +77,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1653931853,
"narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=",
"owner": "nixos",
"lastModified": 1663760840,
"narHash": "sha256-ym5Iycs5H4cOaLfE2/vC0tsLp8XuBJQIHGV8/uXSy8M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457",
"rev": "9bdbbaa634aa666eb6a27096bdcb991c59181244",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"owner": "NixOS",
"ref": "release-22.05",
"repo": "nixpkgs",
"type": "github"
}
@ -105,22 +107,6 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1663760840,
"narHash": "sha256-ym5Iycs5H4cOaLfE2/vC0tsLp8XuBJQIHGV8/uXSy8M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9bdbbaa634aa666eb6a27096bdcb991c59181244",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-utils": [
@ -175,7 +161,7 @@
"home-manager": "home-manager",
"nix-rice": "nix-rice",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nixpkgs-u": "nixpkgs-u",
"pre-commit-hooks": "pre-commit-hooks_2",
"tex2nix": "tex2nix"

17
flake.nix
View file

@ -20,7 +20,7 @@
nix-rice = {
url = "github:bertof/nix-rice";
inputs = {
inxpkgs.follows = "nixpkgs-u";
nixpkgs.follows = "nixpkgs-u";
flake-utils.follows = "flake-utils";
};
};
@ -86,6 +86,13 @@
};
pkgs = s: import nixpkgs (nixpkgsSettings s);
pkgs-u = s: import nixpkgs-u (nixpkgsSettings s);
nixModule = system: { pkgs, ... }: {
nixpkgs = nixpkgsSettings { inherit system; };
nix = {
package = pkgs.unstable.nixVersions.stable;
extraOptions = "experimental-features = nix-command flakes";
};
};
homeManagerSettings = {
home-manager = {
useGlobalPkgs = true;
@ -126,7 +133,7 @@
odinIntelBuilder = { extraModules ? [ ] }:
nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
modules = [ (nixModule system) ]
++ commonBaseModules ++ odinBaseModules ++ odinIntelModules
++ (homeManagerModules { bertof = import ./odin/hm.nix; })
++ extraModules;
@ -134,7 +141,7 @@
odinNvidiaBuilder = { extraModules ? [ ] }:
nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
modules = [ (nixModule system) ]
++ commonBaseModules ++ odinBaseModules ++ odinNvidiaModules
++ (homeManagerModules { bertof = import ./odin/hm.nix; })
++ extraModules;
@ -153,7 +160,7 @@
thorBuilder = { extraModules ? [ ] }:
nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
modules = [ (nixModule system) ]
++ commonBaseModules ++ thorBaseModules
++ (homeManagerModules { bertof = import ./thor/hm.nix; })
++ extraModules;
@ -168,7 +175,7 @@
lokiBuilder = { extraModules ? [ ] }:
nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
modules = [ (nixModule system) ]
++ commonBaseModules ++ lokiBaseModules
++ (homeManagerModules { bertof = import ./loki/hm.nix; })
++ extraModules;

5
loki/configuration.nix
View file

@ -401,11 +401,6 @@ with lib; {
'';
nixpkgs.config.allowUnfree = true;
nix = {
package = pkgs.nixFlakes;
extraOptions = optionalString (config.nix.package == pkgs.nixFlakes)
"experimental-features = nix-command flakes";
};
system.autoUpgrade = {
enable = true;

5
odin/common_configuration.nix
View file

@ -285,11 +285,6 @@ with lib; {
steam = pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ icu ]; };
};
};
nix = {
package = pkgs.nixFlakes;
extraOptions = lib.optionalString (config.nix.package == pkgs.nixFlakes)
"experimental-features = nix-command flakes";
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions

4
thor/configuration.nix
View file

@ -209,10 +209,6 @@ with lib; {
};
# cudaSupport = true;
};
nix = {
package = pkgs.nixFlakes;
extraOptions = "experimental-features = nix-command flakes";
};
system.stateVersion = "21.05"; # Did you read the comment?
}