diff options
| author | quentin@aristote.fr <quentin@aristote.fr> | 2025-03-22 21:24:03 +0100 |
|---|---|---|
| committer | quentin@aristote.fr <quentin@aristote.fr> | 2025-03-22 21:31:41 +0100 |
| commit | e7c2472f62a1b395301c03c83cf93b436fb3a76d (patch) | |
| tree | 42559e98e8de39300f39da28ee571a8960cbf12c | |
| parent | 93c15e3e7375c379e211c9d50f23b3f218740408 (diff) | |
split nix and system; fix remote building; reboot after upgrade
Flake lock file updates:
• Updated input 'my-nixpkgs':
'github:qaristote/my-nixpkgs/65eb03f15116223871d06254dc453abc79bcffaa' (2025-03-18)
→ 'github:qaristote/my-nixpkgs/f2e0f4c86f3318cc6df018b1948dd5bade77f082' (2025-03-22)
• Updated input 'nixos-hardware':
'github:NixOS/nixos-hardware/4f4d97d7b7be387286cc9c988760a7ebaa5be1f1' (2025-03-17)
→ 'github:NixOS/nixos-hardware/380ed15bcd6440606c6856db44a99140d422b46f' (2025-03-22)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/a1185f4064c18a5db37c5c84e5638c78b46e3341' (2025-03-16)
→ 'github:NixOS/nixpkgs/7105ae3957700a9646cc4b766f5815b23ed0c682' (2025-03-20)
| -rw-r--r-- | config/default.nix | 1 | ||||
| -rw-r--r-- | config/nix.nix | 19 | ||||
| -rw-r--r-- | config/system.nix | 17 | ||||
| -rw-r--r-- | flake.lock | 18 |
4 files changed, 28 insertions, 27 deletions
diff --git a/config/default.nix b/config/default.nix index 974736f..b36b01f 100644 --- a/config/default.nix +++ b/config/default.nix @@ -6,6 +6,7 @@ ./hardware ./networking ./nix.nix + ./system.nix ./users.nix ]; diff --git a/config/nix.nix b/config/nix.nix index 4c95ce6..3142f93 100644 --- a/config/nix.nix +++ b/config/nix.nix @@ -1,28 +1,11 @@ {...}: { personal.nix = { enable = true; - autoUpgrade.enable = true; gc.enable = true; - flake = "git+file:///etc/nixos/"; - remoteBuilds = { - enable = true; - machines.hephaistos = { - enable = true; - domain = "local"; - }; - }; }; - # disable local builds - nix.settings.max-jobs = 0; + nixpkgs.flake = { setNixPath = true; setFlakeRegistry = true; }; - system.autoUpgrade = { - flags = [ - # for reading secrets from a file - "--impure" - ]; - dates = "02:00"; - }; } diff --git a/config/system.nix b/config/system.nix new file mode 100644 index 0000000..5b6ba5f --- /dev/null +++ b/config/system.nix @@ -0,0 +1,17 @@ +{...}: { + personal.system = { + flake = "git+file:///etc/nixos/"; + autoUpgrade = { + enable = true; + remoteBuilding = { + enable = true; + builder.domain = "local"; + }; + }; + }; + + system.autoUpgrade = { + allowReboot = true; + dates = "02:00"; + }; +} @@ -46,11 +46,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1742280726, - "narHash": "sha256-OEr0CwQcoEIa7Z5GeGR2xfb+22v2Mwda/AptjZmYfXQ=", + "lastModified": 1742674157, + "narHash": "sha256-415weJqfWn5SJ3LbBIgD6ZKq0wE9OOgr0rYtgAlWLu0=", "owner": "qaristote", "repo": "my-nixpkgs", - "rev": "65eb03f15116223871d06254dc453abc79bcffaa", + "rev": "f2e0f4c86f3318cc6df018b1948dd5bade77f082", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742217307, - "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { |