diff --git a/flake.lock b/flake.lock index 0f72dac..e5e9bb3 100644 --- a/flake.lock +++ b/flake.lock @@ -304,11 +304,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1676886000, - "narHash": "sha256-t7nxEvJb4ISR7u54YADZiZi9EaKHJKbXQjyyf00Q8TA=", + "lastModified": 1676908974, + "narHash": "sha256-o7sJTBeumorVIM/b1b/Q4q+WJn8Rou5kx8DEBbKOZJI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "26c9dbdc92abc370510be78889942f38a272d705", + "rev": "157e1e4b127b5cb37822be247e8ec37a7f475270", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ecfc6b..970a818 100644 --- a/flake.nix +++ b/flake.nix @@ -109,6 +109,10 @@ digitalocean = nixos-generators.nixosGenerate { system = "x86_64-linux"; format = "do"; + modules = [ + ./modules/base + ./users + ]; }; }; @@ -238,4 +242,3 @@ }; }; } - diff --git a/hosts/aristotle/configuration.nix b/hosts/aristotle/configuration.nix index 2594ae7..584510f 100644 --- a/hosts/aristotle/configuration.nix +++ b/hosts/aristotle/configuration.nix @@ -58,12 +58,4 @@ }; tailscale = { enable = true; }; }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.05"; # Did you read the comment? } diff --git a/hosts/epicurus/darwin-configuration.nix b/hosts/epicurus/darwin-configuration.nix index eb61d66..d66aab4 100644 --- a/hosts/epicurus/darwin-configuration.nix +++ b/hosts/epicurus/darwin-configuration.nix @@ -31,8 +31,4 @@ promptInit = ""; }; }; - - # Used for backwards compatibility, please read the changelog before changing. - # $ darwin-rebuild changelog - system.stateVersion = 4; } diff --git a/hosts/heraclitus/darwin-configuration.nix b/hosts/heraclitus/darwin-configuration.nix index 81cbc70..daea61a 100644 --- a/hosts/heraclitus/darwin-configuration.nix +++ b/hosts/heraclitus/darwin-configuration.nix @@ -42,8 +42,4 @@ }; }; }; - - # Used for backwards compatibility, please read the changelog before changing. - # $ darwin-rebuild changelog - system.stateVersion = 4; } diff --git a/hosts/plato/configuration.nix b/hosts/plato/configuration.nix index 5e153ce..09cd13d 100644 --- a/hosts/plato/configuration.nix +++ b/hosts/plato/configuration.nix @@ -175,12 +175,4 @@ ]; }; }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "20.09"; # Did you read the comment? } diff --git a/hosts/socrates/configuration.nix b/hosts/socrates/configuration.nix index e5c2944..da1fcea 100644 --- a/hosts/socrates/configuration.nix +++ b/hosts/socrates/configuration.nix @@ -78,6 +78,4 @@ }; tailscale = { enable = true; }; }; - - system.stateVersion = "22.05"; } diff --git a/modules/base/darwin.nix b/modules/base/darwin.nix index dbebc68..614e729 100644 --- a/modules/base/darwin.nix +++ b/modules/base/darwin.nix @@ -50,4 +50,6 @@ _: { }; }; }; + + system.stateVersion = 4; } diff --git a/modules/base/default.nix b/modules/base/default.nix index 30984bb..e4025fd 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -16,4 +16,6 @@ trusted-users = [ "root" "walkah" ]; }; }; + + system.stateVersion = "23.05"; }