diff --git a/configuration.nix b/configuration.nix
index 6b69faa..573ad18 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -76,7 +76,7 @@
     xdg-utils
     xdg-desktop-portal-gtk
     xdg-desktop-portal-hyprland
-    hyprpolkitagent
+    hyprpolkitagent # Auth deamon providing modals for password auth
     kdePackages.dolphin
     kdePackages.qtwayland
     kdePackages.qtsvg
@@ -89,6 +89,7 @@
     fastfetch
     freetube
     nextcloud-client
+    discord
   ];
 
   nix.settings.experimental-features = [
diff --git a/fmt b/fmt
index daf5825..6a26024 100755
--- a/fmt
+++ b/fmt
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
 
 # Format all .nix files using the new default nix formatter
-
+# TODO doesn't work when run using ./fmt
 nix fmt ./**.nix
diff --git a/home/default.nix b/home/default.nix
index bb0a50c..df119d6 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,20 +3,23 @@
   inputs,
   ...
 }:
-
+let
+  username = "martin";
+in
 {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
     ./nixvim
     ./rofi
     ./wlogout
+    ../hyprland/hyprcursor
   ];
 
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home = {
-    username = "martin";
-    homeDirectory = "/home/martin";
+    username = username;
+    homeDirectory = "/home/${username}";
     # You can update Home Manager without changing this value. See
     # the Home Manager release notes for a list of state version
     # changes in each release.
diff --git a/hyprland/hyprcursor/default.nix b/hyprland/hyprcursor/default.nix
new file mode 100644
index 0000000..2f71e8f
--- /dev/null
+++ b/hyprland/hyprcursor/default.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    hyprcursor
+  ];
+
+  home.file = {
+    ".local/share/icons/rose-pine-hyprcursor" = {
+      source = ./icons;
+      recursive = true;
+    };
+  };
+}
diff --git a/hyprland/hyprcursor/icons/X_cursor.hlc b/hyprland/hyprcursor/icons/X_cursor.hlc
new file mode 100644
index 0000000..557db8d
Binary files /dev/null and b/hyprland/hyprcursor/icons/X_cursor.hlc differ
diff --git a/hyprland/hyprcursor/icons/all-scroll.hlc b/hyprland/hyprcursor/icons/all-scroll.hlc
new file mode 100644
index 0000000..7a96196
Binary files /dev/null and b/hyprland/hyprcursor/icons/all-scroll.hlc differ
diff --git a/hyprland/hyprcursor/icons/bd_double_arrow.hlc b/hyprland/hyprcursor/icons/bd_double_arrow.hlc
new file mode 100644
index 0000000..2be20b2
Binary files /dev/null and b/hyprland/hyprcursor/icons/bd_double_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/bottom_left_corner.hlc b/hyprland/hyprcursor/icons/bottom_left_corner.hlc
new file mode 100644
index 0000000..ad8c5f9
Binary files /dev/null and b/hyprland/hyprcursor/icons/bottom_left_corner.hlc differ
diff --git a/hyprland/hyprcursor/icons/bottom_right_corner.hlc b/hyprland/hyprcursor/icons/bottom_right_corner.hlc
new file mode 100644
index 0000000..770a6ee
Binary files /dev/null and b/hyprland/hyprcursor/icons/bottom_right_corner.hlc differ
diff --git a/hyprland/hyprcursor/icons/bottom_side.hlc b/hyprland/hyprcursor/icons/bottom_side.hlc
new file mode 100644
index 0000000..3eabbfa
Binary files /dev/null and b/hyprland/hyprcursor/icons/bottom_side.hlc differ
diff --git a/hyprland/hyprcursor/icons/center_ptr.hlc b/hyprland/hyprcursor/icons/center_ptr.hlc
new file mode 100644
index 0000000..408ec42
Binary files /dev/null and b/hyprland/hyprcursor/icons/center_ptr.hlc differ
diff --git a/hyprland/hyprcursor/icons/col-resize.hlc b/hyprland/hyprcursor/icons/col-resize.hlc
new file mode 100644
index 0000000..9b10e39
Binary files /dev/null and b/hyprland/hyprcursor/icons/col-resize.hlc differ
diff --git a/hyprland/hyprcursor/icons/color-picker.hlc b/hyprland/hyprcursor/icons/color-picker.hlc
new file mode 100644
index 0000000..5ec34da
Binary files /dev/null and b/hyprland/hyprcursor/icons/color-picker.hlc differ
diff --git a/hyprland/hyprcursor/icons/context-menu.hlc b/hyprland/hyprcursor/icons/context-menu.hlc
new file mode 100644
index 0000000..2ef5996
Binary files /dev/null and b/hyprland/hyprcursor/icons/context-menu.hlc differ
diff --git a/hyprland/hyprcursor/icons/copy.hlc b/hyprland/hyprcursor/icons/copy.hlc
new file mode 100644
index 0000000..a601de2
Binary files /dev/null and b/hyprland/hyprcursor/icons/copy.hlc differ
diff --git a/hyprland/hyprcursor/icons/cross.hlc b/hyprland/hyprcursor/icons/cross.hlc
new file mode 100644
index 0000000..0e44481
Binary files /dev/null and b/hyprland/hyprcursor/icons/cross.hlc differ
diff --git a/hyprland/hyprcursor/icons/crossed_circle.hlc b/hyprland/hyprcursor/icons/crossed_circle.hlc
new file mode 100644
index 0000000..1167b4f
Binary files /dev/null and b/hyprland/hyprcursor/icons/crossed_circle.hlc differ
diff --git a/hyprland/hyprcursor/icons/dnd_no_drop.hlc b/hyprland/hyprcursor/icons/dnd_no_drop.hlc
new file mode 100644
index 0000000..c4a2da2
Binary files /dev/null and b/hyprland/hyprcursor/icons/dnd_no_drop.hlc differ
diff --git a/hyprland/hyprcursor/icons/dotbox.hlc b/hyprland/hyprcursor/icons/dotbox.hlc
new file mode 100644
index 0000000..8948797
Binary files /dev/null and b/hyprland/hyprcursor/icons/dotbox.hlc differ
diff --git a/hyprland/hyprcursor/icons/fd_double_arrow.hlc b/hyprland/hyprcursor/icons/fd_double_arrow.hlc
new file mode 100644
index 0000000..47be494
Binary files /dev/null and b/hyprland/hyprcursor/icons/fd_double_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/hand1.hlc b/hyprland/hyprcursor/icons/hand1.hlc
new file mode 100644
index 0000000..101e8ba
Binary files /dev/null and b/hyprland/hyprcursor/icons/hand1.hlc differ
diff --git a/hyprland/hyprcursor/icons/hand2.hlc b/hyprland/hyprcursor/icons/hand2.hlc
new file mode 100644
index 0000000..492d545
Binary files /dev/null and b/hyprland/hyprcursor/icons/hand2.hlc differ
diff --git a/hyprland/hyprcursor/icons/left_ptr.hlc b/hyprland/hyprcursor/icons/left_ptr.hlc
new file mode 100644
index 0000000..3692239
Binary files /dev/null and b/hyprland/hyprcursor/icons/left_ptr.hlc differ
diff --git a/hyprland/hyprcursor/icons/left_side.hlc b/hyprland/hyprcursor/icons/left_side.hlc
new file mode 100644
index 0000000..26b0003
Binary files /dev/null and b/hyprland/hyprcursor/icons/left_side.hlc differ
diff --git a/hyprland/hyprcursor/icons/link.hlc b/hyprland/hyprcursor/icons/link.hlc
new file mode 100644
index 0000000..1a3b48b
Binary files /dev/null and b/hyprland/hyprcursor/icons/link.hlc differ
diff --git a/hyprland/hyprcursor/icons/move.hlc b/hyprland/hyprcursor/icons/move.hlc
new file mode 100644
index 0000000..654bb9b
Binary files /dev/null and b/hyprland/hyprcursor/icons/move.hlc differ
diff --git a/hyprland/hyprcursor/icons/pencil.hlc b/hyprland/hyprcursor/icons/pencil.hlc
new file mode 100644
index 0000000..02a2198
Binary files /dev/null and b/hyprland/hyprcursor/icons/pencil.hlc differ
diff --git a/hyprland/hyprcursor/icons/pirate.hlc b/hyprland/hyprcursor/icons/pirate.hlc
new file mode 100644
index 0000000..9584920
Binary files /dev/null and b/hyprland/hyprcursor/icons/pirate.hlc differ
diff --git a/hyprland/hyprcursor/icons/plus.hlc b/hyprland/hyprcursor/icons/plus.hlc
new file mode 100644
index 0000000..ee8d591
Binary files /dev/null and b/hyprland/hyprcursor/icons/plus.hlc differ
diff --git a/hyprland/hyprcursor/icons/question_arrow.hlc b/hyprland/hyprcursor/icons/question_arrow.hlc
new file mode 100644
index 0000000..79758f8
Binary files /dev/null and b/hyprland/hyprcursor/icons/question_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/right_ptr.hlc b/hyprland/hyprcursor/icons/right_ptr.hlc
new file mode 100644
index 0000000..5badb1d
Binary files /dev/null and b/hyprland/hyprcursor/icons/right_ptr.hlc differ
diff --git a/hyprland/hyprcursor/icons/right_side.hlc b/hyprland/hyprcursor/icons/right_side.hlc
new file mode 100644
index 0000000..cf4341a
Binary files /dev/null and b/hyprland/hyprcursor/icons/right_side.hlc differ
diff --git a/hyprland/hyprcursor/icons/row-resize.hlc b/hyprland/hyprcursor/icons/row-resize.hlc
new file mode 100644
index 0000000..f16cc37
Binary files /dev/null and b/hyprland/hyprcursor/icons/row-resize.hlc differ
diff --git a/hyprland/hyprcursor/icons/sb_down_arrow.hlc b/hyprland/hyprcursor/icons/sb_down_arrow.hlc
new file mode 100644
index 0000000..876ab09
Binary files /dev/null and b/hyprland/hyprcursor/icons/sb_down_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/sb_h_double_arrow.hlc b/hyprland/hyprcursor/icons/sb_h_double_arrow.hlc
new file mode 100644
index 0000000..23e4f11
Binary files /dev/null and b/hyprland/hyprcursor/icons/sb_h_double_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/sb_left_arrow.hlc b/hyprland/hyprcursor/icons/sb_left_arrow.hlc
new file mode 100644
index 0000000..03f3bbb
Binary files /dev/null and b/hyprland/hyprcursor/icons/sb_left_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/sb_right_arrow.hlc b/hyprland/hyprcursor/icons/sb_right_arrow.hlc
new file mode 100644
index 0000000..0aa1fa5
Binary files /dev/null and b/hyprland/hyprcursor/icons/sb_right_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/sb_up_arrow.hlc b/hyprland/hyprcursor/icons/sb_up_arrow.hlc
new file mode 100644
index 0000000..62ce745
Binary files /dev/null and b/hyprland/hyprcursor/icons/sb_up_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/sb_v_double_arrow.hlc b/hyprland/hyprcursor/icons/sb_v_double_arrow.hlc
new file mode 100644
index 0000000..9550a20
Binary files /dev/null and b/hyprland/hyprcursor/icons/sb_v_double_arrow.hlc differ
diff --git a/hyprland/hyprcursor/icons/top_left_corner.hlc b/hyprland/hyprcursor/icons/top_left_corner.hlc
new file mode 100644
index 0000000..522faee
Binary files /dev/null and b/hyprland/hyprcursor/icons/top_left_corner.hlc differ
diff --git a/hyprland/hyprcursor/icons/top_right_corner.hlc b/hyprland/hyprcursor/icons/top_right_corner.hlc
new file mode 100644
index 0000000..1e380ae
Binary files /dev/null and b/hyprland/hyprcursor/icons/top_right_corner.hlc differ
diff --git a/hyprland/hyprcursor/icons/top_side.hlc b/hyprland/hyprcursor/icons/top_side.hlc
new file mode 100644
index 0000000..971a7aa
Binary files /dev/null and b/hyprland/hyprcursor/icons/top_side.hlc differ
diff --git a/hyprland/hyprcursor/icons/vertical-text.hlc b/hyprland/hyprcursor/icons/vertical-text.hlc
new file mode 100644
index 0000000..45c4d05
Binary files /dev/null and b/hyprland/hyprcursor/icons/vertical-text.hlc differ
diff --git a/hyprland/hyprcursor/icons/wayland-cursor.hlc b/hyprland/hyprcursor/icons/wayland-cursor.hlc
new file mode 100644
index 0000000..f58c31b
Binary files /dev/null and b/hyprland/hyprcursor/icons/wayland-cursor.hlc differ
diff --git a/hyprland/hyprcursor/icons/xterm.hlc b/hyprland/hyprcursor/icons/xterm.hlc
new file mode 100644
index 0000000..ba10d0a
Binary files /dev/null and b/hyprland/hyprcursor/icons/xterm.hlc differ
diff --git a/hyprland/hyprcursor/icons/zoom-in.hlc b/hyprland/hyprcursor/icons/zoom-in.hlc
new file mode 100644
index 0000000..7c5c8f2
Binary files /dev/null and b/hyprland/hyprcursor/icons/zoom-in.hlc differ
diff --git a/hyprland/hyprcursor/icons/zoom-out.hlc b/hyprland/hyprcursor/icons/zoom-out.hlc
new file mode 100644
index 0000000..f3b1b4b
Binary files /dev/null and b/hyprland/hyprcursor/icons/zoom-out.hlc differ
diff --git a/rebuild b/rebuild
index 6f7452b..1594919 100755
--- a/rebuild
+++ b/rebuild
@@ -2,4 +2,5 @@
 
 # Rebuild and switch the environment if successful
 git add .
+./fmt
 sudo nixos-rebuild switch --flake .#