home-manager/cursors.nix

@@ -1,16 +0,0 @@
-let
-  theme = import ../theme.nix;
-in
-{
-  catppuccin.cursors = {
-    enable = true;
-    flavor = theme.flavor;
-    accent = "dark";
-  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    x11.enable = true;
-    size = 16;
-  };
-}

home-manager/default.nix

@@ -14,7 +14,6 @@ in
     inputs.nixvim.homeManagerModules.nixvim
     ./btop.nix
     ./cava.nix
-    ./cursors.nix
     ./default-applications.nix
     ./development
     ./fish.nix
@@ -30,6 +29,8 @@ in
     ./yazi
   ];
 
+  catppuccin.cursors.enable = true;
+
   dconf = {
     enable = true;
     settings = {

home-manager/development/default.nix

@@ -4,6 +4,6 @@
     ./nixvim
     ./zed.nix
   ];
-  # TODO set Wayland vmOptions in Jetbrains products, Requires current installed version in path
+  # TODO set Walyland vmOptions in Jetbrains products, Requires current installed version
   # -Dawt.toolkit.name=WLToolKit
 }

home-manager/hyprland/default.nix

@@ -4,6 +4,7 @@
 {
   imports = [
     ./binds.nix
+    ./hyprcursor
     ./waybar
     ./hypridle
     ./hyprlock

home-manager/hyprland/hyprcursor/default.nix

@@ -0,0 +1,37 @@
+{ pkgs, ... }:
+let
+  cursorSize = 24;
+  cursorTheme = "rose-pine-hyprcursor";
+  cursorDir = "hyprcursors";
+in
+{
+  # TODO remove in favor of Catppuccin cursors
+  home = {
+    packages = with pkgs; [
+      hyprcursor
+    ];
+
+    file = {
+      ".local/share/icons/${cursorTheme}/manifest.hl".text = ''
+        name = ${cursorTheme}
+        description = BreezeX remixed with Rose Pine remixed to Hyprcursor format
+        version = 0.3.2
+        cursors_directory = ${cursorDir}
+      '';
+      ".local/share/icons/${cursorTheme}/${cursorDir}" = {
+        source = ./${cursorDir};
+        recursive = true;
+      };
+    };
+
+    sessionVariables = {
+      XCURSOR_SIZE = cursorSize;
+      HYPRCURSOR_SIZE = cursorSize;
+      HYPRCURSOR_THEME = cursorSize;
+    };
+  };
+
+  wayland.windowManager.hyprland.settings.exec-once = [
+    "hyprctl setcursor $HYPRCURSOR_THEME $HYPRCURSOR_SIZE" # Set cursor
+  ];
+}

home-manager/hyprland/hypridle/default.nix

@@ -1,7 +1,7 @@
 let
   # Time in seconds
   lockAfter = 1200;
-  screenOffAfter = 1500;
+  #screenOffAfter = 1500;
   suspendAfter = 7200;
 in
 {
@@ -20,12 +20,12 @@ in
           timeout = lockAfter;
           on-timeout = "loginctl lock-session";
         }
-        # Turn off screens
-        {
-          timeout = screenOffAfter;
-          on-timeout = "hyprctl dispatch dpms off";
-          on-resume = "hyprctl dispatch dpms on";
-        }
+        # Turn off screens TODO still buggy on DP-1
+        # {
+        #   timeout = screenOffAfter;
+        #   on-timeout = "hyprctl dispatch dpms off";
+        #   on-resume = "hyprctl dispatch dpms on";
+        # }
         # Suspend
         {
           timeout = suspendAfter;

home-manager/hyprland/settings.nix

@@ -7,8 +7,8 @@ in
 {
   wayland.windowManager.hyprland.settings = {
     monitor = [
-      "DP-1, 3440x1440@175, 0x0, 1"
-      "DP-3, 3840x2160@60, 3440x0, 1.5, transform, 1"
+      "DP-1, 1920x1080@144, 0x0, 1"
+      "DP-3, 3840x2160@60, 1920x0, 1.5, transform, 1"
     ];
 
     # Autostart

modules/terminal/shell.nix

@@ -24,7 +24,6 @@
       shellAliases = {
         # Transfer shell config to target device
         ssh = "kitty +kitten ssh";
-        nix-shell = "nix-shell --run fish"; # Start nix-shells using fish
       };
     };
   };