feat: enable stylix integration with home-manager

5 files changed, 5 insertions, 17 deletions

diff --git a/flake.nix b/flake.nix
index ec1c6e9..017a9b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,7 +33,6 @@
         specialArgs = {inherit inputs outputs;};
         modules = [
           ./nixos/configuration.nix
-          inputs.stylix.nixosModules.stylix
         ];
       };
     };
@@ -47,6 +46,7 @@
         modules = [
           ./home-manager/${stevenUserName}/home.nix
           inputs.nixvim.homeManagerModules.nixvim
+          inputs.stylix.homeManagerModules.stylix
         ];
       };
     };
diff --git a/home-manager/stvnliu/gtk.nix b/home-manager/stvnliu/gtk.nix
index 1ad19cf..c7223c1 100644
--- a/home-manager/stvnliu/gtk.nix
+++ b/home-manager/stvnliu/gtk.nix
@@ -5,19 +5,6 @@
 }: {
   gtk = {
     enable = true;
-    cursorTheme = {
-      package = pkgs.vanilla-dmz;
-      name = "Vanilla-DMZ";
-      size = 24;
-    };
-    font = {
-      name = "Aileron";
-      size = 10;
-    };
-    theme = {
-      package = pkgs.gruvbox-gtk-theme;
-      name = "Gruvbox-Dark-BL";
-    };
     iconTheme = {
       package = pkgs.gruvbox-plus-icons;
       name = "Gruvbox-Plus-Dark";
diff --git a/home-manager/stvnliu/home.nix b/home-manager/stvnliu/home.nix
index cce1c31..607c4b1 100644
--- a/home-manager/stvnliu/home.nix
+++ b/home-manager/stvnliu/home.nix
@@ -23,6 +23,7 @@
     ./gtk.nix
     ./ags
     ./xdg.nix
+    ./stylix.nix
   ];
 
   nixpkgs = {
diff --git a/nixos/stylix.nix b/home-manager/stvnliu/stylix.nix
index 46cd59c..3ba2323 100644
--- a/nixos/stylix.nix
+++ b/home-manager/stvnliu/stylix.nix
@@ -1,6 +1,7 @@
 {pkgs, ...}: {
   stylix = {
+    enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
-    stylix.image = ../home-manager/stvnliu/assets/gruvbox-wallpaper.png;
+    image = ./assets/gruvbox-wallpaper.png;
   };
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 9c673ad..2ef2d79 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -15,12 +15,11 @@
     ./fonts.nix
     ./services/laptop.preset.nix
     ./hardware-configuration.nix
-    #./ags.nix
-    ./xdg.nix
   ];
   environment.variables = {
     GDK_SCALE = config.displayScale;
     FLAKE = config.myConfigLocation;
+    GTK_IM_MODULE = lib.mkForce "";
   };
   security.pam.services.hyprlock = {};
   i18n.inputMethod = {