Merge pull request #447 from genebean/rainbow

rainbow
genebean · Aug 20, 2024 · 6803b2c · 6803b2c
2 parents c74f5d4 + e515268
commit 6803b2c
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 87 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -48,6 +48,7 @@
 
     nixos-cosmic = {
       url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs-stable.follows = "nixpkgs";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -59,12 +60,17 @@
       inputs.nixpkgs-1_9.follows = "nixpkgs-unstable";
     };
 
-    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+    simple-nixos-mailserver = {
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+      inputs.nixpkgs-24_05.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Secrets managemnt
     sops-nix = {
       url = "github:mic92/sops-nix";
       inputs.nixpkgs.follows ="nixpkgs";
+      inputs.nixpkgs-stable.follows = "nixpkgs";
     };
 
   }; # end inputs

diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, username, ... }: {
+{ config, inputs, pkgs, username, ... }: {
   imports = [
     ./hardware-configuration.nix
     ../../../system/common/linux/flatpaks.nix
@@ -32,6 +32,7 @@
     go
     hubble
     hugo
+    inputs.flox.packages.${pkgs.system}.default
     kubectl
     kubectx
     kubernetes-helm
@@ -77,7 +78,7 @@
       # require enabling PolKit integration on some desktop environments (e.g. Plasma).
       polkitPolicyOwners = [ "${username}" ];
     };
-    hyprland.enable = true;
+    #hyprland.enable = true;
 
     ssh.askPassword = "ssh-askpass";