Fixing merge with i3status

bin/.bin/changepaper

@@ -16,8 +16,8 @@ else
 fi
 
 # Choices: astrobin,natgeo,nasa,unsplash,bing
-BASEDIR="$HOME/var/media/backgrounds/$SOURCE/"
+BASEDIR="$HOME/var/media/backgrounds/$SOURCE"
-SEARX_BASEDIR="$HOME/var/media/backgrounds/bing/"
+SEARX_BASEDIR="$HOME/var/media/backgrounds/bing"
 
 # Get daily NatGeo POTD
 python3 ~/.bin/get_natgeo_potd.py

emacs/.config/doom/init.el

@@ -91,7 +91,7 @@
        (eval +overlay)     ; run code, run (also, repls)
        gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
-       ;lsp
+       ;;lsp
        ;;macos             ; MacOS-specific commands
        magit             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
@@ -110,7 +110,7 @@
        ;;clojure           ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
-       (crystal +lsp)           ; ruby at the speed of c
+       crystal             ; ruby at the speed of c
        ;;csharp            ; unity, .NET, and mono shenanigans
        data              ; config/data formats
        ;;(dart +flutter)   ; paint ui and not much else
@@ -123,22 +123,22 @@
        ;;fsharp           ; ML stands for Microsoft's Language
        ;;fstar             ; (dependent) types and (monadic) effects and Z3
        ;;gdscript          ; the language you waited for
-       (go +lsp)         ; the hipster dialect
+       go                  ; the hipster dialect
        ;;(haskell +dante)  ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ;
        ;;json              ; At least it ain't XML
        ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
-       (javascript +lsp)   ; all(hope(abandon(ye(who(enter(here))))))
+       javascript          ; all(hope(abandon(ye(who(enter(here))))))
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        ;;latex             ; writing papers in Emacs has never been so fun
        ;;lean
        ;;factor
-       ledger            ; an accounting system in Emacs
+       ledger              ; an accounting system in Emacs
        ;;lua               ; one-based indices? one-based indices
-       markdown          ; writing docs for people to ignore
+       markdown            ; writing docs for people to ignore
-       (nim +lsp)               ; python + lisp at the speed of c
+       nim                 ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        (org                ; organize your plain life in plain text
@@ -157,9 +157,9 @@
        python              ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
-       rest              ; Emacs as a REST client
+       rest                ; Emacs as a REST client
-       rst               ; ReST in peace
+       rst                 ; ReST in peace
-       (ruby +lsp +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       (ruby +rails)       ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
        ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps

i3/.config/i3status/i3status.conf

@@ -14,6 +14,8 @@ order += "cpu_temperature 0"
 order += "load"
 order += "wireless wlan0"
 order += "ethernet em0"
+order += "wireless wlan0"
+order += "ethernet ue0"
 order += "tztime local"
 
 volume master {

screenlayout/.screenlayout/keyboard-and-bg.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
-~/.bin/changepaper bing
+pkill compton
 setxkbmap -model pc105 -layout us,ru -option grp:ctrls_toggle -option caps:escape -option compose:ralt
+i3 restart
+changepaper

screenlayout/.screenlayout/titan-one.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
+pkill compton
 xrandr --output HDMI-2 --off --output HDMI-1 --off --output DP-1 --off --output eDP-1 --primary --mode 1920x1080 --pos 0x0 --rotate normal --output DP-2 --off
-changepaper
+keyboard-and-bg.sh

screenlayout/.screenlayout/titan-three.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
-xrandr --output eDP-1 --primary --mode 1920x1080 --pos 1080x1440 --rotate normal --output DP-1 --mode 1920x1080 --pos 0x481 --rotate left --output HDMI-1 --off --output DP-2 --mode 2560x1440 --pos 1080x0 --rotate normal --output HDMI-2 --off
+pkill compton
-kbg
+xrandr --output eDP-1 --primary --mode 1920x1080 --pos 1080x1440 --rotate normal --output DP-1 --off --output HDMI-1 --mode 2560x1440 --pos 1080x0 --rotate normal --output DP-2 --mode 1920x1080 --pos 0x1440 --rotate left --output HDMI-2 --off
+keyboard-and-bg.sh