diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | hypr/hypridle.conf | 37 | ||||
| -rw-r--r-- | hypr/hyprland.conf | 83 | ||||
| -rw-r--r-- | hypr/hyprlock.conf | 10 | ||||
| -rwxr-xr-x | installers/set_zshdirs.sh | 13 | ||||
| -rw-r--r-- | kitty/kitty.conf | 2 | ||||
| -rw-r--r-- | lf/lfrc | 4 | ||||
| -rw-r--r-- | sh/profile | 2 | ||||
| -rw-r--r-- | waybar/config | 3 | ||||
| -rw-r--r-- | xdg-desktop-portal/portals.conf | 3 | ||||
| -rw-r--r-- | zsh/.zlogout | 1 | ||||
| -rw-r--r-- | zsh/.zprofile | 6 | ||||
| -rw-r--r-- | zsh/.zshrc | 99 | ||||
| -rw-r--r-- | zsh/zshenv (renamed from zsh/.zshenv) | 1 | ||||
| -rw-r--r-- | zsh/zshrc | 72 |
16 files changed, 173 insertions, 182 deletions
@@ -67,6 +67,7 @@ glib-2.0/ gnome-control-center/ gnome-initial-setup-done gnome-session/ +go/ goa-1.0/ godot/ gomuks/ @@ -108,6 +109,7 @@ Kitware/ kritadisplayrc kritarc ksh/history +kwalletrc lab/ lbry/ LBRY/ @@ -210,6 +212,7 @@ remmina/ Resonant DSP/ retroarch/ rncbc.org/ +.rt64/ rtorrent/ runit/sv/*/supervise runit/sv/*/*/supervise @@ -1,20 +1,26 @@ VIM := $(shell command -v vim 2>/dev/null) NVIM := $(shell command -v nvim 2>/dev/null) -ZCONFS := zsh/.zshenv +ZCONFS := zsh/zshenv zsh/zshrc +SCONFS := sh/profile DCONFS := doas.conf all: -install: install-zshconfigs vimplug-vim vimplug-nvim +install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim install-zshconfigs: $(ZCONFS) @echo "Installing zsh conf files..." - @echo "Setting ZSHDOTDIR globally..." - @$(shell sudo installers/set_zshdirs.sh) @echo ".zshenv..." - @ln -sf `pwd`/zsh/.zshenv ~/.zshenv + @ln -sf `pwd`/zsh/zshenv ~/.zshenv + @echo ".zshrc..." + @ln -sf `pwd`/zsh/zshrc ~/.zshrc @echo "Done." +install-shconfigs: $(SCONFS) + @echo "Installing sh conf files..." + @echo ".profile..." + @ln -sf `pwd`/sh/profile ~/.profile + vimplug-vim: installers/vimplug_vim.sh ifdef VIM @echo "Installing vim-plug for vim..." diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 9b6ea02..f25f081 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -1,13 +1,34 @@ general { - lock_cmd = hyprlock # dbus/sysd lock command (loginctl lock-session) - unlock_cmd = # same as above, but unlock - before_sleep_cmd = swaylock # command ran before sleep - after_sleep_cmd = # command ran after sleep - ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam) + lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple hyprlock instances. + before_sleep_cmd = loginctl lock-session # lock before suspend. + after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display. } listener { - timeout = 600 # in seconds - on-timeout = loginctl lock-session # command to run when timeout has passed - on-resume = # command to run when activity is detected after timeout has fired. + timeout = 150 # 2.5min. + on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor. + on-resume = brightnessctl -r # monitor backlight restore. +} + +# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight. +listener { + timeout = 150 # 2.5min. + on-timeout = brightnessctl -sd led::kbd_backlight set 0 # turn off keyboard backlight. + on-resume = brightnessctl -rd led::kbd_backlight # turn on keyboard backlight. +} + +listener { + timeout = 300 # 5min + on-timeout = loginctl lock-session # lock screen when timeout has passed +} + +listener { + timeout = 330 # 5.5min + on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed + on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. +} + +listener { + timeout = 1800 # 30min + on-timeout = systemctl suspend # suspend pc } diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 4f60c5c..6c5225f 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -14,7 +14,7 @@ monitor = DP-1, 1920x1080@60, 0x0, 1 exec-once = xdph exec-once = hyprpm reload -n exec-once = hyprpaper -exec-once = swayidle +#exec-once = hypridle exec-once = waybar exec-once = pypr exec-once = lxqt-policykit-agent @@ -24,9 +24,9 @@ exec-once = import-gsettings icon-theme 'Mint-X-Grey' exec-once = import-gsettings cursor-theme 'Breeze' exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources exec-once = com.github.wwmm.easyeffects -exec-once = mpd -exec-once = systemctl --user import-environment DISPLAY -exec-once = systemctl --user import-environment WAYLAND_DISPLAY +exec-once = systemctl --user start dunst +exec-once = systemctl --user start hypridle +#exec-once = mpd #}}} #{{{ env @@ -111,10 +111,6 @@ misc { decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more rounding = 10 - drop_shadow = no - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) #{{{ Blur options blur { enabled = true @@ -124,6 +120,14 @@ decoration { xray = false } #}}} + #{{{ Shadow options + shadow { + enabled = false + range = 4 + render_power = 3 + color = 0xee1a1a1a + } + #}}} } #}}} @@ -158,9 +162,10 @@ master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_status = inherit new_on_top = true - no_gaps_when_only = false + #no_gaps_when_only = false orientation = left inherit_fullscreen = true + drop_at_cursor = true } #}}} @@ -185,36 +190,35 @@ plugin { # Example windowrule v2 # windowrulev2 = float, class:^(kitty)$, title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -#windowrule = windowdance, ^(oneshot)$ -#windowrule = windowdance, title:^(UNDERTALE)$ -#windowrule = windowdance, title:^(Rhythm Doctor)$ -#windowrule = fullscreen, ^(Xephyr)$ -#windowrule = float, title:^(LibreWolf - Choose User Profile)$ -#windowrule = float, ^(xdg-desktop-portal-gtk) -#windowrulev2 = forceinput, class:^(xdg-desktop-portal-gtk) -#windowrule = float, title:^(UNDERTALE)$ -#windowrule = float, ^(Tk)$ -#windowrule = float, ^(lxqt-policykit-agent)$ -#windowrulev2 = stayfocused, title:^()$, class:^(steam)$ -#windowrulev2 = minsize 1 1, title:^()$, class:^(steam)$ -#windowrulev2 = stayfocused, title:^(menu)$, class:^(REAPER)$ -#windowrulev2 = minsize 1 1, title:^(menu)$, class:^(REAPER)$ -#windowrulev2 = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$ -#windowrulev2 = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$ -windowrulev2 = tile, class:^(REAPER)$, title:^(REAPER v[0-9.]* - Registered to [A-Za-z ]* \(Licensed for personal/small business use\))$ -windowrulev2 = tile, class:^(REAPER)$, title:^(reaper)$ -windowrulev2 = tile, class:^(REAPER)$, title:^(Mixer)$ -#windowrule = tile, ^(WebApp-.*)$ -#windowrule = float, title:^(menu)$ -windowrulev2 = move onscreen cursor -50% -50%, title:^(menu)$ -windowrulev2 = noinitialfocus, title:^(menu)$ -windowrulev2 = windowdance, title:^(menu)$ -#windowrulev2 = nofocus, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ -#windowrulev2 = opacity 1.0, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ -#windowrulev2 = maxsize 1 1, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ -#windowrulev2 = float, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ -#windowrulev2 = float, class:^(mldrums.exe)$, title:^(ML Drums)$ -#windowrulev2 = nofocus, class:^(mldrums.exe|yabridge-host.exe)$, title:^(\s*)$ +windowrule = fullscreen, ^(Xephyr)$ +windowrule = float, title:^(LibreWolf - Choose User Profile)$ +windowrule = float, ^(xdg-desktop-portal-gtk) +windowrule = float, title:^(UNDERTALE)$ +windowrule = float, ^(Tk)$ +windowrule = float, ^(lxqt-policykit-agent)$ +windowrule = float, ^(Kdenlive)$ +windowrulev2 = stayfocused, title:^()$, class:^(steam)$ +windowrulev2 = minsize 1 1, title:^()$, class:^(steam)$ +windowrulev2 = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$ +windowrulev2 = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$ +windowrulev2 = float, class:^(yabridge-host.exe.so)$, title:^(menu)$ +windowrulev2 = float, floating:0, title:^(menu*) +windowrule = workspace 2, title:^(REAPER .*initializing.*)$ +windowrulev2 = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ +windowrule = tile, ^(WebApp-Qobuz[0-9]*)$ +windowrulev2 = float, title:^(menu)$ +windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ +#windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Metronome and pre-roll settings)$ +#windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ +#windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ +#windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(\s*)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ +#windowrulev2 = float, floating:0, title:^(menu)$ +#windowrulev2 = forceinput, title:^(menu)$ #}}} #{{{ Mods @@ -348,6 +352,7 @@ bind = $mainMod, Q, exec, loginctl lock-session bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend bind = $mainMod SHIFT, G, exec, get-app-id bind = $mainMod Control, M, exec, volsv -m +bind = $mainMod, Comma, exec, acpi-notify.sh #bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1 #}}} diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 84d08ae..57f9fdd 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -1,10 +1,10 @@ general { - disable_loading_bar = false - hide_cursor = false + disable_loading_bar = true + hide_cursor = true grace = 0 - no_fade_in = false - no_fade_out = false - ignore_empty_input = false + no_fade_in = true + no_fade_out = true + ignore_empty_input = true } background { diff --git a/installers/set_zshdirs.sh b/installers/set_zshdirs.sh deleted file mode 100755 index 2d82f19..0000000 --- a/installers/set_zshdirs.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ -f /etc/zshenv ]; then - ZSHENV="/etc/zshenv" -elif [ -d /etc/zsh ]; then - ZSHENV="/etc/zsh/zshenv" -else - ZSHENV="/etc/zshenv" -fi - -if ! grep -q "ZDOTDIR" $ZSHENV 2>/dev/null; then - echo "export ZDOTDIR=\"\$HOME\"/.config/zsh" >> $ZSHENV -fi diff --git a/kitty/kitty.conf b/kitty/kitty.conf index ceeaf72..540419a 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -879,7 +879,7 @@ resize_draw_strategy static #: insensitive, from the set [0-9A-Z]. Specify your preference as a #: string of characters. -# confirm_os_window_close -1 +confirm_os_window_close 0 #: Ask for confirmation when closing an OS window or a tab with at #: least this number of kitty windows in it by window manager (e.g. @@ -51,9 +51,9 @@ cmd chmod ${{ printf "Mode Bits: " read ans - for file in "$fx" + echo "$fx" | while read file do - chmod $ans $file + chmod "$ans" "$file" done }} @@ -36,7 +36,7 @@ export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages export RXVT_SOCKET="$XDG_RUNTIME_DIR"/urxvtd export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc -export ZDOTDIR=$HOME/.config/zsh +#export ZDOTDIR=$HOME/.config/zsh export CARGO_HOME="$XDG_DATA_HOME"/cargo export RUSTUP_HOME="$XDG_DATA_HOME"/rustup export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat diff --git a/waybar/config b/waybar/config index fe898ea..d930678 100644 --- a/waybar/config +++ b/waybar/config @@ -38,8 +38,7 @@ "18": "9", }, "persistent-workspaces": { - "DP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], - //"DP-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], + "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], }, "on-scroll-up": "hyprctl dispatch split-workspace e+1", "on-scroll-down": "hyprctl dispatch split-workspace e-1", diff --git a/xdg-desktop-portal/portals.conf b/xdg-desktop-portal/portals.conf new file mode 100644 index 0000000..faadd46 --- /dev/null +++ b/xdg-desktop-portal/portals.conf @@ -0,0 +1,3 @@ +[preferred] +default=hyprland +org.freedesktop.impl.portal.FileChooser=lxqt diff --git a/zsh/.zlogout b/zsh/.zlogout deleted file mode 100644 index 33666be..0000000 --- a/zsh/.zlogout +++ /dev/null @@ -1 +0,0 @@ -rm -rf /tmp/xorg-awake diff --git a/zsh/.zprofile b/zsh/.zprofile deleted file mode 100644 index 1eae5e7..0000000 --- a/zsh/.zprofile +++ /dev/null @@ -1,6 +0,0 @@ -#export GDK_DPI_SCALE=0.7 - -#gnome_schema=org.gnome.desktop.interface -# -#gsettings set $gnome_schema gtk-theme 'Plata-Noir-Compact' -#gsettings set $gnome_schema icon-theme 'Papirus-Dark' diff --git a/zsh/.zshrc b/zsh/.zshrc deleted file mode 100644 index 00be912..0000000 --- a/zsh/.zshrc +++ /dev/null @@ -1,99 +0,0 @@ -HISTFILE="$ZDOTDIR"/hist -SAVEHIST=1000 -HISTSIZE=1000 -setopt APPEND_HISTORY -setopt HIST_FIND_NO_DUPS -setopt HIST_EXPIRE_DUPS_FIRST -setopt HIST_VERIFY -setopt HIST_IGNORE_DUPS -setopt INC_APPEND_HISTORY -setopt HIST_REDUCE_BLANKS - -_SH="zsh" - -if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then - source "$XDG_CONFIG_HOME"/sh/aliases -fi -if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then - source "$XDG_CONFIG_HOME"/sh/functions -fi - -if [ -n "$ZDOTDIR"/.zshrc -a -f "$ZDOTDIR"/.zshrc ]; then - alias e='source "$ZDOTDIR"/.zshrc' -elif [ -f "$HOME"/.zshrc ]; then - alias e='source ~/.zshrc' -fi - -bindkey "^?" backward-delete-char - -# bindkey -v - -if [ "$TERM" = "st-256color" ] || [ "$TERM" = "xterm-256color" ]; then - function zle-line-init () { echoti smkx } - function zle-line-finish () { echoti rmkx } - - zle -N zle-line-init - zle -N zle-line-finish -fi - -unset COLOR1 -ZSHTHEMERC="${ZDOTDIR:-$HOME}/.zsh_theme" -[ -f "$ZSHTHEMERC" ] && . "$ZSHTHEMERC" - -if [ -z "$COLOR1" ]; then - case "$(whoami)" in - zachir) COLOR1="014" ;; - git) COLOR1="013" ;; - subsonic) COLOR1="012" ;; - *) COLOR1="015" ;; - esac -fi - -MYPROMPT='%B%S%F{'"$COLOR1"'}[%n@%m]:%f%s%F{015}%~%f%S%F{'"$COLOR1"'}%#%f%s%b ' -function zle-line-init zle-keymap-select { - VIM_PROMPT="%B%F{012}[%n@%m]:%f%F{015}%~%f%F{012}%#%f%b " - PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" - #PS1="$PROMPT $KEYMAP" - zle reset-prompt -} - -unset COLOR1 - -zle -N zle-line-init -zle -N zle-keymap-select -export KEYTIMEOUT=1 - -fpath+="$ZDOTDIR/zfunc" - -autoload -Uz compinit promptinit -compinit -d $CONFIG/zcompdump -promptinit -autoload -Uz up-line-or-beginning-search down-line-or-beginning-search -zle -N up-line-or-beginning-search -zle -N down-line-or-beginning-search - -zstyle ':completion:*' menu select -zstyle ':completion::complete:*' gain-privileges 1 -zstyle ':completion:*' rehash true - -setopt COMPLETE_ALIASES -setopt AUTO_CD - -typeset -g -A key - -key[Up]="${terminfo[kcuu1]}" -key[Down]="${terminfo[kcud1]}" -key[Left]="${terminfo[kcub1]}" -key[Right]="${terminfo[kcuf1]}" -key[Shift-Tab]="${terminfo[kcbt]}" -key[Delete]="${terminfo[kdch1]}" - -[[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}" up-line-or-beginning-search -bindkey -- '^[[A' up-line-or-beginning-search -bindkey -- '^[[B' down-line-or-beginning-search -[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search -[[ -n "${key[Left]}" ]] && bindkey -- "${key[Left]}" backward-char -[[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}" forward-char -[[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}" reverse-menu-complete -[[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}" delete-char - @@ -1,5 +1,6 @@ # ZSH SPECIFIC CONFIGS unset HISTFILE export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export skip_global_compinit=1 [ -f /etc/profile ] && . /etc/profile [ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile" diff --git a/zsh/zshrc b/zsh/zshrc new file mode 100644 index 0000000..fb5b167 --- /dev/null +++ b/zsh/zshrc @@ -0,0 +1,72 @@ +#zmodload zsh/zprof +if [ -d "$HOME/.zplug" ]; then + export ZPLUG_INSTALLED="y" + source "$HOME/.zplug/init.zsh" +fi +HISTFILE="$XDG_CONFIG_HOME/zsh/hist" +SAVEHIST=1000 +HISTSIZE=1000 +setopt APPEND_HISTORY +setopt HIST_FIND_NO_DUPS +setopt HIST_EXPIRE_DUPS_FIRST +setopt HIST_VERIFY +setopt HIST_IGNORE_DUPS +setopt INC_APPEND_HISTORY +setopt HIST_REDUCE_BLANKS +setopt COMPLETE_ALIASES +setopt AUTO_CD + +_SH="zsh" + +if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then + source "$XDG_CONFIG_HOME"/sh/aliases +fi +if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then + source "$XDG_CONFIG_HOME"/sh/functions +fi + +if [ -f "$XDG_CONFIG_HOME/zsh/zshrc" ]; then + alias e='source "$XDG_CONFIG_HOME/zsh/zshrc"' +elif [ -f "$XDG_CONFIG_HOME/zshrc" ]; then + alias e='source "$XDG_CONFIG_HOME/zshrc"' +elif [ -f "$HOME"/.zshrc ]; then + alias e='source ~/.zshrc' +fi + +bindkey -v + +MYPROMPT=$'%B%S%F{002}[%n@%m]%s\UE0B0%F{015}%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b ' +function zle-line-init zle-keymap-select { + VIM_PROMPT=$'%B%S%F{012}[%n@%m]%s\UE0B0%F{015}%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b ' + PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" + zle reset-prompt +} + +zle -N zle-line-init +zle -N zle-keymap-select +export KEYTIMEOUT=1 + +fpath+="$XDG_CONFIG_HOME/zsh/zfunc" + +if [ -n "$ZPLUG_INSTALLED" ]; then + # zsh history substring search + zplug "zsh-users/zsh-history-substring-search", as:plugin + + bindkey '^[[A' history-substring-search-up + bindkey '^[[B' history-substring-search-down + bindkey -M vicmd '^[[A' history-substring-search-up + bindkey -M vicmd '^[[B' history-substring-search-down + bindkey -M vicmd 'k' history-substring-search-up + bindkey -M vicmd 'j' history-substring-search-down + + # zsh syntax highlighting + zplug "zsh-users/zsh-syntax-highlighting", defer:2 + + # load zsh plugins + zplug load +fi + +autoload -Uz compinit +compinit + +#zprof |