From 33bdcc7f917aa552ab1966dd23e938f299966070 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Mon, 10 Jun 2024 17:00:55 +0800
Subject: [PATCH] flake: explicitly configure each setup with its nixpkgs
 branches

---
 configs/flake-parts/home-manager.nix | 13 +++++++++++--
 configs/flake-parts/nixos.nix        |  7 ++++++-
 configs/flake-parts/nixvim.nix       |  6 ++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/configs/flake-parts/home-manager.nix b/configs/flake-parts/home-manager.nix
index eb045bdc..c7d4e131 100644
--- a/configs/flake-parts/home-manager.nix
+++ b/configs/flake-parts/home-manager.nix
@@ -11,6 +11,8 @@
     configs = {
       # The typical user in desktop environments.
       foo-dogsquared = {
+        nixpkgsBranch = "nixos-unstable";
+        homeManagerBranch = "home-manager-unstable";
         systems = [ "aarch64-linux" "x86_64-linux" ];
         overlays = [
           # Neovim nightly!
@@ -29,7 +31,10 @@
           inputs.nur.hmModules.nur
           inputs.sops-nix.homeManagerModules.sops
         ];
-        nixvim.instance = "fiesta";
+        nixvim = {
+          instance = "fiesta";
+          branch = "nixvim-unstable";
+        };
         deploy = {
           autoRollback = true;
           magicRollback = true;
@@ -37,7 +42,11 @@
       };
 
       # 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
diff --git a/configs/flake-parts/nixos.nix b/configs/flake-parts/nixos.nix
index 61e9b42e..1dd5f414 100644
--- a/configs/flake-parts/nixos.nix
+++ b/configs/flake-parts/nixos.nix
@@ -10,13 +10,15 @@
     configs = {
       # The main desktop.
       ni = {
+        nixpkgsBranch = "nixos-unstable";
         systems = [ "x86_64-linux" ];
         formats = null;
         modules = [
           inputs.disko.nixosModules.disko
           inputs.sops-nix.nixosModules.sops
         ];
-        homeManagerUsers = {
+        home-manager = {
+          branch = "home-manager-unstable";
           nixpkgsInstance = "global";
           users.foo-dogsquared = {
             userConfig = {
@@ -59,6 +61,7 @@
       # TODO: Remove extra newlines that are here for whatever reason.
       #{{{
       void = {
+        nixpkgsBranch = "nixos-unstable";
         systems = [ "x86_64-linux" ];
         formats = [ "vm" ];
       };
@@ -73,6 +76,7 @@
 
       # The barely customized graphical installer.
       graphical-installer = {
+        nixpkgsBranch = "nixos-unstable";
         systems = [ "aarch64-linux" "x86_64-linux" ];
         formats = [ "install-iso-graphical" ];
         diskoConfigs = [ "external-hdd" ];
@@ -81,6 +85,7 @@
 
       # The WSL system (that is yet to be used).
       winnowing = {
+        nixpkgsBranch = "nixos-unstable";
         systems = [ "x86_64-linux" ];
         formats = null;
         overlays = [
diff --git a/configs/flake-parts/nixvim.nix b/configs/flake-parts/nixvim.nix
index f32e1f7d..5d7f69aa 100644
--- a/configs/flake-parts/nixvim.nix
+++ b/configs/flake-parts/nixvim.nix
@@ -6,8 +6,9 @@
       nixpkgsBranches = [
         "nixos-unstable"
       ];
+      nixvimBranch = "nixvim-unstable";
       neovimPackages = p: with p; [
-        neovim-nightly
+        neovim
       ];
     };
 
@@ -15,8 +16,9 @@
       nixpkgsBranches = [
         "nixos-unstable"
       ];
+      nixvimBranch = "nixos-unstable";
       neovimPackages = p: with p; [
-        neovim-nightly
+        neovim
       ];
     };
   };