diff --git a/modules/features/desktop-session.nix b/modules/features/desktop-session.nix
deleted file mode 100644
index d47b67d..0000000
--- a/modules/features/desktop-session.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, ... }:
-let
-  homeModules = config.flake.modules.homeManager;
-in
-{
-  flake.modules.homeManager.desktop-session = {
-    imports = [
-      homeModules.niri
-      homeModules.clipboard
-      homeModules.local-apps
-      homeModules.mpv
-      homeModules.vicinae
-      homeModules.xdg
-      homeModules.theme
-    ];
-  };
-}
diff --git a/modules/features/theme.nix b/modules/features/theme.nix
index 915146b..e10269c 100644
--- a/modules/features/theme.nix
+++ b/modules/features/theme.nix
@@ -1,7 +1,36 @@
 {
+  flake.modules.nixos.theme =
+    {
+      pkgs,
+      ...
+    }:
+    let
+      cursorTheme = {
+        name = "phinger-cursors-light";
+        package = pkgs.phinger-cursors;
+        size = 24;
+      };
+    in
+    {
+      environment.systemPackages = [ cursorTheme.package ];
+
+      services.displayManager.sddm.settings = {
+        Theme = {
+          CursorTheme = cursorTheme.name;
+          CursorSize = cursorTheme.size;
+        };
+      };
+    };
+
   flake.modules.homeManager.theme =
     { config, pkgs, ... }:
     let
+      cursorTheme = {
+        name = "phinger-cursors-light";
+        package = pkgs.phinger-cursors;
+        size = 24;
+      };
+
       kanagawaThemeSrc = pkgs.fetchFromGitHub {
         owner = "Fausto-Korpsvart";
         repo = "Kanagawa-GKT-Theme";
@@ -16,9 +45,11 @@
     in
     {
       home.pointerCursor = {
-        name = "phinger-cursors-light";
-        package = pkgs.phinger-cursors;
-        size = 24;
+        inherit (cursorTheme)
+          name
+          package
+          size
+          ;
         gtk.enable = true;
       };
 
diff --git a/modules/features/workstation-base.nix b/modules/features/workstation-base.nix
index accd586..f80f115 100644
--- a/modules/features/workstation-base.nix
+++ b/modules/features/workstation-base.nix
@@ -6,19 +6,20 @@ in
 {
   flake.modules.nixos.workstation-base = {
     imports = [
-      nixosModules.host-base
-      nixosModules.input
-      nixosModules.sops-admin-key-file
-      nixosModules.standard-boot
-      nixosModules.sddm
-      nixosModules.niri
       nixosModules.audio
       nixosModules.bluetooth
       nixosModules.flatpak
       nixosModules.fonts
+      nixosModules.host-base
+      nixosModules.input
       nixosModules.networking
+      nixosModules.niri
       nixosModules.printing
       nixosModules.qbittorrent-client
+      nixosModules.sddm
+      nixosModules.sops-admin-key-file
+      nixosModules.standard-boot
+      nixosModules.theme
     ];
 
     users.mutableUsers = false;
@@ -31,19 +32,25 @@ in
 
   flake.modules.homeManager.workstation-base = {
     imports = [
-      homeModules.terminal
-      homeModules.shell
+      homeModules.ai
+      homeModules.clipboard
+      homeModules.dev-tools
+      homeModules.git
+      homeModules.local-apps
+      homeModules.mpv
       homeModules.neovim
       homeModules.nh
-      homeModules.git
-      homeModules.dev-tools
-      homeModules.podman
-      homeModules.ai
-      homeModules.desktop-session
-      homeModules.personal-productivity
-      homeModules.ssh-client
-      homeModules.sops
+      homeModules.niri
       homeModules.nix
+      homeModules.personal-productivity
+      homeModules.podman
+      homeModules.shell
+      homeModules.sops
+      homeModules.ssh-client
+      homeModules.terminal
+      homeModules.theme
+      homeModules.vicinae
+      homeModules.xdg
     ];
   };
 }