From 30c436b7f35133c808eb34e9425e6df592f2a027 Mon Sep 17 00:00:00 2001 From: davidpkj Date: Sun, 27 Aug 2023 16:32:21 +0200 Subject: Update to current general style --- xorg/.Xmodmap | 168 ++++++++++++++++++++++----------------------- xorg/.Xresources | 69 ++++++++++++++++++- xorg/.config/env | 49 +++++++++++-- xorg/.config/mimeapps.list | 23 ++++--- xorg/.config/wallpaper | Bin 1782198 -> 547 bytes xorg/.xinitrc | 34 ++++++--- 6 files changed, 234 insertions(+), 109 deletions(-) (limited to 'xorg') diff --git a/xorg/.Xmodmap b/xorg/.Xmodmap index 0a90c25..f46f862 100644 --- a/xorg/.Xmodmap +++ b/xorg/.Xmodmap @@ -1,92 +1,92 @@ keycode 8 = keycode 9 = Escape NoSymbol Escape -keycode 10 = 1 exclam 1 exclam onesuperior exclamdown onesuperior exclamdown -keycode 11 = 2 quotedbl 2 quotedbl twosuperior oneeighth twosuperior oneeighth -keycode 12 = 3 section 3 section threesuperior sterling threesuperior sterling -keycode 13 = 4 dollar 4 dollar onequarter currency onequarter currency -keycode 14 = 5 percent 5 percent onehalf threeeighths onehalf threeeighths -keycode 15 = 6 ampersand 6 ampersand notsign fiveeighths notsign fiveeighths -keycode 16 = 7 slash 7 slash braceleft seveneighths braceleft seveneighths -keycode 17 = 8 parenleft 8 parenleft bracketleft trademark bracketleft trademark -keycode 18 = 9 parenright 9 parenright bracketright plusminus bracketright plusminus -keycode 19 = 0 equal 0 equal braceright degree braceright degree -keycode 20 = ssharp question ssharp question backslash questiondown U1E9E backslash questiondown U1E9E -keycode 21 = dead_acute dead_grave dead_acute dead_grave dead_cedilla dead_ogonek dead_cedilla dead_ogonek +keycode 10 = 1 exclam 1 exclam +keycode 11 = 2 at 2 at +keycode 12 = 3 numbersign 3 numbersign +keycode 13 = 4 dollar 4 dollar +keycode 14 = 5 percent 5 percent +keycode 15 = 6 asciicircum 6 asciicircum +keycode 16 = 7 ampersand 7 ampersand +keycode 17 = 8 asterisk 8 asterisk +keycode 18 = 9 parenleft 9 parenleft +keycode 19 = 0 parenright 0 parenright +keycode 20 = minus underscore minus underscore +keycode 21 = plus equal degree plusminus keycode 22 = BackSpace BackSpace BackSpace BackSpace keycode 23 = Tab ISO_Left_Tab Tab ISO_Left_Tab -keycode 24 = q Q q Q at Greek_OMEGA at Greek_OMEGA -keycode 25 = w W w W U017F section U017F section -keycode 26 = e E e E EuroSign EuroSign EuroSign EuroSign -keycode 27 = r R r R paragraph registered paragraph registered -keycode 28 = t T t T tslash Tslash tslash Tslash -keycode 29 = z Z z Z leftarrow yen leftarrow yen -keycode 30 = u U u U downarrow uparrow downarrow uparrow -keycode 31 = i I i I rightarrow idotless rightarrow idotless -keycode 32 = o O o O oslash Oslash oslash Oslash -keycode 33 = p P p P thorn THORN thorn THORN -keycode 34 = udiaeresis Udiaeresis udiaeresis Udiaeresis dead_diaeresis dead_abovering dead_diaeresis dead_abovering -keycode 35 = plus asterisk plus asterisk asciitilde macron asciitilde macron +keycode 24 = q Q q Q +keycode 25 = w W w W +keycode 26 = e E e E +keycode 27 = r R r R +keycode 28 = t T t T +keycode 29 = y Y y Y +keycode 30 = u U udiaeresis Udiaeresis +keycode 31 = i I i I +keycode 32 = o O odiaeresis Odiaeresis +keycode 33 = p P p P +keycode 34 = bracketleft braceleft bracketleft braceleft +keycode 35 = bracketright braceright bracketright braceright keycode 36 = Return NoSymbol Return keycode 37 = Control_L NoSymbol Control_L -keycode 38 = a A a A ae AE ae AE -keycode 39 = s S s S U017F U1E9E U017F U1E9E -keycode 40 = d D d D eth ETH eth ETH -keycode 41 = f F f F dstroke ordfeminine dstroke ordfeminine -keycode 42 = g G g G eng ENG eng ENG -keycode 43 = h H h H hstroke Hstroke hstroke Hstroke -keycode 44 = j J j J dead_belowdot dead_abovedot dead_belowdot dead_abovedot -keycode 45 = k K k K kra ampersand kra ampersand -keycode 46 = l L l L lstroke Lstroke lstroke Lstroke -keycode 47 = odiaeresis Odiaeresis odiaeresis Odiaeresis dead_doubleacute dead_belowdot dead_doubleacute dead_belowdot -keycode 48 = adiaeresis Adiaeresis adiaeresis Adiaeresis dead_circumflex dead_caron dead_circumflex dead_caron -keycode 49 = less greater less greater bar dead_belowmacron bar dead_belowmacron +keycode 38 = a A adiaeresis Adiaeresis +keycode 39 = s S ssharp +keycode 40 = d D d D +keycode 41 = f F f F +keycode 42 = g G g G +keycode 43 = h H h H +keycode 44 = j J j J +keycode 45 = k K k K +keycode 46 = l L l L +keycode 47 = semicolon colon semicolon colon +keycode 48 = apostrophe quotedbl apostrophe quotedbl +keycode 49 = grave asciitilde grave asciitilde keycode 50 = Shift_L NoSymbol Shift_L -keycode 51 = numbersign apostrophe numbersign apostrophe rightsinglequotemark dead_breve rightsinglequotemark dead_breve -keycode 52 = y Y y Y guillemotright U203A guillemotright U203A -keycode 53 = x X x X guillemotleft U2039 guillemotleft U2039 -keycode 54 = c C c C cent copyright cent copyright -keycode 55 = v V v V doublelowquotemark singlelowquotemark doublelowquotemark singlelowquotemark -keycode 56 = b B b B leftdoublequotemark leftsinglequotemark leftdoublequotemark leftsinglequotemark -keycode 57 = n N n N rightdoublequotemark rightsinglequotemark rightdoublequotemark rightsinglequotemark -keycode 58 = m M m M mu masculine mu masculine -keycode 59 = comma semicolon comma semicolon periodcentered multiply periodcentered multiply -keycode 60 = period colon period colon U2026 division U2026 division -keycode 61 = minus underscore minus underscore endash emdash endash emdash +keycode 51 = backslash bar backslash bar +keycode 52 = z Z z Z +keycode 53 = x X x X +keycode 54 = c C ccedilla Ccedilla +keycode 55 = v V doublelowquotemark singlelowquotemark +keycode 56 = b B leftdoublequotemark leftsinglequotemark +keycode 57 = n N rightdoublequotemark rightsinglequotemark +keycode 58 = m M m M +keycode 59 = comma less periodcentered multiply +keycode 60 = period greater U2026 division +keycode 61 = slash question slash question keycode 62 = Shift_R NoSymbol Shift_R -keycode 63 = KP_Multiply KP_Multiply KP_Multiply KP_Multiply KP_Multiply KP_Multiply XF86ClearGrab KP_Multiply KP_Multiply XF86ClearGrab +keycode 63 = KP_Multiply KP_Multiply KP_Multiply KP_Multiply KP_Multiply KP_Multiply XF86ClearGrab keycode 64 = Alt_L Meta_L Alt_L Meta_L keycode 65 = space NoSymbol space keycode 66 = Caps_Lock NoSymbol Caps_Lock -keycode 67 = F1 F1 F1 F1 F1 F1 XF86Switch_VT_1 F1 F1 XF86Switch_VT_1 -keycode 68 = F2 F2 F2 F2 F2 F2 XF86Switch_VT_2 F2 F2 XF86Switch_VT_2 -keycode 69 = F3 F3 F3 F3 F3 F3 XF86Switch_VT_3 F3 F3 XF86Switch_VT_3 -keycode 70 = F4 F4 F4 F4 F4 F4 XF86Switch_VT_4 F4 F4 XF86Switch_VT_4 -keycode 71 = F5 F5 F5 F5 F5 F5 XF86Switch_VT_5 F5 F5 XF86Switch_VT_5 -keycode 72 = F6 F6 F6 F6 F6 F6 XF86Switch_VT_6 F6 F6 XF86Switch_VT_6 -keycode 73 = F7 F7 F7 F7 F7 F7 XF86Switch_VT_7 F7 F7 XF86Switch_VT_7 -keycode 74 = F8 F8 F8 F8 F8 F8 XF86Switch_VT_8 F8 F8 XF86Switch_VT_8 -keycode 75 = F9 F9 F9 F9 F9 F9 XF86Switch_VT_9 F9 F9 XF86Switch_VT_9 -keycode 76 = F10 F10 F10 F10 F10 F10 XF86Switch_VT_10 F10 F10 XF86Switch_VT_10 +keycode 67 = F1 F1 F1 F1 F1 F1 XF86Switch_VT_1 +keycode 68 = F2 F2 F2 F2 F2 F2 XF86Switch_VT_2 +keycode 69 = F3 F3 F3 F3 F3 F3 XF86Switch_VT_3 +keycode 70 = F4 F4 F4 F4 F4 F4 XF86Switch_VT_4 +keycode 71 = F5 F5 F5 F5 F5 F5 XF86Switch_VT_5 +keycode 72 = F6 F6 F6 F6 F6 F6 XF86Switch_VT_6 +keycode 73 = F7 F7 F7 F7 F7 F7 XF86Switch_VT_7 +keycode 74 = F8 F8 F8 F8 F8 F8 XF86Switch_VT_8 +keycode 75 = F9 F9 F9 F9 F9 F9 XF86Switch_VT_9 +keycode 76 = F10 F10 F10 F10 F10 F10 XF86Switch_VT_10 keycode 77 = Num_Lock NoSymbol Num_Lock keycode 78 = Scroll_Lock NoSymbol Scroll_Lock keycode 79 = KP_Home KP_7 KP_Home KP_7 -keycode 80 = KP_Up KP_8 KP_Up KP_8 +keycode 80 = KP_Up KP_8 uparrow uparrow keycode 81 = KP_Prior KP_9 KP_Prior KP_9 -keycode 82 = KP_Subtract KP_Subtract KP_Subtract KP_Subtract KP_Subtract KP_Subtract XF86Prev_VMode KP_Subtract KP_Subtract XF86Prev_VMode -keycode 83 = KP_Left KP_4 KP_Left KP_4 +keycode 82 = KP_Subtract KP_Subtract KP_Subtract KP_Subtract KP_Subtract KP_Subtract XF86Prev_VMode +keycode 83 = KP_Left KP_4 leftarrow leftarrow keycode 84 = KP_Begin KP_5 KP_Begin KP_5 -keycode 85 = KP_Right KP_6 KP_Right KP_6 -keycode 86 = KP_Add KP_Add KP_Add KP_Add KP_Add KP_Add XF86Next_VMode KP_Add KP_Add XF86Next_VMode +keycode 85 = KP_Right KP_6 rightarrow rightarrow +keycode 86 = KP_Add KP_Add KP_Add KP_Add KP_Add KP_Add XF86Next_VMode keycode 87 = KP_End KP_1 KP_End KP_1 -keycode 88 = KP_Down KP_2 KP_Down KP_2 +keycode 88 = KP_Down KP_2 downarrow downarrow keycode 89 = KP_Next KP_3 KP_Next KP_3 keycode 90 = KP_Insert KP_0 KP_Insert KP_0 -keycode 91 = KP_Delete KP_Separator KP_Delete KP_Separator +keycode 91 = KP_Delete KP_Decimal KP_Delete KP_Decimal keycode 92 = ISO_Level3_Shift NoSymbol ISO_Level3_Shift keycode 93 = -keycode 94 = asciicircum degree asciitilde notsign U2033 -keycode 95 = F11 F11 F11 F11 F11 F11 XF86Switch_VT_11 F11 F11 XF86Switch_VT_11 -keycode 96 = F12 F12 F12 F12 F12 F12 XF86Switch_VT_12 F12 F12 XF86Switch_VT_12 +keycode 94 = less greater less greater bar brokenbar bar +keycode 95 = F11 F11 F11 F11 F11 F11 XF86Switch_VT_11 +keycode 96 = F12 F12 F12 F12 F12 F12 XF86Switch_VT_12 keycode 97 = keycode 98 = Katakana NoSymbol Katakana keycode 99 = Hiragana NoSymbol Hiragana @@ -95,18 +95,18 @@ keycode 101 = Hiragana_Katakana NoSymbol Hiragana_Katakana keycode 102 = Muhenkan NoSymbol Muhenkan keycode 103 = keycode 104 = KP_Enter NoSymbol KP_Enter -keycode 105 = Control_R NoSymbol Control_R -keycode 106 = KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide XF86Ungrab KP_Divide KP_Divide XF86Ungrab +keycode 105 = Multi_key NoSymbol Multi_key +keycode 106 = KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide XF86Ungrab keycode 107 = Print Sys_Req Print Sys_Req -keycode 108 = ISO_Level3_Shift NoSymbol ISO_Level3_Shift +keycode 108 = Alt_R Meta_R Alt_R Meta_R keycode 109 = Linefeed NoSymbol Linefeed keycode 110 = Home NoSymbol Home -keycode 111 = Up NoSymbol Up +keycode 111 = Up NoSymbol uparrow uparrow keycode 112 = Prior NoSymbol Prior -keycode 113 = Left NoSymbol Left -keycode 114 = Right NoSymbol Right +keycode 113 = Left NoSymbol leftarrow leftarrow +keycode 114 = Right NoSymbol rightarrow rightarrow keycode 115 = End NoSymbol End -keycode 116 = Down NoSymbol Down +keycode 116 = Down NoSymbol downarrow downarrow keycode 117 = Next NoSymbol Next keycode 118 = Insert NoSymbol Insert keycode 119 = Delete NoSymbol Delete @@ -124,7 +124,7 @@ keycode 130 = Hangul NoSymbol Hangul keycode 131 = Hangul_Hanja NoSymbol Hangul_Hanja keycode 132 = keycode 133 = Super_L NoSymbol Super_L -keycode 134 = Super_R NoSymbol Super_R +keycode 134 = Mode_switch NoSymbol Mode_switch keycode 135 = Menu NoSymbol Menu keycode 136 = Cancel NoSymbol Cancel keycode 137 = Redo NoSymbol Redo @@ -181,19 +181,19 @@ keycode 187 = parenleft NoSymbol parenleft keycode 188 = parenright NoSymbol parenright keycode 189 = XF86New NoSymbol XF86New keycode 190 = Redo NoSymbol Redo -keycode 191 = XF86Tools NoSymbol XF86Tools -keycode 192 = XF86Launch5 NoSymbol XF86Launch5 -keycode 193 = XF86Launch6 NoSymbol XF86Launch6 -keycode 194 = XF86Launch7 NoSymbol XF86Launch7 -keycode 195 = XF86Launch8 NoSymbol XF86Launch8 -keycode 196 = XF86Launch9 NoSymbol XF86Launch9 +keycode 191 = XF86Launch1 NoSymbol XF86Launch1 +keycode 192 = XF86Launch2 NoSymbol XF86Launch2 +keycode 193 = XF86Launch3 NoSymbol XF86Launch3 +keycode 194 = XF86Launch4 NoSymbol XF86Launch4 +keycode 195 = +keycode 196 = keycode 197 = keycode 198 = XF86AudioMicMute NoSymbol XF86AudioMicMute keycode 199 = XF86TouchpadToggle NoSymbol XF86TouchpadToggle keycode 200 = XF86TouchpadOn NoSymbol XF86TouchpadOn keycode 201 = XF86TouchpadOff NoSymbol XF86TouchpadOff keycode 202 = -keycode 203 = Mode_switch NoSymbol Mode_switch +keycode 203 = ISO_Level5_Shift NoSymbol ISO_Level5_Shift keycode 204 = NoSymbol Alt_L NoSymbol Alt_L keycode 205 = NoSymbol Meta_L NoSymbol Meta_L keycode 206 = NoSymbol Super_L NoSymbol Super_L @@ -238,7 +238,7 @@ keycode 244 = XF86Battery NoSymbol XF86Battery keycode 245 = XF86Bluetooth NoSymbol XF86Bluetooth keycode 246 = XF86WLAN NoSymbol XF86WLAN keycode 247 = XF86UWB NoSymbol XF86UWB -keycode 248 = +keycode 248 = XF86LaunchB NoSymbol XF86LaunchB keycode 249 = XF86Next_VMode NoSymbol XF86Next_VMode keycode 250 = XF86Prev_VMode NoSymbol XF86Prev_VMode keycode 251 = XF86MonBrightnessCycle NoSymbol XF86MonBrightnessCycle diff --git a/xorg/.Xresources b/xorg/.Xresources index 62afedc..2ed927f 100644 --- a/xorg/.Xresources +++ b/xorg/.Xresources @@ -1,3 +1,70 @@ +#include ".cache/wal/colors.Xresources" + +#define font "JetBrainsMono Nerd Font:size=19:pixelsize=24:antialias=true:autohint=true" + +! Terminal colors +*.color0: c00 +*color0: c00 +*.color1: c01 +*color1: c01 +*.color2: c02 +*color2: c02 +*.color3: c03 +*color3: c03 +*.color4: c04 +*color4: c04 +*.color5: c05 +*color5: c05 +*.color6: c06 +*color6: c06 +*.color7: c07 +*color7: c07 +*.color8: c08 +*color8: c08 +*.color9: c09 +*color9: c09 +*.color10: c10 +*color10: c10 +*.color11: c11 +*color11: c11 +*.color12: c12 +*color12: c12 +*.color13: c13 +*color13: c13 +*.color14: c14 +*color14: c14 +*.color15: c15 +*color15: c15 + +! Black color that will not be affected by bold highlighting +*.color66: c00 +*color66: c00 + +*.background: cbg +*background: cbg +*.foreground: cfg +*foreground: cfg +*.primary: cps +*primary: cps +*.accent: cas +*accent: cas + Xft.dpi: 220 -Sxiv.font: JetBrains Mono:pixelsize=24 +Xcursor.theme: capitaine-cursors-light + +dwm.normbordercolor: c08 +dwm.normbgcolor: cbg +dwm.normfgcolor: cfg +dwm.selbordercolor: cps +dwm.selbgcolor: cps +dwm.selfgcolor: cbg + +Nsxiv.bar.font: font +Nsxiv.bar.background: cps +Nsxiv.bar.foreground: cbg +Nsxiv.mark.foreground: cps +Nsxiv.window.background: cbg +Nsxiv.window.foreground: cps + +xterm*font: *-fixed-*-*-*-28-* diff --git a/xorg/.config/env b/xorg/.config/env index a995e51..bff8a3a 100644 --- a/xorg/.config/env +++ b/xorg/.config/env @@ -1,26 +1,61 @@ #!/bin/bash +export XDG_CONFIG_HOME="$HOME/.config/" + ### SCRIPTS -export PATH="$(find -L "$HOME/.local/bin/" -name '.*' -prune -o -type d -printf ':%p'):$PATH:$HOME/software/bin/" +export PATH="$(find -L "$HOME/.local/bin/" -name '.*' -prune -o -type d -printf ':%p'):/opt/:$PATH" +export PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin" ### DEFAULTS export TERM="xterm" export EDITOR="nvim" export BROWSER="qutebrowser" export TERMINAL="st" -export EMAIL="thunderbird" +export EMAIL="neomutt" + +export PAGER="leser" +export MANPAGER="leser" +export MANROFFOPT="-P -c" export GIT_SSH_COMMAND="ssh" +export GNUPGHOME="$HOME/keys/gpg" +export PASSWORD_STORE_DIR="$HOME/keys/pass" -### FLUTTER +### SPITFIRE +export WINEPREFIX="$HOME/music/spitfire/spitfire/" +export WINELOADER="$HOME/.local/share/bottles/runners/soda-7.0-9/bin/wine" -export PATH="$PATH:$HOME/software/flutter/bin:/opt/android-sdk/tools/bin/" +### FLUTTER +export PATH="$HOME/software/flutter/bin:/opt/android-sdk/tools/bin/:$PATH" +export FLUTTER_ROOT="$HOME/software/flutter/bin/flutter" export CHROME_EXECUTABLE="$(which brave)" +export CHROME_PATH="$CHROME_EXECUTABLE" + +export JAVA_HOME="/usr/lib/jvm/java-20-openjdk/" +export ANDROID_HOME="sdkmanager" +export ANDROID_HOME="/opt/android-sdk" +export ANDROID_SDK_ROOT="/opt/android-sdk" +export REPO_OS_OVERRIDE="linux" + +export AWT_TOOLKIT="MToolkit" +export _JAVA_AWT_WM_NONREPARENTING=1 + +# -- from github +# export PATH="$PATH:$HOME/git/applications/flutter/bin:$HOME/.sdks/android/android-sdk/platform-tools:$HOME/.sdks/android/android-sdk/tools:$HOME/.sdks/android/android-sdk/tools/bin" + +# export JAVA_HOME="/usr/lib/jvm/java-8-openjdk" + +### JUPYTER +export JUPYTERLAB_DIR="$HOME/.local/share/jupyter/lab" +export JUPYTER_CONFIG_DIR="$HOME/.config/jupyter/" -export JAVA_HOME="/usr/lib/jvm/java-8-openjdk/" -# export ANDROID_HOME="sdkmanager" +### INPUT +export GTK_IM_MODULE=fcitx +export QT_IM_MODULE=fcitx +export XMODIFIERS=@im=fcitx -### UI SCALE +### GUI THINGS +export QT_QPA_PLATFORMTHEME="qt5ct" export GDK_DPI_SCALE="1" export GDK_SCALE="1" diff --git a/xorg/.config/mimeapps.list b/xorg/.config/mimeapps.list index 8abb510..ec9ae23 100644 --- a/xorg/.config/mimeapps.list +++ b/xorg/.config/mimeapps.list @@ -1,16 +1,21 @@ [Added Associations] -image/*=sxiv.desktop;org.qutebrowser.qutebrowser.desktop; -x-scheme-handler/mailto=userapp-Thunderbird-CLI8N1.desktop; -x-scheme-handler/mid=userapp-Thunderbird-CLI8N1.desktop; -application/pdf=org.pwmt.zathura-pdf-mupdf.desktop; +video/*=mpv.desktop +audio/*=mpv.desktop +image/*=nsxiv.desktop +model/*=org.freecadweb.FreeCAD.desktop +model/3mf=cura.desktop;org.freecadweb.FreeCAD.desktop [Default Applications] -image/png=sxiv.desktop -image/jpeg=sxiv.desktop +video/mkv=vlc.desktop +video/mp4=mpv.desktop +audio/mp3=mpv.desktop +image/gif=nsxiv.desktop +image/png=nsxiv.desktop +image/jpg=nsxiv.desktop +image/jpeg=nsxiv.desktop inode/directory=thunar.desktop application/pdf=org.pwmt.zathura.desktop -x-scheme-handler/mailto=userapp-Thunderbird-CLI8N1.desktop -message/rfc822=userapp-Thunderbird-CLI8N1.desktop -x-scheme-handler/mid=userapp-Thunderbird-CLI8N1.desktop x-scheme-handler/http=org.qutebrowser.qutebrowser.desktop x-scheme-handler/https=org.qutebrowser.qutebrowser.desktop +x-scheme-handler/figma=figma-linux.desktop + diff --git a/xorg/.config/wallpaper b/xorg/.config/wallpaper index 92c5f6c..9a4953e 100644 Binary files a/xorg/.config/wallpaper and b/xorg/.config/wallpaper differ diff --git a/xorg/.xinitrc b/xorg/.xinitrc index b6a1168..8bbd85b 100755 --- a/xorg/.xinitrc +++ b/xorg/.xinitrc @@ -1,24 +1,42 @@ #!/bin/bash setxkbmap de -feh --bg-fill $HOME/.config/wallpaper +. "$HOME/.screenlayout/home.sh" +feh --bg-fill "$HOME/.config/wallpaper" -# This was needed on my system with the non-lts kernel (some keys were mismatched) -# [[ -f ~/.Xmodmap ]] && xmodmap $HOME/.Xmodmap -[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources -[[ -f $HOME/.cache/wal/colors.Xresources ]] && xrdb -merge -I$HOME $HOME/.cache/wal/colors.Xresources +env_file="$HOME/.config/env" +modmap_file="$HOME/.Xmodmap" +resources_file="$HOME/.Xresources" -[[ -f $HOME/.config/env ]] && source $HOME/.config/env +[[ -f "$env_file" ]] && . "$env_file" +[[ -f "$modmap_file" ]] && xmodmap "$modmap_file" +[[ -f "$resources_file" ]] && xrdb -merge -I"$HOME" "$resources_file" + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +mkdir -p "$HOME"/.local/share/keyrings +eval $(/usr/bin/gnome-keyring-daemon --start) && export SSH_AUTH_SOCK updates check & -sxhkd -c "$HOME/.config/sxhkd/mediarc" & unclutter -idle 1 & brightness load & +clipmenud & +fcitx5 -d & slstatus & dunst & +picom & + +[ ! -s "$HOME/.config/mpd/pid" ] && mpd & -exec dwm +exec dwm # 2> "$HOME/dwm.log" +# exec leftwm +# exec awesome wal -R -- cgit v1.2.3