diff --git a/xconfig.org b/xconfig.org index ecbf01d..0b4c16c 100644 --- a/xconfig.org +++ b/xconfig.org @@ -10,57 +10,40 @@ ** Colors #+begin_src conf -#define base00 #32302f -#define base01 #3c3836 -#define base02 #504945 -#define base03 #665c54 -#define base04 #bdae93 -#define base05 #d5c4a1 -#define base06 #ebdbb2 -#define base07 #fbf1c7 -#define base08 #fb4934 -#define base09 #fe8019 -#define base0A #fabd2f -#define base0B #b8bb26 -#define base0C #8ec07c -#define base0D #83a598 -#define base0E #d3869b -#define base0F #d65d0e - -,*foreground: base05 +,*foreground: #d5c4a1 #ifdef background_opacity -,*background: [background_opacity]base00 +,*background: [background_opacity]#32302f #else -,*background: base00 +,*background: #32302f #endif -,*cursorColor: base05 +,*cursorColor: #d5c4a1 -,*color0: base00 -,*color1: base08 -,*color2: base0B -,*color3: base0A -,*color4: base0D -,*color5: base0E -,*color6: base0C -,*color7: base05 +,*color0: #32302f +,*color1: #fb4934 +,*color2: #b8bb26 +,*color3: #fabd2f +,*color4: #83a598 +,*color5: #d3869b +,*color6: #8ec07c +,*color7: #d5c4a1 -,*color8: base03 -,*color9: base08 -,*color10: base0B -,*color11: base0A -,*color12: base0D -,*color13: base0E -,*color14: base0C -,*color15: base07 +,*color8: #665c54 +,*color9: #fb4934 +,*color10: #b8bb26 +,*color11: #fabd2f +,*color12: #83a598 +,*color13: #d3869b +,*color14: #8ec07c +,*color15: #fbf1c7 ! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), ! use 'shell' template to set these if necessary -,*color16: base09 -,*color17: base0F -,*color18: base01 -,*color19: base02 -,*color20: base04 -,*color21: base06 +,*color16: #fe8019 +,*color17: #d65d0e +,*color18: #3c3836 +,*color19: #504945 +,*color20: #bdae93 +,*color21: #ebdbb2 #+end_src ** Fonts @@ -80,264 +63,6 @@ Xcursor.theme: Breeze Xcursor.size: 0 #+END_SRC -* =~/.Xmodmap= -:PROPERTIES: -:header-args: :tangle ~/.Xmodmap -:header-args+: :comments no :mkdirp yes -:CUSTOM_ID: xmodmap -:END: - -#+begin_src conf -keycode 8 = -keycode 9 = Escape NoSymbol Escape -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 = equal plus equal plus -keycode 22 = BackSpace BackSpace BackSpace BackSpace -keycode 23 = Tab ISO_Left_Tab Tab ISO_Left_Tab -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 u U -keycode 31 = i I i I -keycode 32 = o O o O -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 -keycode 39 = s S s S -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 = backslash bar backslash bar -keycode 52 = z Z z Z -keycode 53 = x X x X -keycode 54 = c C c C -keycode 55 = v V v V -keycode 56 = b B b B -keycode 57 = n N n N -keycode 58 = m M m M -keycode 59 = comma less comma less -keycode 60 = period greater period greater -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 -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 -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 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 -keycode 83 = KP_Left KP_4 KP_Left KP_4 -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 -keycode 87 = KP_End KP_1 KP_End KP_1 -keycode 88 = KP_Down KP_2 KP_Down KP_2 -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_Decimal KP_Delete KP_Decimal -keycode 92 = ISO_Level3_Shift NoSymbol ISO_Level3_Shift -keycode 93 = -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 -keycode 100 = Henkan_Mode NoSymbol Henkan_Mode -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 -keycode 107 = Print Sys_Req Print Sys_Req -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 112 = Prior NoSymbol Prior -keycode 113 = Left NoSymbol Left -keycode 114 = Right NoSymbol Right -keycode 115 = End NoSymbol End -keycode 116 = Down NoSymbol Down -keycode 117 = Next NoSymbol Next -keycode 118 = Insert NoSymbol Insert -keycode 119 = Delete NoSymbol Delete -keycode 120 = -keycode 121 = XF86AudioMute NoSymbol XF86AudioMute -keycode 122 = XF86AudioLowerVolume NoSymbol XF86AudioLowerVolume -keycode 123 = XF86AudioRaiseVolume NoSymbol XF86AudioRaiseVolume -keycode 124 = XF86PowerOff NoSymbol XF86PowerOff -keycode 125 = KP_Equal NoSymbol KP_Equal -keycode 126 = plusminus NoSymbol plusminus -keycode 127 = Pause Break Pause Break -keycode 128 = XF86LaunchA NoSymbol XF86LaunchA -keycode 129 = KP_Decimal KP_Decimal KP_Decimal KP_Decimal -keycode 130 = Hangul NoSymbol Hangul -keycode 131 = Hangul_Hanja NoSymbol Hangul_Hanja -keycode 132 = -keycode 133 = -keycode 134 = Super_R NoSymbol Super_R -keycode 135 = Menu NoSymbol Menu -keycode 136 = Cancel NoSymbol Cancel -keycode 137 = Redo NoSymbol Redo -keycode 138 = SunProps NoSymbol SunProps -keycode 139 = Undo NoSymbol Undo -keycode 140 = SunFront NoSymbol SunFront -keycode 141 = XF86Copy NoSymbol XF86Copy -keycode 142 = XF86Open NoSymbol XF86Open -keycode 143 = XF86Paste NoSymbol XF86Paste -keycode 144 = Find NoSymbol Find -keycode 145 = XF86Cut NoSymbol XF86Cut -keycode 146 = Help NoSymbol Help -keycode 147 = xf86menukb nosymbol xf86menukb -keycode 148 = XF86Calculator NoSymbol XF86Calculator -keycode 149 = -keycode 150 = XF86Sleep NoSymbol XF86Sleep -keycode 151 = XF86WakeUp NoSymbol XF86WakeUp -keycode 152 = XF86Explorer NoSymbol XF86Explorer -keycode 153 = XF86Send NoSymbol XF86Send -keycode 154 = -keycode 155 = XF86Xfer NoSymbol XF86Xfer -keycode 156 = XF86Launch1 NoSymbol XF86Launch1 -keycode 157 = XF86Launch2 NoSymbol XF86Launch2 -keycode 158 = XF86WWW NoSymbol XF86WWW -keycode 159 = XF86DOS NoSymbol XF86DOS -keycode 160 = XF86ScreenSaver NoSymbol XF86ScreenSaver -keycode 161 = XF86RotateWindows NoSymbol XF86RotateWindows -keycode 162 = XF86TaskPane NoSymbol XF86TaskPane -keycode 163 = XF86Mail NoSymbol XF86Mail -keycode 164 = XF86Favorites NoSymbol XF86Favorites -keycode 165 = XF86MyComputer NoSymbol XF86MyComputer -keycode 166 = XF86Back NoSymbol XF86Back -keycode 167 = XF86Forward NoSymbol XF86Forward -keycode 168 = -keycode 169 = XF86Eject NoSymbol XF86Eject -keycode 170 = XF86Eject XF86Eject XF86Eject XF86Eject -keycode 171 = XF86AudioNext NoSymbol XF86AudioNext -keycode 172 = XF86AudioPlay XF86AudioPause XF86AudioPlay XF86AudioPause -keycode 173 = XF86AudioPrev NoSymbol XF86AudioPrev -keycode 174 = XF86AudioStop XF86Eject XF86AudioStop XF86Eject -keycode 175 = XF86AudioRecord NoSymbol XF86AudioRecord -keycode 176 = XF86AudioRewind NoSymbol XF86AudioRewind -keycode 177 = XF86Phone NoSymbol XF86Phone -keycode 178 = -keycode 179 = XF86Tools NoSymbol XF86Tools -keycode 180 = XF86HomePage NoSymbol XF86HomePage -keycode 181 = XF86Reload NoSymbol XF86Reload -keycode 182 = XF86Close NoSymbol XF86Close -keycode 183 = -keycode 184 = -keycode 185 = XF86ScrollUp NoSymbol XF86ScrollUp -keycode 186 = XF86ScrollDown NoSymbol XF86ScrollDown -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 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 204 = NoSymbol Alt_L NoSymbol Alt_L -keycode 205 = NoSymbol Meta_L NoSymbol Meta_L -keycode 206 = NoSymbol Super_L NoSymbol Super_L -keycode 207 = NoSymbol Hyper_L NoSymbol Hyper_L -keycode 208 = XF86AudioPlay NoSymbol XF86AudioPlay -keycode 209 = XF86AudioPause NoSymbol XF86AudioPause -keycode 210 = XF86Launch3 NoSymbol XF86Launch3 -keycode 211 = XF86Launch4 NoSymbol XF86Launch4 -keycode 212 = XF86LaunchB NoSymbol XF86LaunchB -keycode 213 = XF86Suspend NoSymbol XF86Suspend -keycode 214 = XF86Close NoSymbol XF86Close -keycode 215 = XF86AudioPlay NoSymbol XF86AudioPlay -keycode 216 = XF86AudioForward NoSymbol XF86AudioForward -keycode 217 = -keycode 218 = Print NoSymbol Print -keycode 219 = -keycode 220 = XF86WebCam NoSymbol XF86WebCam -keycode 221 = -keycode 222 = -keycode 223 = XF86Mail NoSymbol XF86Mail -keycode 224 = XF86Messenger NoSymbol XF86Messenger -keycode 225 = XF86Search NoSymbol XF86Search -keycode 226 = XF86Go NoSymbol XF86Go -keycode 227 = XF86Finance NoSymbol XF86Finance -keycode 228 = XF86Game NoSymbol XF86Game -keycode 229 = XF86Shop NoSymbol XF86Shop -keycode 230 = -keycode 231 = Cancel NoSymbol Cancel -keycode 232 = XF86MonBrightnessDown NoSymbol XF86MonBrightnessDown -keycode 233 = XF86MonBrightnessUp NoSymbol XF86MonBrightnessUp -keycode 234 = XF86AudioMedia NoSymbol XF86AudioMedia -keycode 235 = XF86Display NoSymbol XF86Display -keycode 236 = XF86KbdLightOnOff NoSymbol XF86KbdLightOnOff -keycode 237 = XF86KbdBrightnessDown NoSymbol XF86KbdBrightnessDown -keycode 238 = XF86KbdBrightnessUp NoSymbol XF86KbdBrightnessUp -keycode 239 = XF86Send NoSymbol XF86Send -keycode 240 = XF86Reply NoSymbol XF86Reply -keycode 241 = XF86MailForward NoSymbol XF86MailForward -keycode 242 = XF86Save NoSymbol XF86Save -keycode 243 = XF86Documents NoSymbol XF86Documents -keycode 244 = XF86Battery NoSymbol XF86Battery -keycode 245 = XF86Bluetooth NoSymbol XF86Bluetooth -keycode 246 = XF86WLAN NoSymbol XF86WLAN -keycode 247 = -keycode 248 = XF86Display NoSymbol XF86Display -keycode 249 = -keycode 250 = -keycode 251 = -keycode 252 = -keycode 253 = -keycode 254 = XF86WWAN NoSymbol XF86WWAN -keycode 255 = XF86RFKill NoSymbol XF86RFKill -#+end_src - * =~/.xinitrc= :PROPERTIES: :header-args: :tangle ~/.xinitrc @@ -352,12 +77,12 @@ dbus-update-activation-environment --systemd DISPLAY Fix for Matlab. #+begin_src bash -export _JAVA_AWT_WM_NONREPARENTING=1 +# export _JAVA_AWT_WM_NONREPARENTING=1 #+end_src Set =DISPLAY= for =dunst= when started with =systemd=. #+begin_src bash -systemctl --user import-environment DISPLAY +# systemctl --user import-environment DISPLAY #+end_src Merge in defaults and keymaps @@ -418,7 +143,7 @@ setxkbmap -layout us -variant intl -option caps:escape & Start programs related to display: #+begin_src bash # Screen options -xrandr --output eDP1 --mode 1920x1080 --dpi 192 & +xrandr --output eDP-1 --mode 1920x1200 --dpi 192 & # Set random wallpaper setbg ~/.local/data/wallpapers/ & @@ -428,7 +153,7 @@ pgrep -xu "$USER" unclutter >/dev/null || \ unclutter --timeout 5 & # Autolock screen after x minutes -xautolock -locker "~/.local/bin/lockscreen" -detectsleep -time 30 -notify 60 -notifier "dunstify --replace=31846 -u critical -t 10000 -- 'Locking Screen' '60 seconds'" & +xautolock -locker "~/.local/bin/lockscreen" -detectsleep -time 30 -notify 60 -notifier "notify-send -u critical -t 10000 -- 'Locking Screen' '60 seconds'" & # Redshift pgrep -xu "$USER" redshift >/dev/null || \ @@ -436,6 +161,9 @@ pgrep -xu "$USER" redshift >/dev/null || \ # Run Picom (compositor) picom --daemon & + +# Network Manager Applet +nm-applet & #+end_src Manually start =mopidy= as it seems to not start automatically: @@ -444,36 +172,6 @@ Manually start =mopidy= as it seems to not start automatically: mopidy --config ~/.config/mopidy/mopidy.conf >/dev/null 2>&1 & #+end_src -Configuration for the HUION Inspiroy Ink H320M graphical tablet ([[file:tablet.org][Tablet config]]): -#+begin_src bash -# Lock cursor in first display. Change HEAD number to use a different displace -#xsetwacom set "HUION Huion Tablet_H320M Pen stylus" MapToOutput "HEAD-0" - -# Pen Buttons -xsetwacom set "HUION Huion Tablet_H320M Pen stylus" button 1 1 # Left click -xsetwacom set "HUION Huion Tablet_H320M Pen stylus" button 2 2 # Right click -xsetwacom set "HUION Huion Tablet_H320M Pen stylus" button 3 3 # Middle click - -# Tablet Buttons - -# Top Buttons -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 1 key Ctrl T # Tools -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 2 key Ctrl Shift A # Hand Tool -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 3 key Ctrl Shift D # Default Tool - -# Round Buttons (Top, Bottom, Middle, Left, Right) -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 8 key Ctrl Shift + # Zoom -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 9 key Ctrl - # Unzoom -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 10 key Ctrl S # Save -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 11 key Ctrl Z # Undo -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 12 key Ctrl Shift Z # Redo - -# Bottom Buttons -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 13 key Ctrl Shift O # Select -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 14 key Ctrl # Ctrl (Color Picker, Zoom) -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 15 key Ctrl Q # Quit -#+end_src - Finally, run SXHKD for the key bindings: #+begin_src bash # Start sxhkd