diff --git a/home-manager/cursors.nix b/home-manager/cursors.nix
new file mode 100644
index 0000000..d0ad7b9
--- /dev/null
+++ b/home-manager/cursors.nix
@@ -0,0 +1,16 @@
+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;
+ };
+}
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 54dd32b..ee2fbc1 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -14,6 +14,7 @@ in
inputs.nixvim.homeManagerModules.nixvim
./btop.nix
./cava.nix
+ ./cursors.nix
./default-applications.nix
./development
./fish.nix
@@ -29,8 +30,6 @@ in
./yazi
];
- catppuccin.cursors.enable = true;
-
dconf = {
enable = true;
settings = {
diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix
index db6e2a3..7948acc 100644
--- a/home-manager/hyprland/default.nix
+++ b/home-manager/hyprland/default.nix
@@ -4,7 +4,6 @@
{
imports = [
./binds.nix
- ./hyprcursor
./waybar
./hypridle
./hyprlock
diff --git a/home-manager/hyprland/hyprcursor/default.nix b/home-manager/hyprland/hyprcursor/default.nix
deleted file mode 100644
index e4ce621..0000000
--- a/home-manager/hyprland/hyprcursor/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ 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
- ];
-}
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/X_cursor.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/X_cursor.hlc
deleted file mode 100644
index 557db8d..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/X_cursor.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/all-scroll.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/all-scroll.hlc
deleted file mode 100644
index 7a96196..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/all-scroll.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc
deleted file mode 100644
index 2be20b2..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc
deleted file mode 100644
index ad8c5f9..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc
deleted file mode 100644
index 770a6ee..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_side.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/bottom_side.hlc
deleted file mode 100644
index 3eabbfa..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_side.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/center_ptr.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/center_ptr.hlc
deleted file mode 100644
index 408ec42..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/center_ptr.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/col-resize.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/col-resize.hlc
deleted file mode 100644
index 9b10e39..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/col-resize.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/color-picker.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/color-picker.hlc
deleted file mode 100644
index 5ec34da..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/color-picker.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/context-menu.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/context-menu.hlc
deleted file mode 100644
index 2ef5996..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/context-menu.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/copy.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/copy.hlc
deleted file mode 100644
index a601de2..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/copy.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/cross.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/cross.hlc
deleted file mode 100644
index 0e44481..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/cross.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc
deleted file mode 100644
index 1167b4f..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc
deleted file mode 100644
index c4a2da2..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/dotbox.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/dotbox.hlc
deleted file mode 100644
index 8948797..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/dotbox.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc
deleted file mode 100644
index 47be494..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/hand1.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/hand1.hlc
deleted file mode 100644
index 101e8ba..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/hand1.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/hand2.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/hand2.hlc
deleted file mode 100644
index 492d545..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/hand2.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/left_ptr.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/left_ptr.hlc
deleted file mode 100644
index 3692239..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/left_ptr.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/left_side.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/left_side.hlc
deleted file mode 100644
index 26b0003..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/left_side.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/link.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/link.hlc
deleted file mode 100644
index 1a3b48b..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/link.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/move.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/move.hlc
deleted file mode 100644
index 654bb9b..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/move.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/pencil.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/pencil.hlc
deleted file mode 100644
index 02a2198..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/pencil.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/pirate.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/pirate.hlc
deleted file mode 100644
index 9584920..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/pirate.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/plus.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/plus.hlc
deleted file mode 100644
index ee8d591..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/plus.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/question_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/question_arrow.hlc
deleted file mode 100644
index 79758f8..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/question_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/right_ptr.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/right_ptr.hlc
deleted file mode 100644
index 5badb1d..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/right_ptr.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/right_side.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/right_side.hlc
deleted file mode 100644
index cf4341a..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/right_side.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/row-resize.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/row-resize.hlc
deleted file mode 100644
index f16cc37..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/row-resize.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc
deleted file mode 100644
index 876ab09..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc
deleted file mode 100644
index 23e4f11..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc
deleted file mode 100644
index 03f3bbb..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc
deleted file mode 100644
index 0aa1fa5..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc
deleted file mode 100644
index 62ce745..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc
deleted file mode 100644
index 9550a20..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc
deleted file mode 100644
index 522faee..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc
deleted file mode 100644
index 1e380ae..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/top_side.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/top_side.hlc
deleted file mode 100644
index 971a7aa..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/top_side.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/vertical-text.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/vertical-text.hlc
deleted file mode 100644
index 45c4d05..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/vertical-text.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc
deleted file mode 100644
index f58c31b..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/xterm.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/xterm.hlc
deleted file mode 100644
index ba10d0a..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/xterm.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/zoom-in.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/zoom-in.hlc
deleted file mode 100644
index 7c5c8f2..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/zoom-in.hlc and /dev/null differ
diff --git a/home-manager/hyprland/hyprcursor/hyprcursors/zoom-out.hlc b/home-manager/hyprland/hyprcursor/hyprcursors/zoom-out.hlc
deleted file mode 100644
index f3b1b4b..0000000
Binary files a/home-manager/hyprland/hyprcursor/hyprcursors/zoom-out.hlc and /dev/null differ
diff --git a/modules/terminal/shell.nix b/modules/terminal/shell.nix
index 7db3e6e..0ea5375 100644
--- a/modules/terminal/shell.nix
+++ b/modules/terminal/shell.nix
@@ -24,6 +24,7 @@
shellAliases = {
# Transfer shell config to target device
ssh = "kitty +kitten ssh";
+ nix-shell = "nix-shell --run fish"; # Start nix-shells using fish
};
};
};