Move stateVersion variables into per-machine config files
This commit is contained in:
parent
b4f6e267a1
commit
42e865c066
|
@ -1,4 +1,8 @@
|
||||||
{ ... }:
|
{ username, ... }:
|
||||||
{
|
{
|
||||||
imports = [ ./laptop.nix ];
|
imports = [ ./laptop.nix ];
|
||||||
|
home-manager.users.${username} = {
|
||||||
|
home.stateVersion = "23.05";
|
||||||
|
};
|
||||||
|
system.stateVersion = "23.05";
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
imports = [ ./laptop.nix ];
|
imports = [ ./laptop.nix ];
|
||||||
home-manager.users.${username} = {
|
home-manager.users.${username} = {
|
||||||
imports = [ ./home/work.nix ];
|
imports = [ ./home/work.nix ];
|
||||||
|
home.stateVersion = "23.05";
|
||||||
};
|
};
|
||||||
boot.initrd = {
|
boot.initrd = {
|
||||||
secrets = {
|
secrets = {
|
||||||
|
@ -13,6 +14,7 @@
|
||||||
keyFile = "/crypto_keyfile.bin";
|
keyFile = "/crypto_keyfile.bin";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
system.stateVersion = "23.05";
|
||||||
environment = {
|
environment = {
|
||||||
etc."ppp/options".text = ''
|
etc."ppp/options".text = ''
|
||||||
ipcp-accept-remote
|
ipcp-accept-remote
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
imports = [ ./desktop.nix ];
|
imports = [ ./desktop.nix ];
|
||||||
home-manager.users.${username} = {
|
home-manager.users.${username} = {
|
||||||
imports = [ ./home/work.nix ];
|
imports = [ ./home/work.nix ];
|
||||||
|
home.stateVersion = "23.05";
|
||||||
};
|
};
|
||||||
boot = {
|
boot = {
|
||||||
loader.efi.efiSysMountPoint = "/boot/efi";
|
loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
|
@ -16,6 +17,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
system.stateVersion = "23.05";
|
||||||
environment = {
|
environment = {
|
||||||
etc."ppp/options".text = ''
|
etc."ppp/options".text = ''
|
||||||
ipcp-accept-remote
|
ipcp-accept-remote
|
||||||
|
|
|
@ -8,22 +8,25 @@
|
||||||
imports = [ ./desktop.nix ];
|
imports = [ ./desktop.nix ];
|
||||||
environment.sessionVariables.MANGOHUD = 1;
|
environment.sessionVariables.MANGOHUD = 1;
|
||||||
home-manager.users.${username} = {
|
home-manager.users.${username} = {
|
||||||
home.packages = with pkgs; [
|
home = {
|
||||||
krita
|
stateVersion = "23.05";
|
||||||
kdenlive
|
packages = with pkgs; [
|
||||||
helvum
|
krita
|
||||||
prusa-slicer
|
kdenlive
|
||||||
blender
|
helvum
|
||||||
freecad
|
prusa-slicer
|
||||||
openscad
|
blender
|
||||||
kicad-small
|
freecad
|
||||||
mangohud
|
openscad
|
||||||
wineWowPackages.waylandFull
|
kicad-small
|
||||||
winetricks
|
mangohud
|
||||||
lutris
|
wineWowPackages.waylandFull
|
||||||
cartridges
|
winetricks
|
||||||
prismlauncher
|
lutris
|
||||||
];
|
cartridges
|
||||||
|
prismlauncher
|
||||||
|
];
|
||||||
|
};
|
||||||
programs.obs-studio = {
|
programs.obs-studio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = with pkgs.obs-studio-plugins; [
|
plugins = with pkgs.obs-studio-plugins; [
|
||||||
|
@ -69,6 +72,7 @@
|
||||||
};
|
};
|
||||||
steam-hardware.enable = true;
|
steam-hardware.enable = true;
|
||||||
};
|
};
|
||||||
|
system.stateVersion = "23.05";
|
||||||
programs = {
|
programs = {
|
||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
steam = {
|
steam = {
|
||||||
|
|
|
@ -80,22 +80,19 @@
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
system = {
|
system.autoUpgrade = {
|
||||||
stateVersion = "23.05";
|
enable = true;
|
||||||
autoUpgrade = {
|
persistent = true;
|
||||||
enable = true;
|
allowReboot = false;
|
||||||
persistent = true;
|
flake = "git+${config.nix.registry.my-nixos.to.url}";
|
||||||
allowReboot = false;
|
dates = "02:00";
|
||||||
flake = "git+${config.nix.registry.my-nixos.to.url}";
|
randomizedDelaySec = "5min";
|
||||||
dates = "02:00";
|
flags = [
|
||||||
randomizedDelaySec = "5min";
|
"--accept-flake-config"
|
||||||
flags = [
|
"--option"
|
||||||
"--accept-flake-config"
|
"extra-binary-caches"
|
||||||
"--option"
|
"https://nix.xenia.me.uk"
|
||||||
"extra-binary-caches"
|
];
|
||||||
"https://nix.xenia.me.uk"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
systemd.services = lib.mkIf config.system.autoUpgrade.enable {
|
systemd.services = lib.mkIf config.system.autoUpgrade.enable {
|
||||||
nixos-upgrade.serviceConfig = {
|
nixos-upgrade.serviceConfig = {
|
||||||
|
@ -152,7 +149,6 @@
|
||||||
imports = [ ./home/default.nix ];
|
imports = [ ./home/default.nix ];
|
||||||
home = {
|
home = {
|
||||||
inherit username;
|
inherit username;
|
||||||
stateVersion = "23.05";
|
|
||||||
homeDirectory = "/home/${username}";
|
homeDirectory = "/home/${username}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue