flake: explicitly configure each setup with its nixpkgs branches

This commit is contained in:
Gabriel Arazas 2024-06-10 17:00:55 +08:00
parent 3907d83781
commit 33bdcc7f91
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
3 changed files with 21 additions and 5 deletions

View File

@ -11,6 +11,8 @@
configs = { configs = {
# The typical user in desktop environments. # The typical user in desktop environments.
foo-dogsquared = { foo-dogsquared = {
nixpkgsBranch = "nixos-unstable";
homeManagerBranch = "home-manager-unstable";
systems = [ "aarch64-linux" "x86_64-linux" ]; systems = [ "aarch64-linux" "x86_64-linux" ];
overlays = [ overlays = [
# Neovim nightly! # Neovim nightly!
@ -29,7 +31,10 @@
inputs.nur.hmModules.nur inputs.nur.hmModules.nur
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
]; ];
nixvim.instance = "fiesta"; nixvim = {
instance = "fiesta";
branch = "nixvim-unstable";
};
deploy = { deploy = {
autoRollback = true; autoRollback = true;
magicRollback = true; magicRollback = true;
@ -37,7 +42,11 @@
}; };
# The typical user in server environments. # The typical user in server environments.
plover.systems = [ "x86_64-linux" ]; plover = {
nixpkgsBranch = "nixos-unstable";
homeManagerBranch = "home-manager-unstable";
systems = [ "x86_64-linux" ];
};
}; };
# Pretty much the baseline home-manager configuration for the whole # Pretty much the baseline home-manager configuration for the whole

View File

@ -10,13 +10,15 @@
configs = { configs = {
# The main desktop. # The main desktop.
ni = { ni = {
nixpkgsBranch = "nixos-unstable";
systems = [ "x86_64-linux" ]; systems = [ "x86_64-linux" ];
formats = null; formats = null;
modules = [ modules = [
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
]; ];
homeManagerUsers = { home-manager = {
branch = "home-manager-unstable";
nixpkgsInstance = "global"; nixpkgsInstance = "global";
users.foo-dogsquared = { users.foo-dogsquared = {
userConfig = { userConfig = {
@ -59,6 +61,7 @@
# TODO: Remove extra newlines that are here for whatever reason. # TODO: Remove extra newlines that are here for whatever reason.
#{{{ #{{{
void = { void = {
nixpkgsBranch = "nixos-unstable";
systems = [ "x86_64-linux" ]; systems = [ "x86_64-linux" ];
formats = [ "vm" ]; formats = [ "vm" ];
}; };
@ -73,6 +76,7 @@
# The barely customized graphical installer. # The barely customized graphical installer.
graphical-installer = { graphical-installer = {
nixpkgsBranch = "nixos-unstable";
systems = [ "aarch64-linux" "x86_64-linux" ]; systems = [ "aarch64-linux" "x86_64-linux" ];
formats = [ "install-iso-graphical" ]; formats = [ "install-iso-graphical" ];
diskoConfigs = [ "external-hdd" ]; diskoConfigs = [ "external-hdd" ];
@ -81,6 +85,7 @@
# The WSL system (that is yet to be used). # The WSL system (that is yet to be used).
winnowing = { winnowing = {
nixpkgsBranch = "nixos-unstable";
systems = [ "x86_64-linux" ]; systems = [ "x86_64-linux" ];
formats = null; formats = null;
overlays = [ overlays = [

View File

@ -6,8 +6,9 @@
nixpkgsBranches = [ nixpkgsBranches = [
"nixos-unstable" "nixos-unstable"
]; ];
nixvimBranch = "nixvim-unstable";
neovimPackages = p: with p; [ neovimPackages = p: with p; [
neovim-nightly neovim
]; ];
}; };
@ -15,8 +16,9 @@
nixpkgsBranches = [ nixpkgsBranches = [
"nixos-unstable" "nixos-unstable"
]; ];
nixvimBranch = "nixos-unstable";
neovimPackages = p: with p; [ neovimPackages = p: with p; [
neovim-nightly neovim
]; ];
}; };
}; };