Move stylix config as default per system

arunoruto · Oct 14, 2024 · 676cceb · 676cceb
1 parent a0b5457
commit 676cceb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 36 deletions.
diff --git a/flake.nix b/flake.nix
@@ -131,6 +131,12 @@
       nixpkgs-config
       nur.nixosModules.nur
       stylix-config
+      {
+        theming = {
+          inherit scheme;
+          inherit image;
+        };
+      }
     ];
     home-manager-modules = [
       # {
@@ -147,6 +153,12 @@
       #   #stylix.targets.nixvim.enable = nixpkgs.lib.mkDefault false;
       # }
       ./modules/home-manager/home.nix
+      {
+        theming = {
+          inherit scheme;
+          inherit image;
+        };
+      }
     ];
   in {
     nixosConfigurations = {
@@ -155,8 +167,6 @@
         inherit system;
         specialArgs = {
           inherit inputs;
-          inherit scheme;
-          inherit image;
           username = "mirza";
         };
         modules =
@@ -173,8 +183,6 @@
         inherit system;
         specialArgs = {
           inherit inputs;
-          inherit scheme;
-          inherit image;
           username = "mirza";
         };
         modules =
@@ -191,8 +199,6 @@
         inherit system;
         specialArgs = {
           inherit inputs;
-          inherit scheme;
-          inherit image;
           username = "mirza";
         };
         modules =
@@ -209,8 +215,6 @@
         inherit system;
         specialArgs = {
           inherit inputs;
-          inherit scheme;
-          inherit image;
           username = "mar";
         };
         modules =
@@ -229,8 +233,6 @@
         inherit system;
         specialArgs = {
           inherit inputs;
-          inherit scheme;
-          inherit image;
           username = "mirza";
         };
         modules =
@@ -247,8 +249,6 @@
         inherit system;
         specialArgs = {
           inherit inputs;
-          inherit scheme;
-          inherit image;
           username = "mirza";
         };
         modules =
@@ -264,8 +264,6 @@
         inherit system;
         specialArgs = {
           inherit inputs;
-          inherit scheme;
-          inherit image;
           username = "mirza";
         };
         modules =
@@ -311,8 +309,6 @@
           ];
         extraSpecialArgs = {
           inherit inputs;
-          inherit scheme;
-          inherit image;
           user = "mar";
         };
       };

diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix
@@ -4,11 +4,7 @@
   lib,
   user,
   ...
-}: let
-  # Email hash to get the gravatar image:
-  # echo -n "[email protected]" | sha256sum | awk '{print $1}'
-  gravatar = "4859e08193d7c964399632a8d55915804af07bf714a68aabe8bf2c2656c96f4a";
-in {
+}: {
   imports = [
     ./hosts
     ./pc
@@ -23,11 +19,7 @@ in {
   environment.enable = true;
 
   # Allow unfree software
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-    };
-  };
+  nixpkgs.config.allowUnfree = true;
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;

diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix
@@ -4,9 +4,7 @@
   # pkgs,
   ...
 }: {
-  options = {
-    kde.enable = lib.mkEnableOption "Use the KDE desktop environment";
-  };
+  options.kde.enable = lib.mkEnableOption "Use the KDE desktop environment";
 
   config = lib.mkIf config.kde.enable {
     services = {

diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
@@ -1,8 +1,8 @@
 {
   # pkgs,
   lib,
-  image,
-  scheme,
+  # image,
+  # scheme,
   ...
 }: {
   imports = [
@@ -17,11 +17,11 @@
 
   nix-utils.enable = lib.mkDefault true;
   secureboot.enable = lib.mkDefault false;
-  theming = {
-    # enable = lib.mkDefault true;
-    inherit image;
-    inherit scheme;
-  };
+  # theming = {
+  #   # enable = lib.mkDefault true;
+  #   inherit image;
+  #   inherit scheme;
+  # };
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions