Update, don't put State Versions in variables, it isn't needed

This commit is contained in:
albert 2025-02-23 11:32:34 -08:00
parent 2afbb532cf
commit 262c4e4602
Signed by: albert
GPG key ID: 3895DD267CA11BA9
11 changed files with 30 additions and 29 deletions
flake.nix
home-manager
common/software/cli/nixvim
default.niximage.nixsmall.nix
lib
nixos
common/modules
containers
hosts
framework-server
nuc-server
warsaw-ovh-01

View file

@ -46,9 +46,7 @@
outputs = { self, nixpkgs, sops-nix, deploy-rs, ... } @inputs:
let
inherit (self) outputs;
stateVersion = "23.11";
hmStateVersion = "23.11";
libx = import ./lib/default.nix { inherit self inputs outputs stateVersion hmStateVersion; };
libx = import ./lib/default.nix { inherit self inputs outputs; };
in {
nixosConfigurations = {
# Linode VMs

View file

@ -21,6 +21,8 @@
[
(mkPadding 6)
(mkText ''

View file

@ -1,4 +1,4 @@
{ lib, inputs, hostname, username, desktop, hmStateVersion, system, ... }: {
{ lib, inputs, hostname, username, desktop, ... }: {
imports = [
# Common configs
./common/software/cli
@ -24,7 +24,7 @@
news.display = "silent";
home = {
inherit username;
stateVersion = hmStateVersion;
stateVersion = "23.11";
homeDirectory = "/home/${username}";
sessionPath = [ "$HOME/.local/bin" ];
};

View file

@ -1,4 +1,4 @@
{ lib, inputs, hostname, username, desktop, hmStateVersion, isImage, ... }: {
{ lib, inputs, hostname, username, desktop, ... }: {
imports = [
# Common configs
./common/software/cli
@ -23,7 +23,7 @@
news.display = "silent";
home = {
inherit username;
stateVersion = hmStateVersion;
stateVersion = "23.11";
homeDirectory = "/home/${username}";
sessionPath = [ "$HOME/.local/bin" ];
};

View file

@ -1,4 +1,4 @@
{ lib, inputs, hostname, username, desktop, hmStateVersion, ... }: {
{ lib, inputs, hostname, username, desktop, ... }: {
imports = [
# Common configs
./common/software/cli/fish.nix
@ -33,7 +33,7 @@
news.display = "silent";
home = {
inherit username;
stateVersion = hmStateVersion;
stateVersion = "23.11";
homeDirectory = "/home/${username}";
sessionPath = [ "$HOME/.local/bin" ];
};

View file

@ -1,4 +1,4 @@
{ lib ? lib, self, inputs, outputs, stateVersion, hmStateVersion , ... }: {
{ lib ? lib, self, inputs, outputs, ... }: {
deploy = {
hostname,
system ? "x86_64-linux",
@ -26,7 +26,7 @@
type ? "default",
}: inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${system};
extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme; };
extraSpecialArgs = { inherit inputs outputs desktop hostname system username theme; };
modules = [ ../home-manager/${type}.nix ];
};
@ -57,16 +57,17 @@
localAddress = "192.168.2.${ip}";
restartIfChanged = true;
enableTun = true;
specialArgs = { inherit pkgs-unstable hostname username desktop theme system repo unfree stateVersion ip deployment_type host; };
config = { hostname, username, desktop, theme, system, stateVersion, host, ... }: {
specialArgs = { inherit pkgs-unstable hostname username desktop theme system repo unfree ip deployment_type host; };
config = { hostname, username, desktop, theme, system, host, ... }: {
nixpkgs.pkgs = pkgs;
imports = [
../nixos/containers
inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.home-manager {
home-manager.extraSpecialArgs = { inherit host inputs outputs desktop hostname username hmStateVersion stateVersion system theme ; };
home-manager.extraSpecialArgs = { inherit host inputs outputs desktop hostname username system theme; };
home-manager.users."${username}" = import ../home-manager;
# home-manager.useGlobalPkgs = true;
}
];
};
@ -86,7 +87,7 @@
deployment_type ? "hosts",
}: inputs.${repo}.lib.nixosSystem {
specialArgs = {
inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme self deployment_type;
inherit inputs outputs desktop hostname username gpu system theme self deployment_type;
pkgs-unstable = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable;
};
@ -113,7 +114,7 @@
unfree ? false
}: inputs.${repo}.lib.nixosSystem {
specialArgs = {
inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme self deployment_type;
inherit inputs outputs desktop hostname username gpu system theme self deployment_type;
# Choose whether to pull from stable or unstable
pkgs = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs;
pkgs-unstable = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable;
@ -140,7 +141,7 @@
format
}: inputs.nixos-generators.nixosGenerate {
specialArgs = {
inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format;
inherit inputs outputs desktop hostname username gpu system theme format;
# Choose whether to pull from stable or unstable
pkgs = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs;
pkgs-unstable = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable;
@ -155,7 +156,7 @@
inputs.sops-nix.nixosModules.sops
inputs.lanzaboote.nixosModules.lanzaboote
inputs.home-manager.nixosModules.home-manager {
home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme format; };
home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username gpu system theme format; };
home-manager.users."${username}" = import ../home-manager;
}
];
@ -174,7 +175,7 @@
format
}: inputs.nixos-generators.nixosGenerate {
specialArgs = {
inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format;
inherit inputs outputs desktop hostname username gpu system theme format;
# Choose whether to pull from stable or unstable
pkgs = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs;
pkgs-unstable = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable;

View file

@ -1,4 +1,4 @@
{ pkgs, system, stateVersion, ... }: {
{ pkgs, system, ... }: {
nix = {
settings = {
auto-optimise-store = true;
@ -36,6 +36,6 @@
};
};
system.stateVersion = stateVersion;
system.stateVersion = "23.11";
nixpkgs.hostPlatform = system;
}

View file

@ -1,4 +1,4 @@
{ timezone, host, ip, stateVersion, hostname, ... }: {
{ host, ip, hostname, ... }: {
imports = [
./${hostname}
# Modules
@ -25,7 +25,7 @@
};
};
system.stateVersion = stateVersion;
system.stateVersion = "23.11";
networking.hostName = "${hostname}-${host}";
programs.fish.enable = true;

View file

@ -1,6 +1,6 @@
{ hostname, lib, self, inputs, outputs, stateVersion, hmStateVersion, ... }:
{ hostname, lib, self, inputs, outputs, ... }:
let
libx = import ../../../lib { inherit lib self inputs outputs stateVersion hmStateVersion; };
libx = import ../../../lib { inherit lib self inputs outputs; };
in {
containers = {

View file

@ -1,6 +1,6 @@
{ hostname, lib, self, inputs, outputs, stateVersion, hmStateVersion, ... }:
{ hostname, lib, self, inputs, outputs, ... }:
let
libx = import ../../../lib { inherit lib self inputs outputs stateVersion hmStateVersion; };
libx = import ../../../lib { inherit lib self inputs outputs; };
in {
containers = {

View file

@ -1,6 +1,6 @@
{ hostname, lib, self, inputs, outputs, stateVersion, hmStateVersion, ... }:
{ hostname, lib, self, inputs, outputs, ... }:
let
libx = import ../../../lib { inherit lib self inputs outputs stateVersion hmStateVersion; };
libx = import ../../../lib { inherit lib self inputs outputs; };
in {
containers = {