Merge branch 'master' into cas

3 files changed, 9 insertions, 4 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index bd3edab..ea092d3 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -82,7 +82,12 @@ general {
     col.active_border = rgba(198844ee)
     col.inactive_border = rgba(1b1d1cee)
     layout = master
-    no_cursor_warps = false
+}
+#}}}
+
+#{{{ cursor
+cursor {
+  no_warps = false
 }
 #}}}
 
@@ -147,7 +152,7 @@ master {
     special_scale_factor = 0.55
     mfact = 0.55
     # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = false
+    new_status = inherit
     new_on_top = true
     no_gaps_when_only = false
     orientation = left
diff --git a/sh/aliases b/sh/aliases
index d34ece9..1b6606e 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -80,6 +80,6 @@ alias s='sudo systemctl'
 
 # XDG dirs fix
 alias svn="svn --config-dir \"$XDG_CONFIG_HOME\"/subversion"
-alias adb="'HOME="$XDG_DATA_HOME"/android adb"
+alias adb="HOME="$XDG_DATA_HOME"/android adb"
 alias wget="wget --hsts-file=\"$XDG_DATA_HOME/wget-hsts\""
 alias yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config"
diff --git a/sh/profile b/sh/profile
index 760fae9..de79a65 100644
--- a/sh/profile
+++ b/sh/profile
@@ -52,7 +52,7 @@ export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
 export XAUTHORITY="$XDG_RUNTIME_DIR"/X11/Xauthority
 export VIMINIT="set nocp | source ${XDG_CONFIG_HOME:-$HOME.config}/vim/vimrc"
 export ANDROID_USER_HOME="$XDG_DATA_HOME"/android
-export XCURSOR_PATH="$XDG_DATA_HOME/icons"
+export XCURSOR_PATH="/usr/share/icons:$XDG_DATA_HOME/icons"
 export PYTHONSTARTUP="$XDG_CONFIG_HOME"/python/pythonrc
 
 # Scaling