diff --git a/configuration.nix b/configuration.nix
index a2cbc05..cb390dc 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,7 +2,7 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, callPackage, ... }:
+{ config, lib, pkgs, callPackage, catppuccinFlavor, ... }:
 
 {
   imports =
@@ -10,6 +10,8 @@
       ./hardware-configuration.nix
     ];
 
+  catppuccin.flavor = catppuccinFlavor;
+  catppuccin.enable = true;
   programs.dconf.enable = true;
 
   # Use the systemd-boot EFI boot loader.
@@ -31,7 +33,12 @@
   # Enable the X11 windowing system
   services.xserver = {
     enable = true;
-
+    displayManager = {
+      sddm = {
+        enable = true;
+        package = pkgs.kdePackages.sddm;
+      };
+    };   
     desktopManager = {
       xterm.enable = false;
     };
@@ -91,6 +98,7 @@
   environment.shells = with pkgs; [ zsh ];
   users.defaultUserShell = pkgs.zsh;
   environment.systemPackages = with pkgs; [
+    auto-cpufreq
     neovim
     wget
     neofetch
diff --git a/flake.nix b/flake.nix
index 2e3a003..13593a6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,11 +16,18 @@
     lib = nixpkgs.lib;
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
+    catppuccinFlavor = "macchiato";
   in {
     nixosConfigurations = {
       hp-laptop-lho = lib.nixosSystem {
           inherit system;
-          modules = [ ./configuration.nix ];
+          specialArgs = {
+            inherit catppuccinFlavor;
+          };
+          modules = [ 
+            ./configuration.nix
+            catppuccin.nixosModules.catppuccin
+          ];
       };
     };
     homeConfigurations = {
@@ -28,6 +35,7 @@
           inherit pkgs;
           extraSpecialArgs = { 
             inherit inputs;
+            inherit catppuccinFlavor;
           };
           modules = [ 
             ./home.nix
diff --git a/home.nix b/home.nix
index a3d488e..5e2ffdc 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ config, pkgs, inputs, catppuccinFlavor, ... }:
 {
   imports = [
     inputs.spicetify-nix.homeManagerModules.default
@@ -16,15 +16,13 @@
       shuffle # shuffle+ (special characters are sanitized out of extension names)
     ];
     theme = spicePkgs.themes.catppuccin;
-    colorScheme = "macchiato";
+    colorScheme = catppuccinFlavor;
   };
 
   #themes
-  catppuccin.flavor = "macchiato";
+  catppuccin.flavor = catppuccinFlavor;
   catppuccin.enable = true;
 
-  gtk.cursorTheme.package = pkgs.bibata-cursors;
-  gtk.cursorTheme.name = "Bibata-Modern-Ice";
   gtk = {
     enable = true;
     catppuccin = {
@@ -32,11 +30,12 @@
       size = "standard";
       tweaks = [ "normal" ];
     };
+    iconTheme = {
+        package = pkgs.papirus-icon-theme;
+        name = "Papirus Dark";
+    };
   };
 
-#  gtk.theme.package = pkgs.catppuccin-gtk;
-#  gtk.theme.name = "adw-gtk3-dark";
-
   qt = {
     enable = true;
     platformTheme.name = "kvantum";