albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

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

Browse source
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
alpha.nix
default.niximage.nixsmall.nix
lib
default.nix
nixos
common/modules
nixos.nix
containers
default.nix
hosts
framework-server
containers.nix
nuc-server
containers.nix
warsaw-ovh-01
containers.nix

4
flake.nix
View file

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

2
home-manager/common/software/cli/nixvim/alpha.nix
View file

@ -21,6 +21,8 @@
[ [
(mkPadding 6) (mkPadding 6)
(mkText '' (mkText ''
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣶⣿⣿⣶⡄⠱⣦⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣶⣿⣿⣶⡄⠱⣦⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⡿⠛⠉⡙⣿⣿⡄⢹⣧⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⡿⠛⠉⡙⣿⣿⡄⢹⣧⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣿⡿⢋⣠⠾⠋⠉⢹⣿⣷⢸⣿⡆⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣿⡿⢋⣠⠾⠋⠉⢹⣿⣷⢸⣿⡆⠀

4
home-manager/default.nix
View file

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

4
home-manager/image.nix
View file

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

4
home-manager/small.nix
View file

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

21
lib/default.nix
View file

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

4
nixos/common/modules/nixos.nix
View file

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

4
nixos/containers/default.nix
View file

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

4
nixos/hosts/framework-server/containers.nix
View file

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

4
nixos/hosts/nuc-server/containers.nix
View file

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

4
nixos/hosts/warsaw-ovh-01/containers.nix
View file

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