diff --git a/colorschemes/active/alacritty.toml b/colorschemes/active/alacritty.toml deleted file mode 100644 index 240d24f..0000000 --- a/colorschemes/active/alacritty.toml +++ /dev/null @@ -1,28 +0,0 @@ -# do not edit; generated by scwrypts -# theme : halloween -[colors.cursor] -cursor = '0xefe5f9' - -[colors.primary] -background = '0x000505' -foreground = '0xd0f0f0' - -[colors.normal] -black = '0x000505' -red = '0x00f900' -green = '0xff6f00' -yellow = '0x8b41d5' -blue = '0xac0041' -magenta = '0x750dcc' -cyan = '0x00f900' -white = '0xd0f0f0' - -[colors.bright] -black = '0x424253' -red = '0xa3ff90' -green = '0xffe082' -yellow = '0xbb94e6' -blue = '0xff283e' -magenta = '0xd6bff0' -cyan = '0xcbffbe' -white = '0x7e707e' diff --git a/colorschemes/active/alacritty.yaml b/colorschemes/active/alacritty.yaml deleted file mode 100644 index 372cc6a..0000000 --- a/colorschemes/active/alacritty.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- # yamllint disable rule:colons -# do not edit; generated by scwrypts -# theme : halloween -colors: - primary: - background: '0x000505' - foreground: '0xd0f0f0' - cursor: - cursor: '0xefe5f9' - normal: - black: '0x000505' - red: '0x00f900' - green: '0xff6f00' - yellow: '0x8b41d5' - blue: '0xac0041' - magenta: '0x750dcc' - cyan: '0x00f900' - white: '0xd0f0f0' - bright: - black: '0x424253' - red: '0xa3ff90' - green: '0xffe082' - yellow: '0xbb94e6' - blue: '0xff283e' - magenta: '0xd6bff0' - cyan: '0xcbffbe' - white: '0x7e707e' diff --git a/colorschemes/active/getty.sh b/colorschemes/active/getty.sh deleted file mode 100644 index 50cc442..0000000 --- a/colorschemes/active/getty.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# do not edit; generated by scwrypts -# theme : halloween -# -# source this file to apply colorscheme to linux getty -# -[[ "$TERM" =~ ^linux$ ]] || return 0 -/bin/echo -e " ]P0000505 ]P100f900 ]P2ff6f00 ]P38b41d5 ]P4ac0041 ]P5750dcc ]P600f900 ]P7d0f0f0 ]P8a3ff90 ]P9ffe082 ]PAbb94e6 ]PBff283e ]PCd6bff0 ]PDcbffbe ]PEd0f0f0 ]PF7e707e " -[ ! $NO_CLEAR ] && clear -return 0 - sed $d diff --git a/colorschemes/active/kitty.conf b/colorschemes/active/kitty.conf deleted file mode 100644 index 330b335..0000000 --- a/colorschemes/active/kitty.conf +++ /dev/null @@ -1,23 +0,0 @@ -# do not edit; generated by scwrypts -# theme : halloween -color0 #000505 -color1 #00f900 -color2 #ff6f00 -color3 #8b41d5 -color4 #ac0041 -color5 #750dcc -color6 #00f900 -color7 #d0f0f0 -color8 #424253 -color9 #a3ff90 -color10 #ffe082 -color11 #bb94e6 -color12 #ff283e -color13 #d6bff0 -color14 #cbffbe -color15 #7e707e -cursor #efe5f9 -background #000505 -foreground #d0f0f0 -selection_background # -selection_foreground # diff --git a/colorschemes/active/name.txt b/colorschemes/active/name.txt deleted file mode 100644 index 8bfed29..0000000 --- a/colorschemes/active/name.txt +++ /dev/null @@ -1 +0,0 @@ -halloween diff --git a/colorschemes/active/rofi.rasi b/colorschemes/active/rofi.rasi deleted file mode 100644 index cbe0177..0000000 --- a/colorschemes/active/rofi.rasi +++ /dev/null @@ -1,14 +0,0 @@ -/** - * do not edit; generated by scwrypts - * theme : halloween - **/ - -*{ - background: #ff6f00; - foreground: #000505; - background-alt: #a066dd; - foreground-alt: #000505; - selected: #000505; - active: #8b41d5; - urgent: #00f900; -} diff --git a/colorschemes/active/source.yaml b/colorschemes/active/source.yaml deleted file mode 120000 index 7e0cac3..0000000 --- a/colorschemes/active/source.yaml +++ /dev/null @@ -1 +0,0 @@ -/home/w0ryn/.wryn/colorschemes/halloween.yaml \ No newline at end of file diff --git a/config/alacritty.yaml b/config/alacritty.yaml deleted file mode 100644 index 3384caf..0000000 --- a/config/alacritty.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- # yamllint disable rule:colons -# DEPRECATED; please refer to alacritty.toml -import: - - ~/.config/alacritty/theme.yml - - ~/.config/alacritty/local.yml - -window: - opacity: 0.8 - -font: - glyph_offset: - x: 0 - y: 1 - - normal: - family: Monaspace Neon - - bold: - family: Monaspace Argon - - italic: - family: Monaspace Radon diff --git a/config/bin/arch-linux-rank-mirrors b/config/bin/arch-linux-rank-mirrors new file mode 100755 index 0000000..6d51618 --- /dev/null +++ b/config/bin/arch-linux-rank-mirrors @@ -0,0 +1,38 @@ +#!/usr/bin/env zsh + +command -v /usr/bin/rankmirrors &>/dev/null || { + echo "missing 'rankmirrors'; trying to install..." >&2 + yay -S pacman-contrib +} + +command -v /usr/bin/rankmirrors &>/dev/null || { + echo "cannot rank mirrors without 'rankmirrors' from pacman-contrib; aborting" >&2 + return 1 +} + + +echo 'ranking mirrors; this may take a few minutes...' >&2 +{ + echo "# mirrors ranked on $(date)" + curl -s 'https://archlinux.org/mirrorlist/?country=US&country=CA&protocol=https&use_mirror_status=on' \ + | sed 's/^#Server/Server/; /^#/d' +} | /usr/bin/rankmirrors -n 7 - > "${HOME}/mirrorlist.ranked" + +[ -f ~/mirrorlist.ranked ] || { + echo 'failed to rank mirrors :c' + return 1 +} + +echo " +finished ranking mirrors! + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >&2 +diff --side-by-side --color /etc/pacman.d/mirrorlist "${HOME}/mirrorlist.ranked" >&2 +echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +updated list is currently at ~/mirrorlist.ranked; please review the new list +and backup existing list; once you're ready to save them, you can run: + +" >&2 + +echo "sudo mv ~/mirrorlist.ranked /etc/pacman.d/mirrorlist && yay -Syyu" diff --git a/bin/i3-utils b/config/bin/i3-utils similarity index 60% rename from bin/i3-utils rename to config/bin/i3-utils index c1e8634..376a2c8 100755 --- a/bin/i3-utils +++ b/config/bin/i3-utils @@ -1,26 +1,34 @@ #!/bin/zsh -command -v scwrypts &>/dev/null || { - [ -f $HOME/.local/bin/scwrypts ] \ - && scwrypts() { $HOME/.local/bin/scwrypts $@; } \ - || scwrypts() { $HOME/.wryn/zsh/plugins/scwrypts/scwrypts $@; } \ - ; +[ "${DOTWRYN}" ] || { + notify-send 'I3 UTILS' 'cannot determine $DOTWRYN for utility execution' + return 1 } +command -v scwrypts &>/dev/null || { + scwrypts() { "${DOTWRYN}/zsh/plugins/scwrypts/scwrypts" $@; } +} + +export CI=true +export DESKTOP__SFX_PATH="${HOME}/Media/sfx" +export SCWRYPTS_LOG_LEVEL=0 + +##################################################################### + case $1 in ( next | previous | play-pause ) playerctl $1 ;; ( fastforward ) playerctl position 5+ ;; ( rewind ) playerctl position 5- ;; - ( volumedown ) scwrypts -n desktop pulseaudio -- sink down ;; - ( volumeup ) scwrypts -n desktop pulseaudio -- sink up ;; - ( volumemute ) scwrypts -n desktop pulseaudio -- sink mute ;; - ( micmute ) scwrypts -n desktop pulseaudio -- source mute ;; + ( volumedown ) scwrypts media pulseaudio volume -- sink down ;; + ( volumeup ) scwrypts media pulseaudio volume -- sink up ;; + ( volumemute ) scwrypts media pulseaudio volume -- sink mute ;; + ( micmute ) scwrypts media pulseaudio volume -- source mute ;; - ( backlightup ) scwrypts -n desktop backlight -- up ;; - ( backlightdown ) scwrypts -n desktop backlight -- down ;; + ( backlightup ) scwrypts desktop backlight -- up ;; + ( backlightdown ) scwrypts desktop backlight -- down ;; - ( lock ) scwrypts -n desktop lock i3 -- ;; + ( lock ) scwrypts desktop lock i3 -- ;; ( bgrandomize ) scwrypts desktop set i3 background -- random ;; diff --git a/bin/media b/config/bin/media similarity index 100% rename from bin/media rename to config/bin/media diff --git a/bin/polybar b/config/bin/polybar similarity index 60% rename from bin/polybar rename to config/bin/polybar index 41cde6a..acdc348 100755 --- a/bin/polybar +++ b/config/bin/polybar @@ -1,8 +1,8 @@ #!/usr/bin/env sh -command -v polybar || return 0 +command -v /usr/bin/polybar || return 0 killall -q polybar while pgrep -x polybar &>/dev/null; do sleep 0.1; done -polybar i3 & +/usr/bin/polybar i3 & diff --git a/bin/vim b/config/bin/vim similarity index 100% rename from bin/vim rename to config/bin/vim diff --git a/bin/xorg-activate-default b/config/bin/xorg-activate-default similarity index 100% rename from bin/xorg-activate-default rename to config/bin/xorg-activate-default diff --git a/colorschemes/active/default.yaml b/config/colorschemes/active/default.yaml similarity index 100% rename from colorschemes/active/default.yaml rename to config/colorschemes/active/default.yaml diff --git a/config/colorschemes/active/getty.sh b/config/colorschemes/active/getty.sh new file mode 100644 index 0000000..e7666bf --- /dev/null +++ b/config/colorschemes/active/getty.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# do not edit; generated by scwrypts +# theme : main +# +# source this file to apply colorscheme to linux getty +# +[[ "$TERM" =~ ^linux$ ]] || return 0 +/bin/echo -e " ]P0000505 ]P1c80064 ]P211bb98 ]P36911aa ]P42262bb ]P59922dd ]P622ccba ]P7d0f0f0 ]P8ff44ff ]P944dddd ]PAaa44ff ]PB229df6 ]PCdd88ff ]PD88ffff ]PEd0f0f0 ]PF7e707e " +[ ! $NO_CLEAR ] && clear +return 0 + sed $d diff --git a/config/colorschemes/active/name.txt b/config/colorschemes/active/name.txt new file mode 100644 index 0000000..ba2906d --- /dev/null +++ b/config/colorschemes/active/name.txt @@ -0,0 +1 @@ +main diff --git a/config/colorschemes/active/rofi.rasi b/config/colorschemes/active/rofi.rasi new file mode 100644 index 0000000..aba6a98 --- /dev/null +++ b/config/colorschemes/active/rofi.rasi @@ -0,0 +1,14 @@ +/** + * do not edit; generated by scwrypts + * theme : main + **/ + +*{ + background: #001129; + foreground: #d0f0f0; + background-alt: #9922dd; + foreground-alt: #000505; + selected: #000505; + active: #6911aa; + urgent: #c80064; +} diff --git a/config/colorschemes/active/source.yaml b/config/colorschemes/active/source.yaml new file mode 120000 index 0000000..edf1e6f --- /dev/null +++ b/config/colorschemes/active/source.yaml @@ -0,0 +1 @@ +../main.yaml \ No newline at end of file diff --git a/colorschemes/autumn.conf b/config/colorschemes/autumn.conf similarity index 100% rename from colorschemes/autumn.conf rename to config/colorschemes/autumn.conf diff --git a/colorschemes/burning-death.yaml b/config/colorschemes/burning-death.yaml similarity index 100% rename from colorschemes/burning-death.yaml rename to config/colorschemes/burning-death.yaml diff --git a/colorschemes/christmas.conf b/config/colorschemes/christmas.conf similarity index 100% rename from colorschemes/christmas.conf rename to config/colorschemes/christmas.conf diff --git a/colorschemes/easter.conf b/config/colorschemes/easter.conf similarity index 100% rename from colorschemes/easter.conf rename to config/colorschemes/easter.conf diff --git a/colorschemes/halloween.conf b/config/colorschemes/halloween.conf similarity index 100% rename from colorschemes/halloween.conf rename to config/colorschemes/halloween.conf diff --git a/colorschemes/halloween.yaml b/config/colorschemes/halloween.yaml similarity index 100% rename from colorschemes/halloween.yaml rename to config/colorschemes/halloween.yaml diff --git a/colorschemes/main.yaml b/config/colorschemes/main.yaml similarity index 100% rename from colorschemes/main.yaml rename to config/colorschemes/main.yaml diff --git a/colorschemes/purple.conf b/config/colorschemes/purple.conf similarity index 100% rename from colorschemes/purple.conf rename to config/colorschemes/purple.conf diff --git a/colorschemes/sanity.conf b/config/colorschemes/sanity.conf similarity index 100% rename from colorschemes/sanity.conf rename to config/colorschemes/sanity.conf diff --git a/config/colorschemes/source.yaml b/config/colorschemes/source.yaml new file mode 120000 index 0000000..22db158 --- /dev/null +++ b/config/colorschemes/source.yaml @@ -0,0 +1 @@ +/home/w0ryn/.local/share/wryn/colorschemes/main.yaml \ No newline at end of file diff --git a/colorschemes/spring-sunset.yaml b/config/colorschemes/spring-sunset.yaml similarity index 100% rename from colorschemes/spring-sunset.yaml rename to config/colorschemes/spring-sunset.yaml diff --git a/colorschemes/spring.conf b/config/colorschemes/spring.conf similarity index 100% rename from colorschemes/spring.conf rename to config/colorschemes/spring.conf diff --git a/colorschemes/st-patricks.conf b/config/colorschemes/st-patricks.conf similarity index 100% rename from colorschemes/st-patricks.conf rename to config/colorschemes/st-patricks.conf diff --git a/colorschemes/summer.conf b/config/colorschemes/summer.conf similarity index 100% rename from colorschemes/summer.conf rename to config/colorschemes/summer.conf diff --git a/colorschemes/thanksgiving.conf b/config/colorschemes/thanksgiving.conf similarity index 100% rename from colorschemes/thanksgiving.conf rename to config/colorschemes/thanksgiving.conf diff --git a/colorschemes/valentines.conf b/config/colorschemes/valentines.conf similarity index 100% rename from colorschemes/valentines.conf rename to config/colorschemes/valentines.conf diff --git a/colorschemes/winter.conf b/config/colorschemes/winter.conf similarity index 100% rename from colorschemes/winter.conf rename to config/colorschemes/winter.conf diff --git a/config/dotwryn.env.zsh b/config/dotwryn.env.zsh deleted file mode 100644 index 167effc..0000000 --- a/config/dotwryn.env.zsh +++ /dev/null @@ -1,18 +0,0 @@ -##################################################################### -### default .wryn configuration settings ############################ -##################################################################### - -# 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 -} diff --git a/config/system/ssh/ssh_config.d/30-1password-ssh-agent.conf b/config/etc/ssh/ssh_config.d/30-1password-ssh-agent.conf similarity index 100% rename from config/system/ssh/ssh_config.d/30-1password-ssh-agent.conf rename to config/etc/ssh/ssh_config.d/30-1password-ssh-agent.conf diff --git a/config/system/ssh/sshd_config.d/10-only-allow-password-on-local-network.conf b/config/etc/ssh/sshd_config.d/10-only-allow-password-on-local-network.conf similarity index 100% rename from config/system/ssh/sshd_config.d/10-only-allow-password-on-local-network.conf rename to config/etc/ssh/sshd_config.d/10-only-allow-password-on-local-network.conf diff --git a/config/i3.conf b/config/i3.conf index 23e0191..93f0ef9 100644 --- a/config/i3.conf +++ b/config/i3.conf @@ -10,7 +10,7 @@ font pango:Monaspace Argon, pango:Noto Color Emoji, pango:Symbols Nerd Font 16 ## Custom Utility ############################################################## ################################################################################ -set $UTILS exec --no-startup-id /home/w0ryn/.config/i3/utils +set $UTILS exec --no-startup-id $DOTWRYN/config/bin/i3-utils # Audio bindsym XF86AudioRewind $UTILS previous diff --git a/config/i3.config.yaml b/config/i3.config.yaml index 449bd8e..f2f154b 100644 --- a/config/i3.config.yaml +++ b/config/i3.config.yaml @@ -21,5 +21,5 @@ statusbar: # supported values are 'polybar' and 'i3status' type: polybar -# a list of i3conifg excerpts that should be appended to the generated config +# a list of i3config excerpts that should be appended to the generated config i3configs: [] diff --git a/bin/altaria/1080p-beeg-game b/config/local/altaria/bin/1080p-beeg-game similarity index 100% rename from bin/altaria/1080p-beeg-game rename to config/local/altaria/bin/1080p-beeg-game diff --git a/bin/altaria/4k-beeg-game b/config/local/altaria/bin/4k-beeg-game similarity index 100% rename from bin/altaria/4k-beeg-game rename to config/local/altaria/bin/4k-beeg-game diff --git a/bin/bg-apps/apps b/config/local/altaria/bin/apps similarity index 88% rename from bin/bg-apps/apps rename to config/local/altaria/bin/apps index 0f71024..a784c77 100755 --- a/bin/bg-apps/apps +++ b/config/local/altaria/bin/apps @@ -4,7 +4,7 @@ tmux new -d -s apps -n 'foreman' 'htop' \; \ split-window -d -t apps:foreman "clear; echo 'Keeping apps fresh...'; while true; do sleep 30; done" \ 2>/dev/null -for APP in $(ls ${0:a:h} | grep -v 'apps') +for APP in $(find "${0:a:h}" -name apps.\*) do echo "looking for $APP" tmux list-windows -t apps: | awk '{print $2;}' | grep -q $APP \ diff --git a/bin/bg-apps/midi b/config/local/altaria/bin/apps.midi similarity index 100% rename from bin/bg-apps/midi rename to config/local/altaria/bin/apps.midi diff --git a/bin/altaria/beeg-game b/config/local/altaria/bin/beeg-game similarity index 100% rename from bin/altaria/beeg-game rename to config/local/altaria/bin/beeg-game diff --git a/bin/altaria/default b/config/local/altaria/bin/default similarity index 92% rename from bin/altaria/default rename to config/local/altaria/bin/default index 143972f..9dadc5b 100755 --- a/bin/altaria/default +++ b/config/local/altaria/bin/default @@ -15,7 +15,7 @@ case $MONITOR_CONFIGURATION in xrandr --output $(xrandr | grep ' connected' | awk '{print $1;}') --primary scwrypts desktop i3 set background -- $(scwrypts -n get theme).jpg $DOTWRYN/bin/polybar - scwrypts desktop play sound -- login + scwrypts desktop play sfx -- login return 0 ;; esac diff --git a/bin/altaria/smol-game b/config/local/altaria/bin/smol-game similarity index 100% rename from bin/altaria/smol-game rename to config/local/altaria/bin/smol-game diff --git a/bin/altaria/xorg.zsh b/config/local/altaria/bin/xorg.zsh similarity index 97% rename from bin/altaria/xorg.zsh rename to config/local/altaria/bin/xorg.zsh index a74a8b8..72eaeca 100644 --- a/bin/altaria/xorg.zsh +++ b/config/local/altaria/bin/xorg.zsh @@ -80,5 +80,5 @@ XRANDR_SET() { scwrypts desktop screen blank -- $SCREEN_BLANK scwrypts desktop i3 set background -- $BACKGROUND || scwrypts desktop i3 set background -- purple.jpg $DOTWRYN/bin/polybar - scwrypts desktop play sound -- $SOUND_EFFECT + scwrypts desktop play sfx -- $SOUND_EFFECT } diff --git a/bin/butterfree/default b/config/local/butterfree/bin/default similarity index 100% rename from bin/butterfree/default rename to config/local/butterfree/bin/default diff --git a/bin/butterfree/gamedock b/config/local/butterfree/bin/gamedock similarity index 100% rename from bin/butterfree/gamedock rename to config/local/butterfree/bin/gamedock diff --git a/bin/butterfree/hdmidock b/config/local/butterfree/bin/hdmidock similarity index 100% rename from bin/butterfree/hdmidock rename to config/local/butterfree/bin/hdmidock diff --git a/bin/butterfree/runedock b/config/local/butterfree/bin/runedock similarity index 100% rename from bin/butterfree/runedock rename to config/local/butterfree/bin/runedock diff --git a/bin/butterfree/runeundock b/config/local/butterfree/bin/runeundock similarity index 100% rename from bin/butterfree/runeundock rename to config/local/butterfree/bin/runeundock diff --git a/bin/butterfree/undock b/config/local/butterfree/bin/undock similarity index 100% rename from bin/butterfree/undock rename to config/local/butterfree/bin/undock diff --git a/bin/butterfree/workdock b/config/local/butterfree/bin/workdock similarity index 100% rename from bin/butterfree/workdock rename to config/local/butterfree/bin/workdock diff --git a/bin/butterfree/xorg.zsh b/config/local/butterfree/bin/xorg.zsh similarity index 69% rename from bin/butterfree/xorg.zsh rename to config/local/butterfree/bin/xorg.zsh index 2d81667..bf936c8 100644 --- a/bin/butterfree/xorg.zsh +++ b/config/local/butterfree/bin/xorg.zsh @@ -1,5 +1,5 @@ #!/bin/zsh -source "$HOME/.config/wryn/env.zsh" +source "${HOME}/.config/wryn/env.zsh" NATIVE_MONITOR='eDP1' GET_PRIMARY_MONITOR() { @@ -15,7 +15,7 @@ GET_ALL_EXTERNAL_MONITORS() { xrandr \ | grep ' connect' \ | awk '{print $1;}' \ - | grep -v "$NATIVE_MONITOR" \ + | grep -v "${NATIVE_MONITOR}" \ 2>/dev/null } GET_DEFAULT_EXTERNAL_MONITOR() { @@ -34,19 +34,19 @@ DISCONNECT_OTHER() { for ACTIVE_MONITOR in ${@:2} do - INACTIVE_MONITORS=$(echo $INACTIVE_MONITORS | grep -v "^$ACTIVE_MONITOR$") + INACTIVE_MONITORS=$(echo ${INACTIVE_MONITORS} | grep -v "^${ACTIVE_MONITOR}$") done local MONITOR - for MONITOR in $INACTIVE_MONITORS + for MONITOR in ${INACTIVE_MONITORS} do - xrandr --output $MONITOR --off + xrandr --output ${MONITOR} --off done sleep 1 - $DOTWRYN/bin/set-background random + ${DOTWRYN}/bin/set-background random - [ $SFX ] && ( $DOTWRYN/bin/play-sound $SFX ) & + [ ${SFX} ] && ( scwrypts play sfx -- ${SFX} ) & return 0 } diff --git a/config/local/pikachu/bin/apps b/config/local/pikachu/bin/apps new file mode 100755 index 0000000..583f919 --- /dev/null +++ b/config/local/pikachu/bin/apps @@ -0,0 +1,13 @@ +#!/bin/zsh + +tmux new -d -s apps -n 'foreman' 'htop' \; \ + split-window -d -t apps:foreman "clear; echo 'Keeping apps fresh...'; while true; do sleep 30; done" \ + 2>/dev/null + +${XDG_DATA_HOME}/home/w0ryn/.local/share/project-source-code/yage/dotwryn/code/config/local/pikachu/bin +for APP in $(find "${0:a:h}" -name apps.\*) +do + echo "looking for $APP" + tmux list-windows -t apps: | awk '{print $2;}' | grep -q $APP \ + || tmux new-window -dn $APP -t apps: "${0:a:h}/$APP" +done diff --git a/config/local/pikachu/bin/apps.midi b/config/local/pikachu/bin/apps.midi new file mode 100755 index 0000000..6583e49 --- /dev/null +++ b/config/local/pikachu/bin/apps.midi @@ -0,0 +1,13 @@ +#!/bin/zsh + +cd ${XDG_DATA_HOME:-${HOME}/.local/share}/project-source-code/python/xorg-midi/code +source ../env/bin/activate + +while true +do + clear + echo "activating midi controller" + ./midi-controller + echo "midi controller died; waiting to reconnect" + sleep 3 +done diff --git a/bin/pikachu/default b/config/local/pikachu/bin/default similarity index 67% rename from bin/pikachu/default rename to config/local/pikachu/bin/default index d4ee273..f40cf62 100755 --- a/bin/pikachu/default +++ b/config/local/pikachu/bin/default @@ -3,3 +3,4 @@ xrandr --auto scwrypts desktop i3 set background -- $(scwrypts -n get theme).jpg +scwrypts desktop screen blank -- enable diff --git a/config/local/pikachu/bin/livingroom b/config/local/pikachu/bin/livingroom new file mode 100755 index 0000000..7d05b11 --- /dev/null +++ b/config/local/pikachu/bin/livingroom @@ -0,0 +1,10 @@ +#!/bin/zsh + +xrandr --auto + +xrandr --output HDMI-1-0 --off +sleep 1 +xrandr --output HDMI-1-0 --mode 2560x1440 + +scwrypts desktop i3 set background -- $(scwrypts -n get theme).jpg +scwrypts desktop screen blank -- disable diff --git a/config/local/pikachu/bin/office b/config/local/pikachu/bin/office new file mode 100755 index 0000000..28108bd --- /dev/null +++ b/config/local/pikachu/bin/office @@ -0,0 +1,11 @@ +#!/bin/zsh + +xrandr --auto + +xrandr --output HDMI-1-0 --off +sleep 1 +xrandr --output HDMI-1-0 --mode 1920x1080 +xrandr --output eDP-1 --off + +scwrypts desktop i3 set background -- $(scwrypts -n get theme).jpg +scwrypts desktop screen blank -- disable diff --git a/config/local/pikachu/bin/scwrypts b/config/local/pikachu/bin/scwrypts new file mode 120000 index 0000000..8a1d843 --- /dev/null +++ b/config/local/pikachu/bin/scwrypts @@ -0,0 +1 @@ +/home/w0ryn/.local/share/wryn/zsh/plugins/scwrypts/scwrypts \ No newline at end of file diff --git a/bin/pikachu/set-battery-max-charge b/config/local/pikachu/bin/set-battery-max-charge similarity index 100% rename from bin/pikachu/set-battery-max-charge rename to config/local/pikachu/bin/set-battery-max-charge diff --git a/config/local/pikachu/bin/undock b/config/local/pikachu/bin/undock new file mode 100755 index 0000000..812579c --- /dev/null +++ b/config/local/pikachu/bin/undock @@ -0,0 +1,7 @@ +#!/bin/zsh + +xrandr --output HDMI-1-0 --off +xrandr --output eDP-1 --mode 2560x1600 + +scwrypts desktop i3 set background -- $(scwrypts -n get theme).jpg +scwrypts desktop screen blank -- disable diff --git a/config/system/pikachu/xinit/10-optimus-manager.conf b/config/local/pikachu/etc/X11/xinit/10-optimus-manager.conf similarity index 100% rename from config/system/pikachu/xinit/10-optimus-manager.conf rename to config/local/pikachu/etc/X11/xinit/10-optimus-manager.conf diff --git a/config/local/pikachu/etc/X11/xinit/xinitrc.d/10-optimus-manager.conf b/config/local/pikachu/etc/X11/xinit/xinitrc.d/10-optimus-manager.conf new file mode 100644 index 0000000..06c155e --- /dev/null +++ b/config/local/pikachu/etc/X11/xinit/xinitrc.d/10-optimus-manager.conf @@ -0,0 +1,40 @@ +Section "Files" + ModulePath "/usr/lib/nvidia" + ModulePath "/usr/lib32/nvidia" + ModulePath "/usr/lib32/nvidia/xorg/modules" + ModulePath "/usr/lib32/xorg/modules" + ModulePath "/usr/lib64/nvidia/xorg/modules" + ModulePath "/usr/lib64/nvidia/xorg" + ModulePath "/usr/lib64/xorg/modules" +EndSection + +Section "ServerLayout" + Identifier "layout" + Screen 0 "integrated" + Inactive "nvidia" + Option "AllowNVIDIAGPUScreens" +EndSection + +Section "Device" + Identifier "integrated" + Driver "modesetting" + BusID "PCI:101:0:0" + Option "DRI" "3" +EndSection + +Section "Screen" + Identifier "integrated" + Device "integrated" +EndSection + +Section "Device" + Identifier "nvidia" + Driver "nvidia" + BusID "PCI:100:0:0" + Option "Coolbits" "28" +EndSection + +Section "Screen" + Identifier "nvidia" + Device "nvidia" +EndSection diff --git a/config/local/pikachu/etc/udev/rules.d/90-set-default-battery-max-charge.rules b/config/local/pikachu/etc/udev/rules.d/90-set-default-battery-max-charge.rules new file mode 100644 index 0000000..40dab2d --- /dev/null +++ b/config/local/pikachu/etc/udev/rules.d/90-set-default-battery-max-charge.rules @@ -0,0 +1 @@ +ACTION=="add", RUN+="/home/w0ryn/.local/share/wryn/config/local/pikachu/bin/set-battery-max-charge" diff --git a/config/system/pikachu/udev/rules.d/91-backlight.rules b/config/local/pikachu/etc/udev/rules.d/91-backlight.rules similarity index 100% rename from config/system/pikachu/udev/rules.d/91-backlight.rules rename to config/local/pikachu/etc/udev/rules.d/91-backlight.rules diff --git a/config/local/pikachu/misc/pulseaudio.patch b/config/local/pikachu/misc/pulseaudio.patch new file mode 100644 index 0000000..02fdd18 --- /dev/null +++ b/config/local/pikachu/misc/pulseaudio.patch @@ -0,0 +1,20 @@ +--- a/analog-output-speaker.conf ++++ b/analog-output-speaker.conf +@@ -71,12 +71,14 @@ + + [Element Hardware Master] + switch = mute +-volume = merge +-override-map.1 = all +-override-map.2 = all-left,all-right ++volume = ignore + + [Element Master] + switch = mute ++volume = ignore ++ ++[Element PCM] ++switch = mute + volume = merge + override-map.1 = all + override-map.2 = all-left,all-right diff --git a/config/local/pikachu/misc/pulseaudio.patch.apply b/config/local/pikachu/misc/pulseaudio.patch.apply new file mode 100755 index 0000000..e4ba86e --- /dev/null +++ b/config/local/pikachu/misc/pulseaudio.patch.apply @@ -0,0 +1,2 @@ +#!/bin/zsh +sudo patch -p1 -d /usr/share/alsa-card-profile/mixer/paths/ -i "${0:a:h}/pulseaudio.patch" diff --git a/config/pikachu/X11/xkeymap b/config/local/pikachu/user/X11/xkeymap similarity index 100% rename from config/pikachu/X11/xkeymap rename to config/local/pikachu/user/X11/xkeymap diff --git a/config/local/pikachu/user/alacritty/local.toml b/config/local/pikachu/user/alacritty/local.toml new file mode 100644 index 0000000..73b24ae --- /dev/null +++ b/config/local/pikachu/user/alacritty/local.toml @@ -0,0 +1,2 @@ +[font] +size = 9 diff --git a/bin/umbreon/default b/config/local/umbreon/bin/default similarity index 100% rename from bin/umbreon/default rename to config/local/umbreon/bin/default diff --git a/bin/umbreon/runedock b/config/local/umbreon/bin/runedock similarity index 86% rename from bin/umbreon/runedock rename to config/local/umbreon/bin/runedock index c8d0312..1ba8df9 100755 --- a/bin/umbreon/runedock +++ b/config/local/umbreon/bin/runedock @@ -14,4 +14,4 @@ pkill compton scwrypts desktop screen-blank -- disable scwrypts desktop i3 set background -- link-vs-gdizz.jpg -scwrypts desktop play sound -- gamedock +scwrypts desktop play sfx -- gamedock diff --git a/bin/umbreon/scwrypts b/config/local/umbreon/bin/scwrypts similarity index 100% rename from bin/umbreon/scwrypts rename to config/local/umbreon/bin/scwrypts diff --git a/bin/umbreon/undock b/config/local/umbreon/bin/undock similarity index 89% rename from bin/umbreon/undock rename to config/local/umbreon/bin/undock index 36934ed..c56e25b 100755 --- a/bin/umbreon/undock +++ b/config/local/umbreon/bin/undock @@ -14,4 +14,4 @@ xrandr ${ARGS[@]} \ scwrypts desktop screen-blank -- enable scwrypts desktop i3 set background -- $(scwrypts -n get theme).jpg || scwrypts desktop i3 set background -- random -scwrypts desktop play sound -- gamedock +scwrypts desktop play sfx -- gamedock diff --git a/bin/umbreon/xorg.zsh b/config/local/umbreon/bin/xorg.zsh similarity index 100% rename from bin/umbreon/xorg.zsh rename to config/local/umbreon/bin/xorg.zsh diff --git a/config/rofi.theme.rasi b/config/rofi.theme.rasi index 9d612f8..7fdb10b 100644 --- a/config/rofi.theme.rasi +++ b/config/rofi.theme.rasi @@ -21,7 +21,7 @@ configuration { /*****----- Global Properties -----*****/ -@import "../colorschemes/active/rofi" +@import "./colorschemes/active/rofi" * { border-colour: var(selected); diff --git a/config/scwrypts/config.zsh b/config/scwrypts/config.zsh index 760a437..a8a1b66 100644 --- a/config/scwrypts/config.zsh +++ b/config/scwrypts/config.zsh @@ -3,19 +3,14 @@ # SCWRYPTS_SHORTCUT='' # CTRL + W -SCWRYPTS_ENV_SHORTCUT='' # CTRL + / -SCWRYPTS_ENVIRONMENT__SHOW_ENV_HELP=false -SCWRYPTS_ENVIRONMENT__PREFERRED_EDIT_MODE=quiet +#SCWRYPTS_ENVIRONMENT__SHOW_ENV_HELP=false +#SCWRYPTS_ENVIRONMENT__PREFERRED_EDIT_MODE=quiet -for SEARCH_DIR in \ - "$DOTWRYN/scwrypts" \ - "$HOME/Projects/yage/" \ - ; -do - [ -d "$SEARCH_DIR" ] || continue - for G in "$SEARCH_DIR/"**/*.scwrypts.zsh; do . "$G"; done -done +SCWRYPTS_GENERATOR__SHOW_HELP=false -[ -f "$HOME/.config/scwrypts/config.local.zsh" ] \ - && source "$HOME/.config/scwrypts/config.local.zsh" +[ ${DOTWRYN} ] || source "${HOME}/.zshrc" +SCWRYPTS_GROUP_DIRS+=("${DOTWRYN}/scwrypts") + +[ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/scwrypts/config.local.zsh" ] \ + && source "${XDG_CONFIG_HOME:-${HOME}/.config}/scwrypts/config.local.zsh" diff --git a/config/scwrypts/dotfiles.zsh b/config/scwrypts/dotfiles.zsh deleted file mode 100644 index cebb377..0000000 --- a/config/scwrypts/dotfiles.zsh +++ /dev/null @@ -1,60 +0,0 @@ -# -# scwrypts dot-files config -# - -TERMINFO_PATH="$DOTWRYN/config/terminfo" -SAFE_SYMLINKS=0 - -# lines which begin with '#' are ignored -SYMLINKS=" -# -------------------------------------------------------------------------- -# fully qualified path ~/.config/THE-REST -# -------------------------------------------------------------------------- -$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/config/alacritty.toml alacritty/alacritty.toml -$DOTWRYN/config/alacritty.default.toml alacritty/default.toml -$DOTWRYN/config/alacritty.yaml alacritty/alacritty.yml -$DOTWRYN/config/bat.conf bat/config -$DOTWRYN/config/code-activator.conf code-activator-zsh/settings.zsh -$DOTWRYN/config/compton.conf compton/compton.conf -$DOTWRYN/config/flameshot.ini flameshot/flameshot.ini -$DOTWRYN/config/git.conf git/config -$DOTWRYN/config/htop.conf htop/htoprc -$DOTWRYN/config/i3status.conf i3status/config -$DOTWRYN/config/kitty.conf kitty/kitty.conf -$DOTWRYN/config/mssqlcli.conf mssqlci/config -$DOTWRYN/config/pgcli.conf pgcli/config -$DOTWRYN/config/polybar.ini polybar/config.ini -$DOTWRYN/config/pylint.conf pylintrc -$DOTWRYN/config/ripgrep.conf ripgrep/config -$DOTWRYN/config/scwrypts/config.zsh scwrypts/config.zsh -$DOTWRYN/config/scwrypts/dotfiles.zsh scwrypts/dotfiles.zsh -$DOTWRYN/config/scwrypts/vundle.zsh scwrypts/vundle.zsh -$DOTWRYN/config/tmux.conf tmux/tmux.conf -$DOTWRYN/config/xcompose.conf X11/xcompose -$DOTWRYN/config/xconfig.conf X11/xconfig -$DOTWRYN/config/xinitrc.i3 ../.xinitrc -$DOTWRYN/config/xinitrc.i3 X11/xinitrc -$DOTWRYN/bin/vim ../.local/bin/vim -$DOTWRYN/bin/$(hostnamectl --static) ../.$(hostnamectl --static) - -$( () { - local SOURCE_CONTROLLED_GROUPS=(dotwryn remote scwrypts) - local GROUP_MATCH_STRING="\\($(printf '\|%s' ${SOURCE_CONTROLLED_GROUPS[@]} | sed 's/^\\|//')\\)" - - local _LOCAL='scwrypts/environments' - local _DOTWRYN="$DOTWRYN/config/scwrypts/environments" - - find "$HOME/.config/$_LOCAL" -mindepth 1 -maxdepth 1 -name \*.env.yaml \ - | sed -n "s^.*/\(local\(\.[^.]\+\)\{0,\}\.$GROUP_MATCH_STRING.env.yaml\)$$_DOTWRYN/\1^$_LOCAL/\1p" \ - | grep -v '\.secret\.' \ - | sort --unique \ - | column -ts '^' \ - ; -} ) -" - -true diff --git a/config/scwrypts/environments/local.pikachu.dotwryn.env.yaml b/config/scwrypts/environments/local.pikachu.dotwryn.env.yaml index 6d7c97a..ac798ec 100644 --- a/config/scwrypts/environments/local.pikachu.dotwryn.env.yaml +++ b/config/scwrypts/environments/local.pikachu.dotwryn.env.yaml @@ -1,2 +1,4 @@ ---- # local.altaria > dotwryn -# no configuration set +--- # local.pikachu > dotwryn +desktop: + backlight-device: + value: amdgpu_bl1 diff --git a/config/scwrypts/environments/local.pikachu.remote.env.yaml b/config/scwrypts/environments/local.pikachu.remote.env.yaml index 0516005..394a3bd 100644 --- a/config/scwrypts/environments/local.pikachu.remote.env.yaml +++ b/config/scwrypts/environments/local.pikachu.remote.env.yaml @@ -1,2 +1,2 @@ ---- # local.altaria > remote +--- # local.pikachu > remote # no configuration set diff --git a/config/scwrypts/environments/local.pikachu.scwrypts.env.yaml b/config/scwrypts/environments/local.pikachu.scwrypts.env.yaml index d832d7d..f00b85e 100644 --- a/config/scwrypts/environments/local.pikachu.scwrypts.env.yaml +++ b/config/scwrypts/environments/local.pikachu.scwrypts.env.yaml @@ -1,10 +1,2 @@ ---- # local.altaria > scwrypts -media-sync: - targets: - value: - - Pictures - - Documents - - Media - - .local/.porn - - Games/roms - - .local/share/dolphin-emu +--- # local.pikachu > scwrypts +# no configuration set diff --git a/config/scwrypts/vundle.zsh b/config/scwrypts/vundle.zsh index 753d3eb..bc9af58 100644 --- a/config/scwrypts/vundle.zsh +++ b/config/scwrypts/vundle.zsh @@ -2,44 +2,7 @@ # Scwrypts Build Definitions # -VUNDLE__BUILD__ale() { - # ... build steps from /home/w0ryn/.vim/ale -} - -VUNDLE__BUILD__nerdtree() { - # ... build steps from /home/w0ryn/.vim/nerdtree -} - -VUNDLE__BUILD__unicode.vim() { - # ... build steps from /home/w0ryn/.vim/unicode.vim -} - -VUNDLE__BUILD__vim-dim() { - # ... build steps from /home/w0ryn/.vim/vim-dim -} - -VUNDLE__BUILD__vim-fugitive() { - # ... build steps from /home/w0ryn/.vim/vim-fugitive -} - -VUNDLE__BUILD__vim-go() { - # ... build steps from /home/w0ryn/.vim/vim-go -} - -VUNDLE__BUILD__vim-surround() { - # ... build steps from /home/w0ryn/.vim/vim-surround -} - VUNDLE__BUILD__vim-hexokinase() { # ... build steps from /home/w0ryn/.vim/vim-hexokinase make hexokinase } - -VUNDLE__BUILD__youcompleteme() { - # ... build steps from /home/w0ryn/.vim/youcompleteme - ./install.py --all -} - -VUNDLE__BUILD__rust.vim() { - # ... build steps from /home/w0ryn/.vim/rust.vim -} diff --git a/config/system/pikachu/udev/rules.d/90-set-default-battery-max-charge.rules b/config/system/pikachu/udev/rules.d/90-set-default-battery-max-charge.rules deleted file mode 100644 index 3c519dc..0000000 --- a/config/system/pikachu/udev/rules.d/90-set-default-battery-max-charge.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", RUN+="/home/w0ryn/.wryn/bin/pikachu/set-battery-max-charge" diff --git a/config/xcompose.conf b/config/user/X11/xcompose.conf similarity index 100% rename from config/xcompose.conf rename to config/user/X11/xcompose.conf diff --git a/config/xconfig.conf b/config/user/X11/xconfig.conf similarity index 100% rename from config/xconfig.conf rename to config/user/X11/xconfig.conf diff --git a/config/user/X11/xinitrc b/config/user/X11/xinitrc new file mode 100644 index 0000000..3497d14 --- /dev/null +++ b/config/user/X11/xinitrc @@ -0,0 +1,3 @@ +#!/bin/zsh +source "${HOME}/.zshrc" &>/dev/null +source "${DOTWRYN}/config/xinitrc.i3wm" diff --git a/config/alacritty.toml b/config/user/alacritty/alacritty.toml similarity index 100% rename from config/alacritty.toml rename to config/user/alacritty/alacritty.toml diff --git a/config/alacritty.default.toml b/config/user/alacritty/default.toml similarity index 100% rename from config/alacritty.default.toml rename to config/user/alacritty/default.toml diff --git a/config/user/alacritty/theme.toml b/config/user/alacritty/theme.toml new file mode 100644 index 0000000..122b18e --- /dev/null +++ b/config/user/alacritty/theme.toml @@ -0,0 +1,28 @@ +# do not edit; generated by scwrypts +# theme : main +[colors.cursor] +cursor = '0xeeddff' + +[colors.primary] +background = '0x000505' +foreground = '0xd0f0f0' + +[colors.normal] +black = '0x000505' +red = '0xc80064' +green = '0x11bb98' +yellow = '0x6911aa' +blue = '0x2262bb' +magenta = '0x9922dd' +cyan = '0x22ccba' +white = '0xd0f0f0' + +[colors.bright] +black = '0x424253' +red = '0xff44ff' +green = '0x44dddd' +yellow = '0xaa44ff' +blue = '0x229df6' +magenta = '0xdd88ff' +cyan = '0x88ffff' +white = '0x7e707e' diff --git a/config/bat.conf b/config/user/bat/config similarity index 100% rename from config/bat.conf rename to config/user/bat/config diff --git a/config/bpython.conf b/config/user/bpython/config similarity index 100% rename from config/bpython.conf rename to config/user/bpython/config diff --git a/config/code-activator.conf b/config/user/code-activator-zsh/settings.zsh similarity index 100% rename from config/code-activator.conf rename to config/user/code-activator-zsh/settings.zsh diff --git a/config/compton.conf b/config/user/compton/compton.conf similarity index 100% rename from config/compton.conf rename to config/user/compton/compton.conf diff --git a/config/flameshot.ini b/config/user/flameshot/flameshot.ini similarity index 100% rename from config/flameshot.ini rename to config/user/flameshot/flameshot.ini diff --git a/config/git.conf b/config/user/git/config similarity index 100% rename from config/git.conf rename to config/user/git/config diff --git a/config/htop.conf b/config/user/htop/htoprc similarity index 100% rename from config/htop.conf rename to config/user/htop/htoprc diff --git a/config/i3status.conf b/config/user/i3status/config similarity index 100% rename from config/i3status.conf rename to config/user/i3status/config diff --git a/config/kitty.conf b/config/user/kitty/kitty.conf similarity index 100% rename from config/kitty.conf rename to config/user/kitty/kitty.conf diff --git a/config/user/kitty/theme.conf b/config/user/kitty/theme.conf new file mode 100644 index 0000000..634caf5 --- /dev/null +++ b/config/user/kitty/theme.conf @@ -0,0 +1,23 @@ +# do not edit; generated by scwrypts +# theme : main +color0 #000505 +color1 #c80064 +color2 #11bb98 +color3 #6911aa +color4 #2262bb +color5 #9922dd +color6 #22ccba +color7 #d0f0f0 +color8 #424253 +color9 #ff44ff +color10 #44dddd +color11 #aa44ff +color12 #229df6 +color13 #dd88ff +color14 #88ffff +color15 #7e707e +cursor #eeddff +background #000505 +foreground #d0f0f0 +selection_background # +selection_foreground # diff --git a/config/mssqlcli.conf b/config/user/mssqlcli/config similarity index 100% rename from config/mssqlcli.conf rename to config/user/mssqlcli/config diff --git a/config/npmrc b/config/user/npm/npmrc similarity index 100% rename from config/npmrc rename to config/user/npm/npmrc diff --git a/config/pgcli.conf b/config/user/pgcli/config similarity index 100% rename from config/pgcli.conf rename to config/user/pgcli/config diff --git a/config/polybar.ini b/config/user/polybar/config.ini similarity index 98% rename from config/polybar.ini rename to config/user/polybar/config.ini index 45a2449..62b88e8 100644 --- a/config/polybar.ini +++ b/config/user/polybar/config.ini @@ -1,4 +1,4 @@ -include-file = $DOTWRYN/colorschemes/active/polybar.ini +include-file = $HOME/.config/polybar/theme.ini include-file = $HOME/.config/polybar/local.ini [settings] diff --git a/colorschemes/active/polybar.ini b/config/user/polybar/theme.ini similarity index 79% rename from colorschemes/active/polybar.ini rename to config/user/polybar/theme.ini index 5cb46bb..0356788 100644 --- a/colorschemes/active/polybar.ini +++ b/config/user/polybar/theme.ini @@ -1,13 +1,13 @@ # do not edit; generated by scwrypts -# theme : halloween +# theme : main [colors] background = #000505 foreground = #d0f0f0 -background-alt = #8b41d5 +background-alt = #6911aa foreground-alt = #d0f0f0 -primary = #8b41d5 -secondary = #ff6f00 -alert = #00f900 +primary = #6911aa +secondary = #11bb98 +alert = #c80064 disabled = #424253 primary-gradient-0 = #420069 diff --git a/config/pylint.conf b/config/user/pylintrc similarity index 100% rename from config/pylint.conf rename to config/user/pylintrc diff --git a/config/ripgrep.conf b/config/user/ripgrep/config similarity index 100% rename from config/ripgrep.conf rename to config/user/ripgrep/config diff --git a/config/tmux.conf b/config/user/tmux/tmux.conf similarity index 100% rename from config/tmux.conf rename to config/user/tmux/tmux.conf diff --git a/config/xinitrc.common b/config/xinitrc.common index a853d87..43af211 100644 --- a/config/xinitrc.common +++ b/config/xinitrc.common @@ -1,25 +1,34 @@ #!/bin/zsh +##################################################################### + for PREFERRED_TERMINAL in \ alacritty \ kitty \ ; do - command -v $PREFERRED_TERMINAL &/dev/null \ && export TERMINAL="$(which $PREFERRED_TERMINAL)" \ && break done +unset PREFERRED_TERMINAL + +##################################################################### for PREFERRED_BROWSER in \ google-chrome-stable \ google-chrome \ ; do - command -v $PREFERRED_BROWSER & >/dev/null \ + command -v $PREFERRED_BROWSER &>/dev/null \ && export BROWSER="$(which $PREFERRED_BROWSER)" \ && break done +unset PREFERRED_BROWSER -for XINITRC in $(find /etc/X11/xinit/xinitrc.d); do source "$XINITRC"; done +##################################################################### + +for XINITRC_FILE in $(find /etc/X11/xinit/xinitrc.d | sort); do source "$XINITRC_FILE"; done +unset XINITRC_FILE [ -f "$HOME/.config/X11/xmodmap" ] \ && xmodmap "$HOME/.config/X11/xmodmap" @@ -27,4 +36,17 @@ for XINITRC in $(find /etc/X11/xinit/xinitrc.d); do source "$XINITRC"; done [ -f "$HOME/.config/X11/xkeymap" ] \ && xkbcomp "$HOME/.config/X11/xkeymap" ${DISPLAY} -unset PREFERRED_TERMINAL PREFERRED_BROWSER XINITRC +##################################################################### + +for BACKGROUND_APPLICATION in \ + apps \ + /usr/lib/xfce-polkit/xfce-polkit \ + /usr/lib/xfce4/notifyd/xfce4-notifyd \ + "${DOTWRYN}/config/local/$(hostnamectl --static)/bin/default" \ + ; +do + command -v ${BACKGROUND_APPLCATION} && exec ${BACKGROUND_APPLICATION} & +done + +##################################################################### +true diff --git a/config/xinitrc.i3 b/config/xinitrc.i3 deleted file mode 100644 index fd19fc6..0000000 --- a/config/xinitrc.i3 +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/zsh -source "$HOME/.zshrc" &>/dev/null -source "$DOTWRYN/config/xinitrc.common" - -for BACKGROUND_APPLICATION in \ - apps \ - /usr/lib/xfce-polkit/xfce-polkit \ - /usr/lib/xfce4/notifyd/xfce4-notifyd \ - "$DOTWRYN/bin/xorg-activate-default" \ - ; -do - command -v $BACKGROUND_APPLCATION \ - && exec $BACKGROUND_APPLICATION & -done - -export DESKTOP_SESSION=i3wm - -cd; exec i3 diff --git a/config/xinitrc.i3wm b/config/xinitrc.i3wm new file mode 100644 index 0000000..9fc2ad4 --- /dev/null +++ b/config/xinitrc.i3wm @@ -0,0 +1,5 @@ +#!/bin/zsh +source "${DOTWRYN}/config/xinitrc.common" + +export DESKTOP_SESSION=i3wm +cd; exec i3 diff --git a/config/xinitrc.kde b/config/xinitrc.kde index b175d90..9eac5a1 100644 --- a/config/xinitrc.kde +++ b/config/xinitrc.kde @@ -1,7 +1,5 @@ #!/bin/zsh -source "$HOME/.config/wryn/env.zsh" source "$DOTWRYN/config/xinitrc.common" export DESKTOP_SESSION=plasma -unset DIRECTUS_CLOUD_SCRIPTS_ENV_SHORTCUT exec startplasma-x11