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

move state versions to option (mainly for hm state version per device without forcing every device to use hm module)

Browse source
This commit is contained in:
twoneis 2024-07-11 15:08:00 +02:00
parent 16859b559b
commit fdc6c1945e
9 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
devices/ellaca/default.nix
View file

@ -71,7 +71,4 @@
enable32Bit = true; enable32Bit = true;
}; };
}; };
system.stateVersion = "24.05";
home-manager.users.twoneis.home.stateVersion = "24.11";
} }

3
devices/ellaca/options.nix
View file

@ -10,4 +10,7 @@
withGames = false; withGames = false;
hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input"; hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input";
stateVersion = "24.05";
hmStateVersion = "24.11";
} }

3
devices/inkvine/default.nix
View file

@ -66,7 +66,4 @@
enable32Bit = true; enable32Bit = true;
}; };
}; };
system.stateVersion = "24.05";
home-manager.users.twoneis.home.stateVersion = "24.11";
} }

3
devices/inkvine/options.nix
View file

@ -10,4 +10,7 @@
withGames = false; withGames = false;
hwmonPath = "/sys/class/hwmon/hwmon4/temp1_input"; hwmonPath = "/sys/class/hwmon/hwmon4/temp1_input";
stateVersion = "24.05";
hmStateVersion = "24.11";
} }

3
devices/pleniscenta/default.nix
View file

@ -64,7 +64,4 @@
enable32Bit = true; enable32Bit = true;
}; };
}; };
system.stateVersion = "24.05";
home-manager.users.twoneis.home.stateVersion = "24.11";
} }

3
devices/pleniscenta/options.nix
View file

@ -10,4 +10,7 @@
withGames = false; withGames = false;
hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input"; hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input";
stateVersion = "24.05";
hmStateVersion = "24.11";
} }

4
modules/default.nix
View file

@ -1,4 +1,4 @@
{ inputs, pkgs, lib, ... }: { { inputs, pkgs, lib, config, ... }: {
imports = [ imports = [
./containers ./containers
./games ./games
@ -79,4 +79,6 @@
description = "twoneis"; description = "twoneis";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" ];
}; };
system.stateVersion = config.stateVersion;
} }

4
modules/home/default.nix
View file

@ -1,4 +1,4 @@
{ ... }: { { config, ... }: {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
@ -7,6 +7,8 @@
home = { home = {
username = "twoneis"; username = "twoneis";
homeDirectory = "/home/twoneis"; homeDirectory = "/home/twoneis";
stateVersion = config.hmStateVersion;
}; };
programs.home-manager.enable = true; programs.home-manager.enable = true;

12
options.nix
View file

@ -15,5 +15,17 @@
default = null; default = null;
example = "/sys/class/hwmon/hwmon1/temp1_input"; example = "/sys/class/hwmon/hwmon1/temp1_input";
}; };
stateVersion = mkOption {
type = with types; nullOr str;
default = null;
example = "24.05";
};
hmStateVersion = mkOption {
type = with types; nullOr str;
default = null;
example = "24.11";
};
}; };
} }