fix: unified stateVersion

This commit is contained in:
Patrick Großmann 2023-06-02 17:23:40 +09:00
parent 4fe4f4d5a2
commit 518736f49f
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
6 changed files with 17 additions and 12 deletions

View file

@ -76,6 +76,8 @@
extraEncryptionPubkeys = [./secrets/recipients.txt];
};
stateVersion = "23.05";
hosts = {
patricknix = {
type = "nixos";

View file

@ -1,6 +1,6 @@
{
pkgs,
inputs,
stateVersion,
...
}: {
nix = {
@ -50,6 +50,5 @@
nixpkgs.config.permittedInsecurePackages = [
"nodejs-16.20.0"
];
# TODO unify the stateversions here and of homemanager
system.stateVersion = "23.05";
system.stateVersion = stateVersion;
}

View file

@ -22,7 +22,7 @@ in {
pkgs = self.pkgs.${nodeMeta.system};
specialArgs = {
inherit (nixpkgs) lib;
inherit (self) nodes;
inherit (self) nodes stateVersion;
inherit inputs;
inherit nodeName;
inherit nodeMeta;

View file

@ -9,8 +9,6 @@
./util.nix
./impermanence.nix
];
# TODO unify stateversions
home.stateVersion = "23.05";
nixpkgs.config = {
allowUnfree = true;

View file

@ -3,6 +3,7 @@
impermanence,
pkgs,
config,
stateVersion,
...
}: {
# TODO: only import this if the current host is a nixos host
@ -25,10 +26,13 @@
# xournalpp needs this or else it will crash
gnome3.adwaita-icon-theme
];
home-manager.users.patrick.imports = [
hyprland.homeManagerModules.default
impermanence.home-manager.impermanence
./patrick.nix
../common
];
home-manager.users.patrick = {
home.stateVersion = stateVersion;
imports = [
hyprland.homeManagerModules.default
impermanence.home-manager.impermanence
./patrick.nix
../common
];
};
}

View file

@ -2,6 +2,7 @@
pkgs,
config,
impermanence,
stateVersion,
...
}: {
users.users.root = {
@ -13,6 +14,7 @@
hashedPassword = config.secrets.secrets.global.users.root.passwordHash;
};
home-manager.users.root = {
home.stateVersion = stateVersion;
imports = [
../common
impermanence.home-manager.impermanence