diff --git a/modules/hosts/sirius/config.nix b/modules/hosts/sirius/config.nix
index 420dc5b..fda5d1a 100644
--- a/modules/hosts/sirius/config.nix
+++ b/modules/hosts/sirius/config.nix
@@ -1,7 +1,7 @@
+{ config, ... }:
 {
   flake.modules.nixos.sirius =
     {
-      config,
       lib,
       pkgs,
       hostName,
@@ -10,6 +10,9 @@
       ...
     }:
     {
+
+      imports = with config.flake.modules.nixos; [ desktop ];
+
       # --- Boot ---
       boot = {
         loader = {
@@ -48,7 +51,6 @@
           enable32Bit = true;
         };
         nvidia = {
-          package = config.boot.kernelPackages.nvidiaPackages.stable;
           modesetting.enable = true;
           open = false;
           nvidiaSettings = true;
@@ -60,48 +62,6 @@
 
       services.xserver.videoDrivers = [ "nvidia" ];
 
-      # --- Locale ---
-      time.timeZone = "Asia/Kolkata";
-      i18n = {
-        defaultLocale = "en_US.UTF-8";
-        extraLocaleSettings = lib.genAttrs [
-          "LC_ADDRESS"
-          "LC_IDENTIFICATION"
-          "LC_MEASUREMENT"
-          "LC_MONETARY"
-          "LC_NAME"
-          "LC_NUMERIC"
-          "LC_PAPER"
-          "LC_TELEPHONE"
-          "LC_TIME"
-        ] (_: "en_IN");
-      };
-
-      # --- Desktop ---
-      services = {
-        displayManager.ly.enable = true;
-        desktopManager.plasma6.enable = true;
-      };
-
-      # --- Fonts ---
-      fonts.packages = with pkgs.nerd-fonts; [
-        fira-code
-        jetbrains-mono
-        bigblue-terminal
-      ];
-
-      # --- Audio ---
-      services.pulseaudio.enable = false;
-      security.rtkit.enable = true;
-      services.pipewire = {
-        enable = true;
-        alsa = {
-          enable = true;
-          support32Bit = true;
-        };
-        pulse.enable = true;
-      };
-
       # --- SSH ---
       services.openssh = {
         enable = true;
@@ -142,7 +102,6 @@
 
       # --- Packages ---
       environment.systemPackages = with pkgs; [
-        neovim
         discord
         pciutils
         brave
diff --git a/modules/nixos/core/users.nix b/modules/nixos/core/users.nix
index 1a2a8c6..97395b6 100644
--- a/modules/nixos/core/users.nix
+++ b/modules/nixos/core/users.nix
@@ -2,6 +2,7 @@
   flake.modules.nixos.core =
     {
       pkgs,
+      lib,
       userName,
       userEmail,
       ...
@@ -9,6 +10,22 @@
     {
       programs.zsh.enable = true;
 
+      time.timeZone = "Asia/Kolkata";
+      i18n = {
+        defaultLocale = "en_US.UTF-8";
+        extraLocaleSettings = lib.genAttrs [
+          "LC_ADDRESS"
+          "LC_IDENTIFICATION"
+          "LC_MEASUREMENT"
+          "LC_MONETARY"
+          "LC_NAME"
+          "LC_NUMERIC"
+          "LC_PAPER"
+          "LC_TELEPHONE"
+          "LC_TIME"
+        ] (_: "en_IN");
+      };
+
       users = {
         mutableUsers = false;
         defaultUserShell = pkgs.zsh;
diff --git a/modules/nixos/desktop/audio.nix b/modules/nixos/desktop/audio.nix
new file mode 100644
index 0000000..a7d0ec1
--- /dev/null
+++ b/modules/nixos/desktop/audio.nix
@@ -0,0 +1,14 @@
+{
+  flake.modules.nixos.desktop = {
+
+    security.rtkit.enable = true;
+
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      wireplumber.enable = true;
+    };
+  };
+}
diff --git a/modules/nixos/desktop/font.nix b/modules/nixos/desktop/font.nix
new file mode 100644
index 0000000..05a42f0
--- /dev/null
+++ b/modules/nixos/desktop/font.nix
@@ -0,0 +1,11 @@
+{
+  flake.modules.nixos.desktop =
+    { pkgs, ... }:
+    {
+      fonts.packages = with pkgs.nerd-fonts; [
+        fira-code
+        jetbrains-mono
+        bigblue-terminal
+      ];
+    };
+}
diff --git a/modules/nixos/desktop/ly.nix b/modules/nixos/desktop/ly.nix
new file mode 100644
index 0000000..feea59e
--- /dev/null
+++ b/modules/nixos/desktop/ly.nix
@@ -0,0 +1,10 @@
+{
+  flake.modules.nixos.desktop = {
+    services.displayManager.ly = {
+      enable = true;
+      settings = {
+        session_log = "null";
+      };
+    };
+  };
+}
diff --git a/modules/nixos/desktop/plasma.nix b/modules/nixos/desktop/plasma.nix
new file mode 100644
index 0000000..d51dbb3
--- /dev/null
+++ b/modules/nixos/desktop/plasma.nix
@@ -0,0 +1,5 @@
+{
+  flake.modules.nixos.desktop = {
+    services.desktopManager.plasma6.enable = true;
+  };
+}