let flakes manage nix-cage

Keksgesicht · Nov 1, 2023 · cc60fdc · cc60fdc
1 parent 13e23a4
commit cc60fdc
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 20 deletions.
diff --git a/development/nix-cage.nix → development/NixOS-wrappers/cage.nix b/development/nix-cage.nix → development/NixOS-wrappers/cage.nix
@@ -1,16 +1,8 @@
-{ config, pkgs, ...}:
+{ config, pkgs-unstable, ...}:
 
-let
-  nix-cage-commit = "b831a0197efe69ae552182318f553e651474ff96";
-  nix-cage-sha256 = "0nmq0z12m07snb4zl1ik12bqi62pqf20l6khhjgpnwad11cwl93x";
-  nix-cage = import (fetchTarball {
-    url = "https://github.com/thiagokokada/nix-cage/archive/${nix-cage-commit}.tar.gz";
-    sha256 = "${nix-cage-sha256}";
-  }) {};
-in
 {
   environment = {
-    systemPackages = [ nix-cage ];
+    systemPackages = [ pkgs-unstable.nix-cage ];
     etc = {
       "nix-cage/devel.json" = {
         text = ''

diff --git a/development/NixOS-wrappers/default.nix b/development/NixOS-wrappers/default.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./cage.nix
+  ];
+}
diff --git a/development/default.nix b/development/default.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   imports = [
     ./base-devel.nix
     ./desktop.nix
     ./neovim.nix
-    ./nix-cage.nix
+    ./NixOS-wrappers
   ];
 }
diff --git a/flake.nix b/flake.nix
@@ -3,11 +3,15 @@
     nixpkgs-stable.url = "nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
-    home-manager = {
-      #url = "github:nix-community/home-manager/release-23.05";
+    home-manager-stable = {
+      url = "github:nix-community/home-manager/release-23.05";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+    home-manager-unstable = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+
     tuxedo-nixos = {
       url = "github:blitz/tuxedo-nixos";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -16,15 +20,22 @@
       url = "github:nix-community/lanzaboote";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+
+    nix-cage = {
+      url = "github:thiagokokada/nix-cage";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
   };
 
   outputs = {
     self,
     nixpkgs-stable,
     nixpkgs-unstable,
-    home-manager,
+    home-manager-stable,
+    home-manager-unstable,
     lanzaboote,
-    tuxedo-nixos
+    tuxedo-nixos,
+    nix-cage,
   }@inputs: {
     nixosConfigurations = {
 
@@ -35,12 +46,14 @@
           inherit inputs;
           pkgs-unstable = import nixpkgs-unstable {
             system = system;
-            #config.allowUnfree = true;
+            overlays = [
+              nix-cage.overlay
+            ];
           };
         };
         modules = [
           ./machines/cookieclicker.nix
-          home-manager.nixosModules.home-manager
+          home-manager-unstable.nixosModules.home-manager
           lanzaboote.nixosModules.lanzaboote
         ];
       };
@@ -51,12 +64,14 @@
           inherit inputs;
           pkgs-unstable = import nixpkgs-unstable {
             system = system;
-            #config.allowUnfree = true;
+            overlays = [
+              nix-cage.overlay
+            ];
           };
         };
         modules = [
           ./machines/cookiethinker.nix
-          home-manager.nixosModules.home-manager
+          home-manager-unstable.nixosModules.home-manager
           tuxedo-nixos.nixosModules.default
           lanzaboote.nixosModules.lanzaboote
         ];