BIG REFACTOR; PLEASE BE ADVISED
finally going to commit that zshrc refactor - smolvsdefault on altaria - i3-utils refactor - no need for custom scwrypt executable anymore - time to say goodbye to the old dotwryn.env in favor of the new and improved rc.ds - vim/rc.d refactor + QuickREPL and QuickCommand replacements for \r and \t - going to stop tracking Archives explicitly until new hard drive - tty-colorscheme is now referenced directly - colorscheme/spring-sunset needed to swap primary/secondary colors for focus in i3 since it was confusing - setup config no longer needs to create ~/.config/wryn/env.vim; added some dependencies to arch-linux - switch from dmenu to rofi by default; allow .i3 overrides in colorschemes; tty-colorscheme is now referenced directly
This commit is contained in:
@ -1,14 +0,0 @@
|
||||
" -- RC Resources ----------------------------------------------- {{{
|
||||
if empty($DOTWRYN)
|
||||
let $DOTWRYN=expand("$HOME/.wryn")
|
||||
endif
|
||||
let $WRYNVIMPATH=expand("$DOTWRYN/vim")
|
||||
let $WRYNVIMRC=expand("$WRYNVIMPATH/rc.vim")
|
||||
" }}}
|
||||
|
||||
" -- Leader bindings -------------------------------------------- {{{
|
||||
let mapleader = "\\"
|
||||
|
||||
nmap <BS> <Nop>
|
||||
let maplocalleader = "\<BS>"
|
||||
" }}}
|
||||
@ -1,72 +1,21 @@
|
||||
#####################################################################
|
||||
### Path References #################################################
|
||||
### default .wryn configuration settings ############################
|
||||
#####################################################################
|
||||
|
||||
# installation path for this repository
|
||||
export DOTWRYN="$HOME/.wryn"
|
||||
export SOURCE_PACKAGES="$HOME/.local/share/source-packages"
|
||||
|
||||
RELOAD_ZSH_UTILS() {
|
||||
local SCWRYPTS_ROOT="$(scwrypts --root 2>/dev/null)"
|
||||
: \
|
||||
&& [ $SCWRYPTS_ROOT ] \
|
||||
&& [ -d "$SCWRYPTS_ROOT" ] \
|
||||
&& source "$(scwrypts --root)/zsh/lib/utils/utils.module.zsh" \
|
||||
&& export DOTWRYN_UTILS_LOADED=1 \
|
||||
;
|
||||
}
|
||||
[ $DOTWRYN_UTILS_LOADED ] || RELOAD_ZSH_UTILS
|
||||
|
||||
#####################################################################
|
||||
### Application Settings ############################################
|
||||
#####################################################################
|
||||
|
||||
export PREFERRED_EDITOR=(vim vi)
|
||||
|
||||
RIPGREP_CONFIG_PATH="$HOME/.config/ripgrep/config"
|
||||
# order of editor preference
|
||||
export PREFERRED_EDITORS=(vim vi nano)
|
||||
|
||||
# prompt generator settings
|
||||
PS1_BRANCH_SYMBOL=''
|
||||
PS1_INDICATOR_SYMBOL='☕'
|
||||
PS1_SEPARATOR='::'
|
||||
PS1_USER='%m'
|
||||
|
||||
# run at each zsh login
|
||||
WELCOME () {
|
||||
[[ $TERM =~ tmux ]] && return 0
|
||||
{ figlet 'Welcome, beautiful'; cowsay -p 'damn u sexy'; } | lolcat
|
||||
}
|
||||
|
||||
#####################################################################
|
||||
### External Plugins / Settings #####################################
|
||||
#####################################################################
|
||||
|
||||
# fzf
|
||||
EXTERNAL_PLUGINS+=(
|
||||
'/usr/share/fzf/key-bindings.zsh'
|
||||
'/usr/share/fzf/completion.zsh'
|
||||
)
|
||||
|
||||
export FZF_DEFAULT_OPTS='--reverse --ansi --height 50% --bind=ctrl-c:cancel'
|
||||
export FZF_DEFAULT_COMMAND='rg --files'
|
||||
|
||||
# fzf-tab
|
||||
EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/fzf-tab/fzf-tab.plugin.zsh")
|
||||
|
||||
zstyle ':fzf-tab:*' accept-line enter
|
||||
zstyle ':fzf-tab:*' fzf-bindings 'space:accept' ';:toggle'
|
||||
zstyle ':fzf-tab:*' continuous-trigger '/'
|
||||
|
||||
# scwrypts
|
||||
EXTERNAL_PLUGINS+=("$(scwrypts --root 2>/dev/null)/scwrypts.plugin.zsh")
|
||||
|
||||
for e in \
|
||||
"local.$(hostnamectl --static).secret" \
|
||||
"local.$(hostnamectl --static)" \
|
||||
"local"
|
||||
do export SCWRYPTS_ENV="$e"; [ -f "$HOME/.config/scwrypts/environments/scwrypts/$e" ] && break; done
|
||||
|
||||
# z
|
||||
EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/z/z.sh")
|
||||
|
||||
# code-activator
|
||||
EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/code-activator/activator.plugin.zsh")
|
||||
|
||||
# ssh
|
||||
EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/ssh/ssh.plugin.zsh")
|
||||
|
||||
@ -10,44 +10,44 @@ font pango:Monaspace Argon, pango:Noto Color Emoji, pango:Symbols Nerd Font 16
|
||||
## Custom Utility ##############################################################
|
||||
################################################################################
|
||||
|
||||
set $UTILS /home/w0ryn/.config/i3/utils
|
||||
set $UTILS exec --no-startup-id /home/w0ryn/.config/i3/utils
|
||||
|
||||
# Audio
|
||||
bindsym XF86AudioRewind exec --no-startup-id $UTILS prev
|
||||
bindsym XF86AudioPrev exec --no-startup-id $UTILS prev
|
||||
bindsym XF86AudioForward exec --no-startup-id $UTILS next
|
||||
bindsym XF86AudioNext exec --no-startup-id $UTILS next
|
||||
bindsym XF86AudioPlay exec --no-startup-id $UTILS play
|
||||
bindsym XF86AudioRaiseVolume exec --no-startup-id $UTILS volumeup
|
||||
bindsym XF86AudioLowerVolume exec --no-startup-id $UTILS volumedown
|
||||
bindsym XF86AudioMute exec --no-startup-id $UTILS volumemute
|
||||
bindsym XF86AudioMicMute exec --no-startup-id $UTILS micmute
|
||||
bindsym XF86AudioRewind $UTILS previous
|
||||
bindsym XF86AudioPrev $UTILS previous
|
||||
bindsym XF86AudioForward $UTILS next
|
||||
bindsym XF86AudioNext $UTILS next
|
||||
bindsym XF86AudioPlay $UTILS play-pause
|
||||
bindsym XF86AudioRaiseVolume $UTILS volumeup
|
||||
bindsym XF86AudioLowerVolume $UTILS volumedown
|
||||
bindsym XF86AudioMute $UTILS volumemute
|
||||
bindsym XF86AudioMicMute $UTILS micmute
|
||||
|
||||
# Screen brightness
|
||||
bindsym XF86MonBrightnessUp exec --no-startup-id $UTILS backlightup
|
||||
bindsym XF86MonBrightnessDown exec --no-startup-id $UTILS backlightdown
|
||||
bindsym XF86MonBrightnessUp $UTILS backlightup
|
||||
bindsym XF86MonBrightnessDown $UTILS backlightdown
|
||||
|
||||
# Quick applications
|
||||
bindsym $mod+Shift+m exec --no-startup-id $UTILS launch messages
|
||||
bindsym $mod+Shift+d exec --no-startup-id $UTILS launch discord
|
||||
bindsym $mod+c exec --no-startup-id $UTILS launch voice
|
||||
bindsym $mod+m exec --no-startup-id $UTILS launch ytmusic
|
||||
bindsym $mod+Shift+s exec --no-startup-id $UTILS launch spotify
|
||||
bindsym $mod+a exec --no-startup-id $UTILS launch pavuctrl
|
||||
bindsym $mod+Shift+p exec --no-startup-id $UTILS launch scrcpy
|
||||
bindsym $mod+Shift+o exec --no-startup-id $UTILS launch obs
|
||||
bindsym $mod+Shift+m $UTILS launch messages
|
||||
bindsym $mod+Shift+d $UTILS launch discord
|
||||
bindsym $mod+c $UTILS launch voice
|
||||
bindsym $mod+m $UTILS launch ytmusic
|
||||
bindsym $mod+Shift+s $UTILS launch spotify
|
||||
bindsym $mod+a $UTILS launch pavuctrl
|
||||
bindsym $mod+Shift+p $UTILS launch scrcpy
|
||||
bindsym $mod+Shift+o $UTILS launch obs
|
||||
|
||||
# Terminal
|
||||
bindsym $mod+Return exec --no-startup-id i3-sensible-terminal
|
||||
|
||||
# Other
|
||||
bindsym $mod+p exec --no-startup-id $UTILS bgrandomize
|
||||
bindsym $mod+p $UTILS bgrandomize
|
||||
|
||||
bindsym $mod+Shift+minus exec --no-startup-id $UTILS lock
|
||||
bindsym $mod+Shift+minus $UTILS lock
|
||||
|
||||
bindsym $mod+space exec --no-startup-id dmenu_run -c -l 5 -fn 'DejaVuSansMono Nerd Font-25'
|
||||
|
||||
bindsym $mod+backslash exec --no-startup-id $UTILS screenshot
|
||||
bindsym $mod+backslash $UTILS screenshot
|
||||
|
||||
################################################################################
|
||||
## Window Management and Navigation ############################################
|
||||
@ -126,6 +126,20 @@ bindsym $mod+Shift+x [class=$GAMES_CLIENT_CLASSES] scratchpad show
|
||||
set $TERMINAL_EMULATOR_CLASSES ^(Alacritty)$
|
||||
bindsym $mod+x [class=$TERMINAL_EMULATOR_CLASSES] scratchpad show
|
||||
|
||||
# floating window / notification compatibility
|
||||
for_window [window_role="About"] floating enable
|
||||
for_window [window_role="Organizer"] floating enable
|
||||
for_window [window_role="Preferences"] floating enable
|
||||
for_window [window_role="bubble"] floating enable
|
||||
for_window [window_role="page-info"] floating enable
|
||||
for_window [window_role="pop-up"] floating enable
|
||||
for_window [window_role="task_dialog"] floating enable
|
||||
for_window [window_role="toolbox"] floating enable
|
||||
for_window [window_role="webconsole"] floating enable
|
||||
for_window [window_type="dialog"] floating enable
|
||||
for_window [window_type="menu"] floating enable
|
||||
for_window [class="[xX]fce4-notifyd"] border pixel 0
|
||||
|
||||
################################################################################
|
||||
## i3 Settings #################################################################
|
||||
################################################################################
|
||||
@ -141,8 +155,6 @@ for_window [class="^.*"] border pixel 4
|
||||
gaps inner 0
|
||||
gaps outer 0
|
||||
|
||||
# prevent borders on xfce4-notifyd
|
||||
for_window [class="[xX]fce4-notifyd"] border pixel 0
|
||||
|
||||
bindsym $mod+z gaps outer current plus 2; gaps inner current plus 2;
|
||||
bindsym $mod+shift+z gaps outer current minus 2; gaps inner current minus 2;
|
||||
|
||||
@ -8,18 +8,18 @@ font:
|
||||
FontAwesome
|
||||
|
||||
application-launcher: >-
|
||||
dmenu_run -c -l 5 -fn 'DejaVuSansMono Nerd Font-25'
|
||||
"rofi -theme $DOTWRYN/config/rofi.theme.rasi -modes drun,run -show run"
|
||||
|
||||
# application-launcher: >-
|
||||
# dmenu_run -c -l 5 -fn 'DejaVuSansMono Nerd Font-25'
|
||||
|
||||
gaps:
|
||||
inner: 0
|
||||
outer: 0
|
||||
|
||||
i3configs:
|
||||
- |-
|
||||
# for use after any command which should refresh the statusbar
|
||||
set $refresh_statusbar killall -SIGUSR1 i3status
|
||||
bar {
|
||||
status_command i3status
|
||||
}
|
||||
# - exec_always --no-startup-id $DOTWRYN/bin/polybar &
|
||||
- exec --no-startup-id i3-msg workspace 1
|
||||
statusbar:
|
||||
# supported values are 'polybar' and 'i3status'
|
||||
type: polybar
|
||||
|
||||
# a list of i3conifg excerpts that should be appended to the generated config
|
||||
i3configs: []
|
||||
|
||||
@ -14,7 +14,6 @@ $DOTWRYN/bin/i3-utils i3/utils
|
||||
$DOTWRYN/colorschemes/active/kitty.conf kitty/theme.conf
|
||||
$DOTWRYN/colorschemes/active/alacritty.toml alacritty/theme.toml
|
||||
$DOTWRYN/colorschemes/active/alacritty.yaml alacritty/theme.yml
|
||||
$DOTWRYN/colorschemes/active/getty.sh wryn/tty-colorscheme
|
||||
$DOTWRYN/config/alacritty.toml alacritty/alacritty.toml
|
||||
$DOTWRYN/config/alacritty.default.toml alacritty/default.toml
|
||||
$DOTWRYN/config/alacritty.yaml alacritty/alacritty.yml
|
||||
|
||||
@ -36,14 +36,13 @@ export LINEAR__API_TOKEN=
|
||||
# s3 bucket name and filesystem targets for media backups
|
||||
export MEDIA_SYNC__S3_BUCKET=yage # from local
|
||||
export MEDIA_SYNC__TARGETS=(
|
||||
.local/share/dolphin-emu
|
||||
.porn
|
||||
Games/roms
|
||||
Games/wrynscape
|
||||
Pictures
|
||||
Documents
|
||||
Media
|
||||
Pictures
|
||||
Archives/recordings
|
||||
.local/.porn
|
||||
Games/roms
|
||||
.local/share/dolphin-emu
|
||||
Games/archives
|
||||
)
|
||||
|
||||
# redis connection credentials
|
||||
|
||||
@ -1,10 +1,24 @@
|
||||
#!/bin/zsh
|
||||
export PATH="$DOTWRYN/bin/$(hostnamectl --static):$PATH"
|
||||
for PREFERRED_TERMINAL in \
|
||||
alacritty \
|
||||
kitty \
|
||||
;
|
||||
do
|
||||
command -v $PREFERRED_TERMINAL &</dev/null \
|
||||
&& export TERMINAL="$(which $PREFERRED_TERMINAL)" \
|
||||
&& break
|
||||
done
|
||||
|
||||
command -v kitty >/dev/null 2>&1 \
|
||||
&& export TERMINAL=$(which kitty)
|
||||
for PREFERRED_BROWSER in \
|
||||
google-chrome-stable \
|
||||
google-chrome \
|
||||
;
|
||||
do
|
||||
command -v $PREFERRED_BROWSER & >/dev/null \
|
||||
&& export BROWSER="$(which $PREFERRED_BROWSER)" \
|
||||
&& break
|
||||
done
|
||||
|
||||
command -v alacritty >/dev/null 2>&1 \
|
||||
&& export TERMINAL=$(which alacritty)
|
||||
for XINITRC in $(find /etc/X11/xinit/xinitrc.d); do source "$XINITRC"; done
|
||||
|
||||
for SCRIPT in $(find /etc/x11/xinit/xinitrc.d); do source $SCRIPT; done
|
||||
unset PREFERRED_TERMINAL PREFERRED_BROWSER XINITRC
|
||||
|
||||
@ -1,23 +1,18 @@
|
||||
#!/bin/zsh
|
||||
source "$HOME/.config/wryn/env.zsh"
|
||||
source "$HOME/.zshrc" &>/dev/null
|
||||
source "$DOTWRYN/config/xinitrc.common"
|
||||
|
||||
command -v dex && dex -a
|
||||
|
||||
for FILE in $(find /etc/X11/xinit/xinitrc.d/ -type f)
|
||||
for BACKGROUND_APPLICATION in \
|
||||
apps \
|
||||
/usr/lib/xfce-polkit/xfce-polkit \
|
||||
/usr/lib/xfce4/notifyd/xfce4-notifyd \
|
||||
"$DOTWRYN/bin/xorg-activate-default" \
|
||||
;
|
||||
do
|
||||
source "$FILE"
|
||||
command -v $BACKGROUND_APPLCATION \
|
||||
&& exec $BACKGROUND_APPLICATION &
|
||||
done
|
||||
unset FILE
|
||||
|
||||
[ -f /usr/lib/xfce-polkit/xfce-polkit ] \
|
||||
&& exec /usr/lib/xfce-polkit/xfce-polkit &
|
||||
|
||||
[ -f /usr/lib/xfce4/notifyd/xfce4-notifyd ] \
|
||||
&& exec /usr/lib/xfce4/notifyd/xfce4-notifyd &
|
||||
|
||||
$DOTWRYN/bin/xorg-activate-default &
|
||||
|
||||
cd
|
||||
export DESKTOP_SESSION=i3wm
|
||||
exec i3
|
||||
|
||||
cd; exec i3
|
||||
|
||||
Reference in New Issue
Block a user