genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 01:17:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to Nix 25.11

Browse source
This commit is contained in:
Gene Liverman 2025-12-01 10:33:43 -05:00
parent d451a0ec7b
commit 8821ec3369
Signed by: genebean
SSH key fingerprint: SHA256:gMnZbl3rg8nIXl4AomxNeNiOG4mWP/xEywbmQjVfhtY
9 changed files with 86 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

144
flake.lock generated
View file

@ -19,16 +19,16 @@
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761551821, "lastModified": 1763638478,
"narHash": "sha256-N3Zj73TAxclhLGgADbPVwcVrhYIBKUgAxjfQuOXre6s=", "narHash": "sha256-n/IMowE9S23ovmTkKX7KhxXC2Yq41EAVFR2FBIXPcT8=",
"owner": "Homebrew", "owner": "Homebrew",
"repo": "brew", "repo": "brew",
"rev": "8f6719274133c5bcc24c058c5a6bcbb3b0cd48b3", "rev": "fbfdbaba008189499958a7aeb1e2c36ab10c067d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Homebrew", "owner": "Homebrew",
"ref": "4.6.19", "ref": "5.0.3",
"repo": "brew", "repo": "brew",
"type": "github" "type": "github"
} }
@ -76,11 +76,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762276996, "lastModified": 1764350888,
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -290,16 +290,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1764536451,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -311,16 +311,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759509947, "lastModified": 1764161084,
"narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", "rev": "e95de00a471d07435e0527ff4db092c84998698e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lnl7", "owner": "lnl7",
"ref": "nix-darwin-25.05", "ref": "nix-darwin-25.11",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
@ -345,11 +345,11 @@
"brew-src": "brew-src" "brew-src": "brew-src"
}, },
"locked": { "locked": {
"lastModified": 1761927470, "lastModified": 1764473698,
"narHash": "sha256-KsFDGRGD8j1R6TvJ4HkebKsh3HXLY0XazanLrhO3wqE=", "narHash": "sha256-C91gPgv6udN5WuIZWNehp8qdLqlrzX6iF/YyboOj6XI=",
"owner": "zhaofengli-wip", "owner": "zhaofengli-wip",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "3cae36b3a17b09a66435291619dce8cf2c4728ca", "rev": "6a8ab60bfd66154feeaa1021fc3b32684814a62a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +424,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1762463231, "lastModified": 1764440730,
"narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,68 +454,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-1_0": {
"locked": {
"lastModified": 1705033721,
"narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-1_6": {
"locked": {
"lastModified": 1735651292,
"narHash": "sha256-YLbzcBtYo1/FEzFsB3AnM16qFc6fWPMIoOuSoDwvg9g=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0da3c44a9460a26d2025ec3ed2ec60a895eb1114",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-terraform": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
],
"nixpkgs-1_0": "nixpkgs-1_0",
"nixpkgs-1_6": "nixpkgs-1_6",
"systems": "systems"
},
"locked": {
"lastModified": 1762393044,
"narHash": "sha256-atZ3k0YQntCZwpWr09nkDj847W4T9e/k+SG+wSlsAsM=",
"owner": "stackbuilders",
"repo": "nixpkgs-terraform",
"rev": "f2731398b3c4c7086e215f4adf0bda243977ecb1",
"type": "github"
},
"original": {
"owner": "stackbuilders",
"repo": "nixpkgs-terraform",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1762482733, "lastModified": 1764557259,
"narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", "narHash": "sha256-fhD/QUtJ0HKs3oLvfnD+/SrBV5Y7YEkCYnDjOVUjLys=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", "rev": "0d70460758949966e91d9ecb823b821f963cefbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,16 +472,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1762498405, "lastModified": 1764522689,
"narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -599,7 +544,6 @@
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-terraform": "nixpkgs-terraform",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -650,22 +594,19 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"nixpkgs-25_05": [
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1755110674, "lastModified": 1764185122,
"narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=", "narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "f5936247dbdb8501221978562ab0b302dd75456c", "rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }
@ -677,11 +618,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762659808, "lastModified": 1764483358,
"narHash": "sha256-2Kv2mANf+FRisqhpfeZ8j9firBxb23ZvEXwdcunbpGI=", "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "524312bc62e3f34bd9231a2f66622663d3355133", "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -689,21 +630,6 @@
"repo": "sops-nix", "repo": "sops-nix",
"type": "github" "type": "github"
} }
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

9
flake.nix
View file

@ -3,7 +3,7 @@
inputs = { inputs = {
# Where we get most of our software. Giant mono repo with recipes # Where we get most of our software. Giant mono repo with recipes
# called derivations that say how to build software. # called derivations that say how to build software.
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
compose2nix = { compose2nix = {
@ -29,13 +29,13 @@
# Manages things in home directory # Manages things in home directory
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Controls system level software and settings including fonts on macOS # Controls system level software and settings including fonts on macOS
nix-darwin = { nix-darwin = {
url = "github:lnl7/nix-darwin/nix-darwin-25.05"; url = "github:lnl7/nix-darwin/nix-darwin-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -57,8 +57,7 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
simple-nixos-mailserver = { simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
inputs.nixpkgs-25_05.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

2
modules/hosts/common/all-gui.nix
View file

@ -3,7 +3,7 @@
# nothing here right now # nothing here right now
]; ];
programs = { programs = {
git.aliases = { git.settings.aliases = {
kraken = "!gitkraken -p $(cd \"\${1:-.}\" && git rev-parse --show-toplevel)"; kraken = "!gitkraken -p $(cd \"\${1:-.}\" && git rev-parse --show-toplevel)";
}; };
}; };

20
modules/hosts/common/default.nix
View file

@ -1,5 +1,5 @@
{ inputs, pkgs, username, ... }: let { inputs, pkgs, username, ... }: let
sqlite_lib = if builtins.elem pkgs.system [ sqlite_lib = if builtins.elem pkgs.stdenv.hostPlatform.system [
"aarch64-darwin" "aarch64-darwin"
"x86_64-darwin" "x86_64-darwin"
] ]
@ -14,8 +14,8 @@ in {
colordiff colordiff
dogdns dogdns
dos2unix dos2unix
du-dust
duf duf
dust
esptool esptool
fd fd
f2 f2
@ -37,7 +37,6 @@ in {
nix-search nix-search
nix-zsh-completions nix-zsh-completions
nodejs nodejs
nodePackages.npm
nurl nurl
nvd nvd
onefetch onefetch
@ -90,6 +89,10 @@ in {
}; };
bottom.enable = true; bottom.enable = true;
broot.enable = true; broot.enable = true;
diff-so-fancy = {
enable = true;
enableGitIntegration = true;
};
direnv = { direnv = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
@ -100,8 +103,7 @@ in {
gh.enable = true; gh.enable = true;
git = { git = {
enable = true; enable = true;
diff-so-fancy.enable = true; settings = {
extraConfig = {
diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt"; diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
}; };
ignores = [ ignores = [
@ -111,9 +113,8 @@ in {
]; ];
includes = [ { path = "~/.gitconfig-local"; }]; includes = [ { path = "~/.gitconfig-local"; }];
lfs.enable = true; lfs.enable = true;
package = pkgs.gitAndTools.gitFull; package = pkgs.gitFull;
userName = "Gene Liverman"; settings = {
extraConfig = {
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
@ -124,6 +125,9 @@ in {
pull = { pull = {
rebase = false; rebase = false;
}; };
user = {
name = "Gene Liverman";
};
}; };
}; # end git }; # end git
irssi.enable = true; irssi.enable = true;

2
modules/hosts/darwin/mightymac/default.nix
View file

@ -5,7 +5,7 @@
systemPackages = with pkgs; [ systemPackages = with pkgs; [
chart-testing chart-testing
goreleaser goreleaser
inputs.flox.packages.${pkgs.system}.default inputs.flox.packages.${pkgs.stdenv.hostPlatform.system}.default
kopia kopia
kubectx kubectx
#reposurgeon # Nix is a major version behind brew #reposurgeon # Nix is a major version behind brew

12
modules/hosts/darwin/mightymac/home-gene.liverman.nix
View file

@ -1,10 +1,10 @@
{ username, ... }: { { config, ... }: {
home.stateVersion = "23.11"; home.stateVersion = "23.11";
programs = { programs = {
go = { go = {
enable = true; enable = true;
goPath = "go"; env.GOPATH = "${config.home.homeDirectory}/go";
}; };
k9s.enable = true; k9s.enable = true;
}; };
@ -12,10 +12,10 @@
sops = { sops = {
defaultSopsFile = ./secrets.yaml; defaultSopsFile = ./secrets.yaml;
secrets = { secrets = {
i2cssh_config.path = "/Users/${username}/.i2csshrc"; i2cssh_config.path = "${config.home.homeDirectory}/.i2csshrc";
local_git_config.path = "/Users/${username}/.gitconfig-local"; local_git_config.path = "${config.home.homeDirectory}/.gitconfig-local";
local_private_env.path = "/Users/${username}/.private-env"; local_private_env.path = "${config.home.homeDirectory}/.private-env";
user_nix_conf.path = "/Users/${username}/.config/nix/nix.conf"; user_nix_conf.path = "${config.home.homeDirectory}/.config/nix/nix.conf";
}; };
}; };
} }

9
modules/hosts/nixos/hetznix01/post-install/default.nix
View file

@ -23,14 +23,7 @@ in {
"indianspringsbsa.org" "indianspringsbsa.org"
"pack1828.org" "pack1828.org"
]; ];
forwards = { stateVersion = 3;
"webmaster@indianspringsbsa.org" = "gene+indianspringsbsa.org@geneliverman.com";
"newsletter@indianspringsbsa.org" = "gene+indianspringsbsa.org@geneliverman.com";
"@alt.${domain}" = "gene+alt.${domain}@geneliverman.com";
"${username}@localhost" = "${username}@technicalissues.us";
"root@localhost" = "root@technicalissues.us";
"root@${config.networking.hostName}" = "root@technicalissues.us";
};
# Use Let's Encrypt certificates from Nginx # Use Let's Encrypt certificates from Nginx
certificateScheme = "acme"; certificateScheme = "acme";

55
modules/hosts/nixos/nixnuc/default.nix
View file

@ -31,29 +31,31 @@ in {
}; };
}; };
environment.systemPackages = with pkgs; [ environment = {
inputs.compose2nix.packages.${pkgs.system}.default sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; };
docker-compose systemPackages = with pkgs; [
intel-gpu-tools inputs.compose2nix.packages.${pkgs.stdenv.hostPlatform.system}.default
jellyfin docker-compose
jellyfin-ffmpeg intel-gpu-tools
jellyfin-web jellyfin
net-snmp jellyfin-ffmpeg
nginx jellyfin-web
nvme-cli net-snmp
podman-compose nginx
podman-tui # status of containers in the terminal nvme-cli
yt-dlp podman-compose
]; podman-tui # status of containers in the terminal
yt-dlp
];
};
# https://wiki.nixos.org/wiki/Jellyfin
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver intel-compute-runtime-legacy1 # pre-13th gen cpu
vaapiIntel intel-media-driver # For Broadwell and newer (ca. 2014+), use with LIBVA_DRIVER_NAME=iHD:
vaapiVdpau intel-ocl # Generic OpenCL support
libvdpau-va-gl
intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
]; ];
}; };
@ -70,6 +72,7 @@ in {
"root@localhost" = "root@technicalissues.us"; "root@localhost" = "root@technicalissues.us";
"root@${config.networking.hostName}" = "root@technicalissues.us"; "root@${config.networking.hostName}" = "root@technicalissues.us";
}; };
stateVersion = 3;
# Use Let's Encrypt certificates from Nginx # Use Let's Encrypt certificates from Nginx
certificateScheme = "acme"; certificateScheme = "acme";
@ -122,17 +125,6 @@ in {
}; };
}; };
# Hardware Transcoding for Jellyfin
nixpkgs.overlays = [
(self: super: {
# "vaapiIntel" is in some docs, but that is an alias
# to intel-vaapi-driver as of 2023-05-31
intel-vaapi-driver = super.intel-vaapi-driver.override {
enableHybridCodec = true;
};
})
];
# Enable sound with pipewire. # Enable sound with pipewire.
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
@ -721,6 +713,7 @@ in {
}; };
systemd.services = { systemd.services = {
jellyfin.environment.LIBVA_DRIVER_NAME = "iHD";
"mealie" = { "mealie" = {
requires = ["postgresql.service"]; requires = ["postgresql.service"];
after = ["postgresql.service"]; after = ["postgresql.service"];
@ -752,7 +745,7 @@ in {
# Compose based apps were crashing with podman compose, so back to Docker... # Compose based apps were crashing with podman compose, so back to Docker...
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.docker.package = pkgs.docker_26; virtualisation.docker.package = pkgs.docker;
virtualisation.podman = { virtualisation.podman = {
enable = true; enable = true;

4
modules/hosts/nixos/rainbow-planet/default.nix
View file

@ -36,7 +36,7 @@
go go
hubble hubble
hugo hugo
inputs.flox.packages.${pkgs.system}.default inputs.flox.packages.${pkgs.stdenv.hostPlatform.system}.default
kdePackages.bluedevil kdePackages.bluedevil
kdePackages.bluez-qt kdePackages.bluez-qt
kdePackages.kdenlive kdePackages.kdenlive
@ -189,7 +189,7 @@
containers.enable = true; containers.enable = true;
docker = { docker = {
enable = true; enable = true;
package = pkgs.docker_26; package = pkgs.docker;
}; };
libvirtd = { libvirtd = {
enable = true; enable = true;