diff --git a/flake.lock b/flake.lock
index 208ad3b..d6df66e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -281,6 +281,30 @@
         "type": "github"
       }
     },
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": [
+          "quickshell"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1761190730,
+        "narHash": "sha256-XAs/Q4zBJIfK/bwq9KjTUkTH15A+Pe2rIilyvalEHuM=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "c3439b262c7cb3d57c93197a93a3aa382582bdae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -306,12 +330,34 @@
         "type": "github"
       }
     },
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760822546,
+        "narHash": "sha256-cy3wJQQzQbZ/EYUfTDuMiP/haPOjkqGgWOPPl7K9oiM=",
+        "owner": "outfoxxed",
+        "repo": "quickshell",
+        "rev": "3e2ce40b18af943f9ba370ed73565e9f487663ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "outfoxxed",
+        "repo": "quickshell",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "disko": "disko",
         "home-manager": "home-manager",
         "nix-colors": "nix-colors",
         "nixpkgs": "nixpkgs",
+        "noctalia": "noctalia",
+        "quickshell": "quickshell",
         "spicetify-nix": "spicetify-nix",
         "stylix": "stylix",
         "zen-browser": "zen-browser"
@@ -320,7 +366,7 @@
     "spicetify-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_2",
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1760848035,
@@ -349,7 +395,7 @@
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -400,6 +446,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index d0360e0..3a24822 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,15 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    quickshell = {
+      url = "github:outfoxxed/quickshell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.quickshell.follows = "quickshell";  # Use same quickshell version
+    };
 
     nix-colors.url = "github:misterio77/nix-colors";
 
diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix
index 626f66a..6b4ffe8 100644
--- a/modules/home-manager/home.nix
+++ b/modules/home-manager/home.nix
@@ -11,6 +11,7 @@ in {
   imports = [
     inputs.zen-browser.homeModules.twilight
     inputs.spicetify-nix.homeManagerModules.default
+    ./noctalia.nix
   ];
   # Home Manager settings
   nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
@@ -28,7 +29,7 @@ in {
     tmux
     fastfetch
     btop
-    spotify
+    #spotify
     pavucontrol
     wl-clipboard
     hyprcursor
@@ -46,7 +47,7 @@ in {
     wofi
     mako
     kitty
-    vesktop
+#    vesktop
     libsForQt5.qtstyleplugin-kvantum
     libsForQt5.qt5ct
     rose-pine-kvantum
@@ -57,12 +58,13 @@ in {
     DisableAppUpdate = true;
     DisableTelemetry = true;
   };
+  programs.vesktop.enable = true;
 
-  #programs.spicetify = {
-  #  enable = true;
+  programs.spicetify = {
+    enable = true;
   #  theme = spicePkgs.themes.ziro;
   #  colorScheme = "rose-pine-moon";
-  #};
+  };
 
   xdg.configFile."hypr" = {
     source = symlink "${dots}/hypr";
@@ -113,37 +115,7 @@ in {
     userEmail = "tulg@protonmail.ch";
   };
 
-  # gtk = {
-  # enable = true;
 
-  # theme = {
-  #   name = "Nordic-darker";
-  #   package = pkgs.nordic;
-  # };
-
-  #  iconTheme = {
-  #    name = "Papirus-Dark";
-  #    package = pkgs.papirus-icon-theme;
-  #  };
-  #};
-
-  #home.pointerCursor = {
-  #  gtk.enable = true;
-  #  x11.enable = true;
-  #  package = pkgs.bibata-cursors;
-  #  name = "Bibata-Modern-Classic";
-  #  size = 16;
-  #};
-  #nixpkgs.config.qt5 = {
-  #  enable = true;
-  #  platformTheme = "qt5ct";
-  #  style = {
-  #    package = pkgs.rose-pine-kvantum;
-  #    name = "Rose-pine";
-  #  };
-  #};
-  #
-  #
   home.sessionVariables = {
     NIXOS_OZONE_WL = "1"; # hint Electron apps to use Wayland
     # GTK_THEME = "rose-pine";
diff --git a/modules/home-manager/noctalia.nix b/modules/home-manager/noctalia.nix
new file mode 100644
index 0000000..c00de0b
--- /dev/null
+++ b/modules/home-manager/noctalia.nix
@@ -0,0 +1,69 @@
+{ pkgs, inputs, ... }:
+{
+  home-manager.users.drfoobar = {
+    # import the home manager module
+    imports = [
+      inputs.noctalia.homeModules.default
+    ];
+
+    # configure options
+    programs.noctalia-shell = {
+      enable = true;
+      settings = {
+        # configure noctalia here; defaults will
+        # be deep merged with these attributes.
+        bar = {
+          density = "compact";
+          position = "right";
+          showCapsule = false;
+          widgets = {
+            left = [
+              {
+                id = "SidePanelToggle";
+                useDistroLogo = true;
+              }
+              {
+                id = "WiFi";
+              }
+              {
+                id = "Bluetooth";
+              }
+            ];
+            center = [
+              {
+                hideUnoccupied = false;
+                id = "Workspace";
+                labelMode = "none";
+              }
+            ];
+            right = [
+              {
+                alwaysShowPercentage = false;
+                id = "Battery";
+                warningThreshold = 30;
+              }
+              {
+                formatHorizontal = "HH:mm";
+                formatVertical = "HH mm";
+                id = "Clock";
+                useMonospacedFont = true;
+                usePrimaryColor = true;
+              }
+            ];
+          };
+        };
+        colorSchemes.predefinedScheme = "Rosepine";
+        general = {
+          avatarImage = "/home/drfoobar/.face";
+          radiusRatio = 0.2;
+        };
+        location = {
+          monthBeforeDay = true;
+          name = "Bursa";
+        };
+      };
+      # this may also be a string or a path to a JSON file,
+      # but in this case must include *all* settings.
+    };
+  };
+}
diff --git a/modules/home-manager/stylix.nix b/modules/home-manager/stylix.nix
index 5800001..16352cf 100644
--- a/modules/home-manager/stylix.nix
+++ b/modules/home-manager/stylix.nix
@@ -1,4 +1,60 @@
-{pkgs, ...}: {
-  stylix.enable = true;
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
+{ config, pkgs, ... }:
+
+{
+  fonts.fontconfig.enable = true;
+  fonts.packages = with pkgs; [
+    noto-fonts-emoji
+    fira
+    fira-sans
+    fira-code
+    dejavu_fonts
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.iosevka
+  ];
+
+  stylix = {
+    enable = true;
+
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
+
+    fonts = {
+      serif = {
+        package = pkgs.fira;
+        name = "Fira Sans Regular";
+      };
+
+      sansSerif = {
+        package = pkgs.fira;
+        name = "Fira Sans Regular";
+      };
+
+      monospace = {
+        package = pkgs.fira;
+        name = "Fira Sans Regular";
+      };
+
+      emoji = {
+        package = pkgs.noto-fonts-emoji;
+        name = "Noto Color Emoji";
+      };
+
+      sizes = {
+        applications = 10;
+        terminal = 10;
+        desktop = 10;
+        popups = 10;
+      };
+    };
+
+    targets.nixvim.enable = false;
+    targets.qt.enable = true;
+    # targets.rofi.enable = false;
+    targets.spicetify.enable = true;
+#    image = ../../assets/Shogoki.png;
+
+    # opacity = {
+    #   desktop = 0.5;
+    #   terminal = 0.9;
+    # };
+  };
 }