Substitute out nix core settings

This commit is contained in:
Tobias Ostner 2023-11-28 08:32:08 +01:00
parent 1350635af0
commit 2ec4b32561
4 changed files with 48 additions and 17 deletions

29
.config/nix/flake.lock generated
View file

@ -3,7 +3,7 @@
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-darwin"
] ]
}, },
"locked": { "locked": {
@ -23,7 +23,7 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-darwin"
] ]
}, },
"locked": { "locked": {
@ -43,16 +43,30 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1698931758, "lastModified": 1700977043,
"narHash": "sha256-pwl9xS9JFMXXR1lUP/QOqO9hiZKukEcVUU1A0DKQwi4=", "narHash": "sha256-tX4d36Bq75NBjnYGaCO9b403VDpdFa99NtdUPQ4EALk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "abbe047fb8a5a7074b6de24cced0dbdb27ea0ea8",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs-darwin": {
"locked": {
"lastModified": 1701088922,
"narHash": "sha256-TZo37reWHGhII5hYtvBPsovQtd+I5XivUENhqQjNw3c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b644d97bda6dae837d577e28383c10aa51e5e2d2", "rev": "fa1c8834c9fe613fe3f84d6c524bb1779e50cd6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixpkgs-23.11-darwin",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -61,7 +75,8 @@
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-darwin": "nixpkgs-darwin"
} }
} }
}, },

View file

@ -1,12 +1,24 @@
{ {
nixConfig.experimental-features = [ "nix-command" "flakes" ]; nixConfig = {
substituters = [
"https://mirrors.ustc.edu.cn/nix-channels/store"
"https://cache.nixos.org"
];
};
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager/master"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.11-darwin";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
darwin.url = "github:lnl7/nix-darwin"; darwin = {
darwin.inputs.nixpkgs.follows = "nixpkgs"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs-darwin";
};
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs-darwin";
};
}; };
outputs = inputs@{ nixpkgs, home-manager, darwin, ... }: { outputs = inputs@{ nixpkgs, home-manager, darwin, ... }: {
@ -19,12 +31,14 @@
}; };
modules = [ modules = [
./modules/nix-core.nix
./modules/darwin ./modules/darwin
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = inputs;
users.tobi.imports = [ ./modules/home-manager ]; users.tobi.imports = [ ./modules/home-manager ];
}; };
} }

View file

@ -1,5 +1,4 @@
({ pkgs, ... }: { ({ pkgs, ... }: {
services.nix-daemon.enable = true;
programs.zsh.enable = true; programs.zsh.enable = true;
@ -21,9 +20,6 @@
]; ];
}) })
]; ];
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
system.defaults = { system.defaults = {
dock.autohide = true; dock.autohide = true;

View file

@ -0,0 +1,6 @@
{ pkgs, ... }:
{
nix.settings.experimental-features = [ "nix-command" "flakes" ];
services.nix-daemon.enable = true;
programs.nix-index.enable = true;
}