diff --git a/flake.lock b/flake.lock index b76d2ca..537a652 100644 --- a/flake.lock +++ b/flake.lock @@ -475,27 +475,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712390667, - "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b787726a8413e11b074cde42704b4af32d95545c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "stylix", @@ -516,6 +495,48 @@ "type": "github" } }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1712386041, + "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712390667, + "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "b787726a8413e11b074cde42704b4af32d95545c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, "kdenlive-pin-nixpkgs": { "locked": { "lastModified": 1709012981, @@ -886,7 +907,8 @@ "eaf": "eaf", "eaf-browser": "eaf-browser", "emacs-pin-nixpkgs": "emacs-pin-nixpkgs", - "home-manager": "home-manager", + "home-manager-stable": "home-manager-stable", + "home-manager-unstable": "home-manager-unstable", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", "mini-frame": "mini-frame", "nix-doom-emacs": "nix-doom-emacs", @@ -967,7 +989,7 @@ "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nixpkgs": "nixpkgs_3" }, "locked": { diff --git a/flake.nix b/flake.nix index f8142d5..3386aba 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,9 @@ { description = "Flake of LibrePhoenix"; - outputs = inputs@{ self, nixpkgs, nixpkgs-stable, emacs-pin-nixpkgs, - kdenlive-pin-nixpkgs, home-manager, nix-doom-emacs, nix-straight, stylix, - blocklist-hosts, rust-overlay, org-nursery, org-yaap, + outputs = inputs@{ self, nixpkgs, nixpkgs-stable, emacs-pin-nixpkgs, kdenlive-pin-nixpkgs, + home-manager-unstable, home-manager-stable, nix-doom-emacs, + nix-straight, stylix, blocklist-hosts, rust-overlay, org-nursery, org-yaap, org-side-tree, org-timeblock, org-krita, phscroll, mini-frame, ... }: let # ---- SYSTEM SETTINGS ---- # @@ -98,6 +98,14 @@ else nixpkgs.lib); + # use home-manager-stable if running a server (homelab or worklab profile) + # otherwise use home-manager-unstable + home-manager = (if ((systemSettings.profile == "homelab") || (systemSettings.profile == "worklab")) + then + home-manager-stable + else + home-manager-unstable); + # Systems that can run tests: supportedSystems = [ "aarch64-linux" "i686-linux" "x86_64-linux" ]; @@ -183,8 +191,11 @@ emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; - home-manager.url = "github:nix-community/home-manager/master"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager-unstable.url = "github:nix-community/home-manager/master"; + home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; + + home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; + home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs";