diff --git a/flake.nix b/flake.nix
index 3f988ae..92d5e8e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,7 @@
 
   outputs =
     {
+      self,
       nixpkgs,
       stylix,
       spicetify-nix,
@@ -39,7 +40,8 @@
             home-manager.useGlobalPkgs = true;
             home-manager.users.lucy = {
               imports = [
-                nixvim.homeModules.nixvim
+		inputs.ignis.homeManagerModules.default
+		nixvim.homeModules.nixvim
                 spicetify-nix.homeManagerModules.spicetify
                 ./home/home.nix
 
@@ -51,7 +53,7 @@
       };
 
       homeConfigurations.lucy = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
+	pkgs = nixpkgs.legacyPackages.${system};
         extraSpecialArgs = { inherit inputs; };
         modules = [
           stylix.homeModules.stylix
diff --git a/home/home.nix b/home/home.nix
index 32ab0a5..79fd02a 100755
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,4 +1,8 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  ...
+}:
 {
   imports = [
     ./hyprland.nix
@@ -28,6 +32,27 @@
     size = 48;
   };
 
+  programs.ignis = {
+    enable = true;
+    addToPythonEnv = true;
+    services = {
+      bluetooth.enable = true;
+      recorder.enable = true;
+      audio.enable = true;
+      network.enable = true;
+    };
+    sass = {
+      enable = true;
+      useDartSass = true;
+    };
+    extraPackages = with pkgs; [
+      hello
+      python313Packages.jinja2
+      python313Packages.materialyoucolor
+      python313Packages.pillow
+      dart-sass
+    ];
+  };
   programs.zsh = {
     enable = true;
     enableCompletion = true;
diff --git a/home/nixvim/coding.nix b/home/nixvim/coding.nix
index 65e3183..5efa8d5 100755
--- a/home/nixvim/coding.nix
+++ b/home/nixvim/coding.nix
@@ -12,12 +12,7 @@
 
         servers = {
           bashls.enable = true;
-          qmlls.enable = true;
-          qmlls.package = null;
-          qmlls.cmd = [
-            "qmlls"
-            "-E"
-          ];
+          pyright.enable = true;
           clangd.package = null;
           clangd.enable = true;
           clangd.cmd = [
@@ -38,6 +33,7 @@
             nix = [ "nixfmt" ];
             c = [ "clang-format" ];
             cpp = [ "clang-format" ];
+            python = [ "black" ];
           };
         };
       };
diff --git a/home/nixvim/nixvim.nix b/home/nixvim/nixvim.nix
index 669c00d..2706a88 100755
--- a/home/nixvim/nixvim.nix
+++ b/home/nixvim/nixvim.nix
@@ -16,6 +16,7 @@
       nixd
       nixpkgs-fmt
       stylua
+      black
     ];
     globals.mapleader = " ";
     defaultEditor = true;
diff --git a/home/programs.nix b/home/programs.nix
index 6db6517..dd37429 100755
--- a/home/programs.nix
+++ b/home/programs.nix
@@ -5,7 +5,6 @@
   ...
 }:
 {
-  imports = [ inputs.ignis.homeManagerModules.default ];
   home.packages = with pkgs; [
     nixfmt
     google-chrome
@@ -23,6 +22,7 @@
     ani-cli
     element-desktop
     gnome-tweaks
+    btop
     (discord.override {
       withOpenASAR = true; # can do this here too
       withVencord = true;
@@ -36,27 +36,6 @@
     };
   };
 
-  programs.ignis = {
-    enable = true;
-    addToPythonEnv = true;
-    services = {
-      bluethooth.enable = true;
-      recorder.enable = true;
-      audio.enable = true;
-      network.enable = true;
-      hyprland.enable = true;
-    };
-    sass = {
-      enable = true;
-      useDartSass = true;
-    };
-    extraPackages = with pkgs; [
-      hello
-      python313Packages.jinja2
-      python313Packages.materialyoucolor
-      python313Packages.pillow
-    ];
-  };
   programs.spicetify.enable = true;
   programs.fastfetch = {
     enable = true;
diff --git a/home/stylix.nix b/home/stylix.nix
index 6af966d..09cc449 100755
--- a/home/stylix.nix
+++ b/home/stylix.nix
@@ -6,8 +6,17 @@
       waybar.enable = true;
       waybar.addCss = false;
       hyprland.enable = true;
+      nixvim.enable = true;
+      foot.enable = true;
       hyprland.hyprpaper.enable = false;
       gnome.image.enable = false;
+      gnome.enable = true;
+      spicetify.enable = true;
+      fuzzel.enable = true;
+      dunst.enable = true;
+      vencord.enable = true;
+      vencord.fonts.enable = true;
+      gtksourceview.enable = false;
     };
   };
 }
diff --git a/home/waybar.nix b/home/waybar.nix
index 6c5e242..7760878 100755
--- a/home/waybar.nix
+++ b/home/waybar.nix
@@ -5,58 +5,60 @@
     systemd.enable = true;
     style = ''
 
-                                                      * {
-                                                              font-size: 14px;
-                                                              font-weight: 600;
+                                                            * {
+                                                                    font-size: 14px;
+                                                                    font-weight: 600;
+                                                            }
+                                                            
+                                                      window#waybar {
+                                                      	background-color: transparent;
+                  					border-radius: ${builtins.toString config.wayland.windowManager.hyprland.settings.decoration.rounding};
                                                       }
-                                                      
-                                                window#waybar {
-                                                	background-color: transparent;
-            					border-radius: ${builtins.toString config.wayland.windowManager.hyprland.settings.decoration.rounding};
-                                                }
 
