commit fa803fdc3fdc3dd685d0483b89676df3c1ccfbfe
parent 3b6893015c1bc4664f874e9867b5b5f4f6e87a9b
Author: jacob@thinkpad <jacobouno@protonmail.com>
Date: Tue, 10 Mar 2020 23:27:03 -0700
Merge branch 'master' of https://github.com/jacobs-github/.dotfiles
Diffstat:
6 files changed, 163 insertions(+), 108 deletions(-)
diff --git a/configs/.config/config/configs b/configs/.config/config/configs
@@ -1,36 +1,38 @@
-/.config/sxhkd/sxhkdrc
-/.config/dunst/dunstrc
-/.xmonad/xmonad.hs
-/.xmobarrc
-/.xmobar/
-/.config/sxiv/exec/key-handler
-/.config/pynotify
-/.config/picom.conf
-/.Xresources
-/.profile
-/.config/bookmarks/
-/.config/ncmpcpp/
-/.config/mpd/mpd.conf
-/.tmux.conf
-/.zshrc
-/.vimrc
-/.config/backup/
-/.config/config/configs
-/.config/conky/
-/.local/share/qutebrowser/userscripts/
-/bin/lemon
-/.config/bspwm/bspwmrc
-/.config/bspwm/bspc-utils/
-/.config/nvim/init.vim
-/.aliases
-/.aliases-private
-/.config/twist-manager/
-/.config/ranger/rc.conf
-/src/suckless/surf/surf/
-/src/suckless/st/st/
-/src/suckless/slock/slock/
-/src/suckless/dmenu/dmenu/
+~/.config/sxhkd/sxhkdrc
+~/.config/dunst/dunstrc
+~/.xmonad/xmonad.hs
+~/.xmobarrc
+~/.xmobar/
+~/.config/sxiv/exec/key-handler
+~/.config/pynotify
+~/.config/picom.conf
+~/.Xresources
+~/.profile
+~/.config/bookmarks/
+~/.config/ncmpcpp/
+~/.config/mpd/mpd.conf
+~/.tmux.conf
+~/.zshrc
+~/.vimrc
+~/.config/backup/
+~/.config/config/configs
+~/.config/conky/
+~/.local/share/qutebrowser/userscripts/
+~/bin/lemon
+~/.config/bspwm/bspwmrc
+~/.config/bspwm/bspc-utils/
+~/.config/nvim/init.vim
+~/.aliases
+~/.aliases-private
+~/.config/twist-manager/
+~/.config/ranger/rc.conf
+~/src/suckless/surf/surf/
+~/src/suckless/st/st/
+~/src/suckless/slock/slock/
+~/src/suckless/dmenu/dmenu/
/etc/ssh/sshd_config
/etc/ssh/ssh_config
-/.config/systemd/user/
-/.config/jcon/locations
+~/.config/systemd/user/
+~/.config/jcon/locations
+~/.newsboat/config
+~/.newsboat/urls
diff --git a/newsboat/.newsboat/config b/newsboat/.newsboat/config
@@ -0,0 +1,38 @@
+# newsboat config
+# man newsboat
+# https://newsboat.org/releases/2.18/docs/newsboat.html
+
+# vim keys
+bind-key h quit
+bind-key j down
+bind-key k up
+bind-key l open
+bind-key g home
+bind-key G end
+bind-key ^U pageup
+bind-key ^D pagedown
+bind-key F1 help
+# :q to quit program
+
+# macros (not working for me)
+macro U set browser "w3m"; open-in-browser
+macro u set browser "surf"; open-in-browser
+
+# unbind
+bind-key s save
+bind-key S save-all
+
+# settings
+auto-reload yes
+datetime-format %d/%m/%Y
+#browser surf
+browser w3m
+
+# colors
+color listnormal white black
+color listfocus black white
+color listnormal_unread white black
+color listfocus_unread black white bold
+color info white black invis
+color background white black invis
+color article white black
diff --git a/picom/.config/picom.conf b/picom/.config/picom.conf
@@ -1,7 +1,8 @@
# vim filetype=cfg
opacity-rule = [
- "92:name = 'st' && !focused",
- "98:name = 'st' && focused",
+ "84:class_g = 'St' && !focused",
+ "92:class_g = 'St' && focused",
+ "94:class_g = 'ncmpcpp'",
];
blur-background-exclude = [
diff --git a/profile/.profile b/profile/.profile
@@ -1,13 +1,13 @@
# variables
export PATH=$HOME/.local/bin/:$HOME/bin/:$HOME/.config/bspwm/bspc-utils/:$PATH
export XDG_CONFIG_HOME="$HOME/.config"
-export SHELL='mksh'
-export EDITOR='nvim'
-export TERMINAL='st'
-export BROWSER='qutebrowser'
-export COMPOSITOR='xcompmgr'
-export PAGER='less'
-export LOCKER='slock'
+export SHELL="mksh"
+export EDITOR="nvim"
+export TERMINAL="st"
+export BROWSER="qutebrowser"
+export COMPOSITOR="picom"
+export PAGER="less"
+export LOCKER="slock"
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
export HISTFILE="$HOME/.hist-$0"
@@ -18,14 +18,14 @@ export NOTES="$HOME/own/text/notes"
export STICKY="$HOME/own/text/sticky"
-# i'll clean it up later.
-if [ -d '/sys/class/power_supply/BAT0' ]; then
- export PLATFORM='laptop'
+# i"ll clean it up later.
+if [ -d "/sys/class/power_supply/BAT0" ]; then
+ export PLATFORM="laptop"
else
- export PLATFORM='desktop'
+ export PLATFORM="desktop"
fi
-if [ "$( tty | cut -d '/' -f 3 )" = 'pts' ]; then
+if [ "$( tty | cut -d "/" -f 3 )" = "pts" ]; then
export Xorg=1
else
export Xorg=0
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
@@ -1,76 +1,87 @@
-# [reload sxhkd config]
-super + Escape
- pkill -USR1 -x sxhkd && notify-send 'sxhkd restarted' -t 850
-
-### [launch software]
-#launch a terminal (and remove dumbass qt bugged folder)
+### launch software
+# terminal
super + {alt,_} + Return
"$TERMINAL" {_,-e tmux}
-# launch browser
-super + alt + q
+# BROWSER
+super + alt + f
"$BROWSER"
-# launch surf browser
+# qutebrowser
+super + alt + q
+ qutebrowser
+
+# surf browser
super + alt + s
tabbed surf -e
-# launch htop
+# brave browser
+super + alt + b
+ brave
+
+# htop
super + alt + e
"$TERMINAL" -e htop
-# launch ncmpcpp
+# ncmpcpp
super + alt + m
killall ncmpcpp; "$TERMINAL" -c ncmpcpp -e ncmpcpp
-# launch dmenu
+# dmenu
super + alt + d
- dmenu_run -fn 'gohufont:size=14' -bw 2 -c -l 8
+ dmenu_run -fn 'gohufont:size=14'
-# dmenu bookmarks
+# bookmarks
shift + super + {m,alt + m, n}
dmenu-bookmarks {--open,--open-catagories,--edit}
-# launch webcam
+# webcam
super + alt + w
mpv av://v4l2:/dev/video0 '--geometry=+100%+100%'
-# launch ranger
+# ranger
super + alt + r
"$TERMINAL" -e ranger
-# launch lbry
+# newsboat
+super + alt + n
+ "$TERMINAL" -e newsboat || notify-send 'newsboat already running or an error occured'
+
+# lbry
super + alt + l
lbry
-### [toggle programs]
-# toggle picom (compositing)
+
+
+### toggle programs
+# picom
F9
- toggle 'picom'
+ toggle "$COMPOSITOR"
-# launch or kill lemonbar script
+# lemonbar script
F10
lemon "$PLATFORM"
-# toggle mpd
+# mpd
F11
toggle 'mpd'
-### [basic utilities]
+
+### basic utilities
# brightness controls
XF86MonBrightness{Up,Down}
xbacklight-script {inc,dec}
-# more brightness controls
+# brightness controls
{Home,End}
xbacklight-script {inc,dec}
-# suspend screen (Thinkvantage)
+# suspend screen
F4
xset dpms force suspend
-# lock & suspend screen, then suspend (Thinkvantage)
+# lock & then suspend
super + F4
slock & sleep 1.2; systemctl suspend
@@ -84,7 +95,7 @@ Menu
# look at screenshots
super + alt + Print
- sxiv -t ~/media/screenshots/
+ sxiv -t "$SCREENSHOTS"
# take a screenshot (full, region, window)
{_,shift,alt} Print
@@ -103,7 +114,8 @@ XF86Audio{_,Mic}Mute
volume {mute,mute-mic}
-### [node management (bspwm)]
+
+### node management (bspwm)
# set the node flags
super + ctrl + {z,x,c,p}
bspc node -g {marked,locked,sticky,private}
@@ -112,23 +124,22 @@ super + ctrl + {z,x,c,p}
super + {p,b,comma,period}
bspc node -f @{parent,brother,first,second}
-# make Miniplayer
+# make miniplayer
shift + super + p
- bspc-set-geometry $( p-res 48x48 | sed 's/x/ /g' ) && bspc-snap --up && bspc-snap --right
-
+ bspc-set-geometry $( p-res 20x20 | sed 's/x/ /g' ) && bspc-snap --up && bspc-snap --right
# move floating windows
-super + ctrl + alt + {h,l,k,j}
+super + {Left,Right,Up,Down}
bspc node focused.floating --move {-50 0,50 0,0 -50,0 50}
-# increment gaps
-super + {i,o}
- bspc-inc window_gap {-,+} 15
-
# snap floating windows to edges
-super + ctrl + alt + shift + {h,l,k,j}
+super + shift + {Left,Right,Up,Down}
bspc-snap {--left,--right,--up,--down}
+# increment gaps
+super + {i,o} + {_,shift}
+ bspc-inc window_gap {-,+} {5,25}
+
# resize node by mouse selection
super + m
bspc-select-size
@@ -138,15 +149,24 @@ super + {equal,minus}
bspc node @/ {--equalize,--balance}
# rotate node tree
-{_,shift} + F1
+super {_,shift} + r
bspc node @/ --rotate {90,-90}
# set the window state
-super + {t,shift + t,w,@f}
+super + {t,shift + t,w,f}
bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
+# shrink or expand nodes
+super + ctrl + {i,o}
+ bspc-inc-edges {--enlarge,--shrink}
-### [workspace managment]
+# resize nodes
+super + ctrl + {h,j,k,l}
+ bspc-hjkl {--left,--up,--down,--right}
+
+
+
+### workspace managment
# switch desktops with window
alt + shift + {q,w,e,r,a,s,d,f,t,g}
bspc node --to-desktop {^1,^2,^3,^4,^5,^6,^7,^8,^9,^10} --follow
@@ -156,8 +176,9 @@ alt + {q,w,e,r,a,s,d,f,t,g}
bspc desktop -f {^1,^2,^3,^4,^5,^6,^7,^8,^9,^10}
-### [desktop navigation]
-# focus on window by direction
+
+### desktop navigation
+# focus on or move node by direction
super + {_,shift + }{h,j,k,l}
bspc node -{f,s} {west,south,north,east}
@@ -165,8 +186,13 @@ super + {_,shift + }{h,j,k,l}
super + shift + {f,d}
bspc node {next,prev}.local -f
+# cycle layouts
+super + Tab
+ bspc desktop -l next
+
+
-### [proccess management]
+### etc
# quit / restart bspwm
super + ctrl + {q,r}
bspc {quit,wm -r}
@@ -175,18 +201,6 @@ super + ctrl + {q,r}
super + {_,shift + }q
bspc node -{c,k}
-# cycle layouts
-super + Tab
- bspc desktop -l next
-
-# shrink or expand nodes
-super + ctrl + {equal,minus}
- bspc-inc-edges {--enlarge,--shrink}
-
-# resize nodes
-super + ctrl + {h,j,k,l}
- bspc-hjkl {--left,--up,--down,--right}
-
-### [monitors]
-#super + o
- #bspc monitor --focus next
+# reload sxhkd config
+super + Escape
+ pkill -USR1 -x sxhkd && notify-send 'sxhkd restarted' -t 850
diff --git a/xresources/.Xresources b/xresources/.Xresources
@@ -20,8 +20,8 @@ st.color5:#ff4444
st.color6:#00a1a1
st.color7:#cccccc
-dmenu.selbackground:#00900a
-dmenu.selforeground:#ffffff
+dmenu.selbackground:#ff4530
+dmenu.selforeground:#000
dmenu.background:#000
dmenu.foreground:#fff