summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzachir <zachir@librem.one>2024-07-20 11:13:23 -0500
committerzachir <zachir@librem.one>2024-07-20 11:13:23 -0500
commit72438dab749e903df2b7427918ca83f0a836dbe8 (patch)
tree895a98f206f97f587811de2c1d2229d48f0c3c51
parent0dc0fdfed34d9c8722651b7e057bfe14bb266862 (diff)
parentd0c37b0eb7f2e3343aa504a4fe4c4c38692293bc (diff)
Merge branch 'master' into cla
-rw-r--r--hypr/hyprland.conf9
-rw-r--r--sh/aliases2
-rw-r--r--sh/profile2
3 files changed, 9 insertions, 4 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 881fd6a..2b584bf 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -86,7 +86,12 @@ general {
col.active_border = rgba(198844ee)
col.inactive_border = rgba(1b1d1cee)
layout = master
- no_cursor_warps = false
+}
+#}}}
+
+#{{{ cursor
+cursor {
+ no_warps = false
}
#}}}
@@ -151,7 +156,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