-                                                #workspaces button {
-                                                	all: unset;
-                                                	padding:  1px 3px;
-                                                	color: alpha(@base05, 0.5);
-                                                	border-radius: 1em;
-                                                }
+                                                      #workspaces button {
+                                                      	all: unset;
+                                                      	padding:  1px 3px;
+                                                      	color: alpha(@base05, 0.5);
+                                                      	border-radius: 1em;
+                                                      }
 
 
-                                                #workspaces button.active {
-                                                	color: @base05;
-                                                }
+                                                      #workspaces button.active {
+                                                      	color: @base05;
+                                                      }
 
-                                                #workspaces {
-                                                	margin: 0px;
-                                                	padding: 2px 6px;
-                                                	background-color: @base00;
-                                                	border-radius: 1em;
-                                                }
-                        	  		  #mpris,
-                                                #backlight,
-                                                #tray,
-                                                #pulseaudio,
-                                                #window,
-                                                #upower,
-                                                #clock,
-                                                #power-profiles-daemon {
-                                                	padding: 2px 10px;
-                                                	background-color: @base00;
-                                                	color: @base05;
-      						border-radius: ${builtins.toString config.wayland.windowManager.hyprland.settings.decoration.rounding};
-                                                }
+                                                      #workspaces {
+                                                      	margin: 0px;
+                                                      	padding: 2px 6px;
+                                                      	background-color: @base00;
+                                                      	border-radius: 1em;
+                                                      }
+                              	  		  #mpris,
+                                                      #backlight,
+                                                      #tray,
+                                                      #pulseaudio,
+                                                      #window,
+                                                      #upower,
+                                                      #clock,
+                                                      #power-profiles-daemon {
+                                                      	padding: 2px 10px;
+                                                      	background-color: @base00;
+                                                      	color: @base05;
+            						border-radius: ${builtins.toString config.wayland.windowManager.hyprland.settings.decoration.rounding};
+                                                      }
 
-                                                #tray {
-                                                	padding: 0px 8px;
-                                                }
+                                                      #tray {
+                                                      	padding: 0px 8px;
+                                                      }
 
-                                                window#waybar.empty #window {
-                                                	background: none;
-                                                }
-                  			      #custom-sep {
-                  				color: alpha(@base05, 0.5);
-                  			      }
+                                                      window#waybar.empty #window {
+                                                      	background: none;
+      							padding: 0px;
+      							margin: 0px;
+                                                      }
+                        			      #custom-sep {
+                        				color: alpha(@base05, 0.5);
+                        			      }
     '';
     settings = {
       mainBar = {
@@ -68,14 +70,14 @@
         spacing = 4;
         modules-left = [
           "hyprland/workspaces"
-          "hyprland/window"
           "mpris"
         ];
+        modules-center = [
+          "hyprland/window"
+        ];
         modules-right = [
-          "backlight"
           "pulseaudio"
           "upower"
-          "power-profiles-daemon"
           "clock"
           "tray"
         ];
@@ -94,6 +96,7 @@
 
         "tray" = {
           icon-size = 14;
+	  spacing = 5;
         };
 
         "hyprland/workspaces" = {
@@ -109,11 +112,6 @@
           tooltip-spacing = 20;
         };
 
-        "power-profiles-daemon" = {
-          format = "{profile}";
-          format-tooltip = "Power profile: {profile}\nDriver: {driver}";
-        };
-
         "backlight" = {
           format = "{icon} {percent}%";
           format-icons = [
diff --git a/stylix.nix b/stylix.nix
index a4b7596..9687f3b 100755
--- a/stylix.nix
+++ b/stylix.nix
@@ -19,11 +19,14 @@
   stylix = {
     enable = true;
     autoEnable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark.yaml";
     polarity = "dark";
     image = ./home/wallpaper.png;
     targets = {
       qt.platform = lib.mkForce "qtct";
+      gnome.enable = true;
+      gtk.enable = true;
+      gtksourceview.enable = false;
     };
     fonts = {
       sizes = {