diff options
author | ZachIR <zachir@librem.one> | 2025-08-14 12:38:59 -0500 |
---|---|---|
committer | ZachIR <zachir@librem.one> | 2025-08-14 12:38:59 -0500 |
commit | 7aa391d9340cb743443434ae29aada53c64bf6c7 (patch) | |
tree | 7f176ff242017fb6490ebbe04b3a64ef5104e1d5 | |
parent | 72beef5c1858c8e09aaa8870e81b3cac7ef70941 (diff) | |
parent | 2c60ceb12271e77ce44f7b0efa9b08f856293e71 (diff) |
Merge branch 'master' into car
-rw-r--r-- | hypr/hyprlock.conf | 2 | ||||
-rw-r--r-- | sh/aliases | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 2ec72d3..8ee636d 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -41,7 +41,7 @@ input-field { check_color = rgb(204, 136, 34) fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i> # can be set to empty - fail_transition = 300 # transition time in ms between normal outer_color and fail_color + #fail_transition = 300 # transition time in ms between normal outer_color and fail_color capslock_color = -1 numlock_color = -1 bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) @@ -19,10 +19,10 @@ case `uname -s` in ;; "Linux") #alias ls="ls -h $COLOR_FLAGS_GNU" - alias ls="eza" + type eza >/dev/null && alias ls="eza" ;; "Darwin") - alias ls="eza --color" + type eza >/dev/null && alias ls="eza --color" ;; esac alias ll='ls -l' @@ -44,7 +44,7 @@ case `uname -s` in alias rm='rm -i' ;; "Linux") - alias rm='trash-put' + type trash-put >/dev/null && alias rm='trash-put' ;; esac alias cp='cp -i' |