+ Changed compton to picom

+ Update
+ Switch from urxvt to st
This commit is contained in:
ziro 2020-05-11 07:03:22 +07:00
parent 1162e4b512
commit 9cb5f7b078
9 changed files with 81 additions and 62 deletions

View file

@ -3,7 +3,7 @@
sxhkd & sxhkd &
xsetroot -cursor_name left_ptr & xsetroot -cursor_name left_ptr &
nitrogen --restore & nitrogen --restore &
compton & picom &
$HOME/.scripts/launch-conky.sh & $HOME/.scripts/launch-conky.sh &
$HOME/.config/polybar/launch.sh & $HOME/.config/polybar/launch.sh &
@ -18,7 +18,7 @@ bspc config focused_border_color "#60C0FF"
bspc config active_border_color "#60C0ff" bspc config active_border_color "#60C0ff"
#bspc config normal_border_color #bspc config normal_border_color
bspc config window_gap 8 bspc config window_gap 8
bspc config top_padding 30 bspc config top_padding 28
bspc config bottom_padding 0 bspc config bottom_padding 0
bspc config left_padding 0 bspc config left_padding 0
bspc config right_padding 0 bspc config right_padding 0
@ -40,6 +40,7 @@ bspc config pointer_action3 resize_corner
bspc rule -a Gimp desktop='^8' state=floating follow=on bspc rule -a Gimp desktop='^8' state=floating follow=on
bspc rule -a firefox desktop='^2' bspc rule -a firefox desktop='^2'
bspc rule -a obs desktop='^3' bspc rule -a obs desktop='^3'
bspc rule -a st-256color:cmus desktop='^4'
bspc rule -a URxvt:cmus desktop='^4' bspc rule -a URxvt:cmus desktop='^4'
bspc rule -a spotify desktop='^4' bspc rule -a spotify desktop='^4'
bspc rule -a Spotify desktop='^4' bspc rule -a Spotify desktop='^4'

View file

@ -51,13 +51,14 @@ alert = #e84118
volume-min = #a3be8c volume-min = #a3be8c
volume-med = #ebcb8b volume-med = #ebcb8b
volume-max = #bf616a volume-max = #bf616a
spotgreen = #44bd32
; ======================= ; =======================
[bar/bspwm] [bar/bspwm]
;monitor = ${env:MONITOR} ;monitor = ${env:MONITOR}
;monitor-fallback = HDMI1 ;monitor-fallback = HDMI1
width = 100% width = 100%
height = 30 height = 28
;offset-x = 1% ;offset-x = 1%
;offset-y = 1% ;offset-y = 1%
radius = 0.0 radius = 0.0
@ -65,8 +66,8 @@ fixed-center = true
bottom = false bottom = false
separator = separator =
background = ;background =
;background = ${colors.background} background = ${colors.background}
foreground = ${colors.foreground} foreground = ${colors.foreground}
line-size = 2 line-size = 2
@ -100,11 +101,12 @@ font-3 = "Nimbus Sans:bold:size=9;2"
font-4 = "Iosevka Nerd Font:bold:size=9;2" font-4 = "Iosevka Nerd Font:bold:size=9;2"
font-5 = "FontAwesome5Free:bold:style=solid:size=9;2" font-5 = "FontAwesome5Free:bold:style=solid:size=9;2"
font-6 = "Nimbus Sans:bold:size=16;2" font-6 = "Nimbus Sans:bold:size=16;2"
font-7 = "Iosevka Nerd Font:bold:style=solid:size=6;2"
font-8 = "Iosevka Nerd Font:bold:style=solid:size=8;2"
; ---------------------------------------------------------------------------------------- ; ----------------------------------------------------------------------------------------
modules-left = dividerS bspwm dividerS wirednetwork temp dividerS modules-left = bspwm dividerS wirednetwork temp dividerS
modules-center = modules-center = date
modules-right = dividerS player-mpris-tail player-mpris mpd volume battery dividerS date prompt modules-right = dividerS player-mpris-tail player-mpris mpd volume battery dividerS prompt
; ---------------------------------------------------------------------------------------- ; ----------------------------------------------------------------------------------------
tray-detached = false tray-detached = false
@ -128,19 +130,19 @@ enable-scroll = true
reverse-scroll = true reverse-scroll = true
pin-workspaces = true pin-workspaces = true
ws-icon-0 = 1; ;ws-icon-0 = 1;
ws-icon-1 = 2; ;ws-icon-1 = 2;
ws-icon-2 = 3;喇 ;ws-icon-2 = 3;喇
ws-icon-3 = 4;ﱘ ;ws-icon-3 = 4;ﱘ
ws-icon-4 = 5; ;ws-icon-4 = 5;
ws-icon-5 = 6; ;ws-icon-5 = 6;
ws-icon-6 = 7; ;ws-icon-6 = 7;
ws-icon-7 = 8; ;ws-icon-7 = 8;
ws-icon-8 = 9; ;ws-icon-8 = 9;
ws-icon-9 = 10; ;ws-icon-9 = 10;
ws-icon-default = "" ws-icon-default = ""
format-font = 5 format-font = 8
format = <label-state> format = <label-state>
format-background = #434758 format-background = #434758
format-padding = 2 format-padding = 2
@ -148,20 +150,21 @@ format-padding = 2
label-focused = %icon% label-focused = %icon%
;label-focused-background = #434758 ;label-focused-background = #434758
;label-focused-underline= ;label-focused-underline=
label-focused-padding = 1 label-focused-padding = 2
label-focused-foreground = ${colors.primary} label-focused-foreground = ${colors.primary}
label-occupied = %icon% label-occupied = %icon%
;label-occupied-underline = #00a8ff ;label-occupied-underline = #00a8ff
label-occupied-padding = 1 label-occupied-padding = 2
;label-occupied-background = #434758 ;label-occupied-background = #434758
label-urgent = %icon% label-urgent = %icon%
label-urgent-padding = 1 label-urgent-padding = 2
label-empty = %icon% label-empty = "ﱤ"
;label-empty = %icon%
label-empty-foreground = #7f8fa6 label-empty-foreground = #7f8fa6
label-empty-padding = 1 label-empty-padding = 2
;label-empty-underline = #7f8fa6 ;label-empty-underline = #7f8fa6
;label-empty-background = #434758 ;label-empty-background = #434758
@ -293,14 +296,14 @@ click-left = "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org
type = internal/network type = internal/network
interface = enp2s0 interface = enp2s0
format-connected-foreground = ${colors.foreground} format-connected-foreground = ${colors.secondary2D3}
format-connected-background = ${colors.secondary2D3} format-connected-background = ${colors.background}
format-connected-padding = 2 format-connected-padding = 2
format-connected-font = 1 format-connected-font = 1
format-connected = <label-connected> format-connected = <label-connected>
format-disconnected-foreground = ${colors.foreground} format-disconnected-foreground = ${colors.alert}
format-disconnected-background = ${colors.alert} format-disconnected-background = ${colors.background}
format-disconnected-padding = 2 format-disconnected-padding = 2
format-disconnected = <label-disconnected> format-disconnected = <label-disconnected>
@ -319,24 +322,24 @@ interval = 1.0
; See "http://en.cppreference.com/w/cpp/io/manip/put_time" for details on how to format the date string ; See "http://en.cppreference.com/w/cpp/io/manip/put_time" for details on how to format the date string
; NOTE: if you want to use syntax tags here you need to use %%{...} ; NOTE: if you want to use syntax tags here you need to use %%{...}
date = %d/%m/%y date = %A, %d %b %Y
; Optional time format ; Optional time format
time = %H:%M time = %H:%M
; if `date-alt` or `time-alt` is defined, clicking ; if `date-alt` or `time-alt` is defined, clicking
; the module will toggle between formats ; the module will toggle between formats
date-alt = %A, %d %b date-alt = %A, %d/%m/%y
time-alt = %H:%M time-alt = %H:%M
format-prefix = " " format-prefix = " "
format = <label> format = <label>
format-background = ${colors.blackD} format-background = ${colors.background}
format-foreground = ${colors.foreground} format-foreground = ${colors.primary}
format-padding = 2 format-padding = 2
label = %date% • %time% label = %date% • %time%
label-font = 3 label-font = 3
;label-foreground = #9A32DB label-foreground = ${colors.foreground}
# ----- cmus ----- # ----- cmus -----
[module/cmus] [module/cmus]
@ -397,10 +400,11 @@ type = custom/script
exec = ~/.config/polybar/scripts/player-mpris-tail.py -f '{:artist:t10:{artist}:}{:artist: - :}{:t10:{title}:}' exec = ~/.config/polybar/scripts/player-mpris-tail.py -f '{:artist:t10:{artist}:}{:artist: - :}{:t10:{title}:}'
tail = true tail = true
label-font = 3 label-font = 3
label-foreground = ${colors.foreground}
format-prefix = " " format-prefix = " "
format-prefix-font = "5" format-prefix-font = "5"
format-foreground = ${colors.foreground} format-foreground = ${colors.spotgreen}
format-background = ${colors.primaryD1} format-background = ${colors.background}
format-padding = 2 format-padding = 2
click-left = ~/.config/polybar/scripts/player-mpris-tail.py play-pause & click-left = ~/.config/polybar/scripts/player-mpris-tail.py play-pause &
scroll-up = ~/.config/polybar/scripts/player-mpris-tail.py next & scroll-up = ~/.config/polybar/scripts/player-mpris-tail.py next &
@ -411,8 +415,8 @@ type = custom/script
exec = ~/.config/polybar/scripts/player-mpris-tail.py -f '%{A1:~/.config/polybar/scripts/player-mpris-tail.py previous:} 玲 %{A} %{A1:~/.config/polybar/scripts/player-mpris-tail.py play-pause:} {icon-reversed} %{A} %{A1:~/.config/polybar/scripts/player-mpris-tail.py next:} 怜 %{A}' --icon-paused  --icon-playing 契 exec = ~/.config/polybar/scripts/player-mpris-tail.py -f '%{A1:~/.config/polybar/scripts/player-mpris-tail.py previous:} 玲 %{A} %{A1:~/.config/polybar/scripts/player-mpris-tail.py play-pause:} {icon-reversed} %{A} %{A1:~/.config/polybar/scripts/player-mpris-tail.py next:} 怜 %{A}' --icon-paused  --icon-playing 契
tail = true tail = true
label-font = 1 label-font = 1
format-foreground = ${colors.foreground} format-foreground = ${colors.spotgreen}
format-background = ${colors.primary} format-background = ${colors.background}
format-padding = 1 format-padding = 1
@ -478,17 +482,18 @@ use-ui-max = false
; Default: 5 ; Default: 5
interval = 5 interval = 5
format-muted-foreground = ${colors.foreground} format-muted-foreground = ${colors.primaryL1}
format-muted-background = ${colors.primaryL1} format-muted-background = ${colors.background}
format-muted = ﱝ <label-muted> format-muted = ﱝ <label-muted>
format-muted-padding = 2 format-muted-padding = 2
format-volume-foreground = ${colors.foreground} format-volume-foreground = ${colors.foreground}
format-volume-background = ${colors.primaryL1} format-volume-background = ${colors.background}
format-volume = <ramp-volume> <label-volume> format-volume = <ramp-volume> <label-volume>
format-volume-padding = 2 format-volume-padding = 2
label-volume-font = 3 label-volume-font = 3
label-volume = %percentage%%
lavel-volume-foreground = ${colors.foreground}
label-muted-font = 3 label-muted-font = 3
label-muted = M label-muted = M
label-muted-foreground = ${colors.alert} label-muted-foreground = ${colors.alert}
@ -497,6 +502,7 @@ label-muted-foreground = ${colors.alert}
ramp-volume-0 = 奄 ramp-volume-0 = 奄
ramp-volume-1 = 奔 ramp-volume-1 = 奔
ramp-volume-2 = 墳 ramp-volume-2 = 墳
ramp-volume-foreground = ${colors.primaryL1}
# ----- Updates ----- # ----- Updates -----
@ -517,7 +523,8 @@ interval = 1
format = "<label>" format = "<label>"
format-padding = 2 format-padding = 2
format-background = ${colors.background} format-background = ${colors.background}
format-foreground = ${colors.foreground} format-foreground = ${colors.alert}
label-font = 9
exec = echo "" exec = echo ""
click-left = sh ~/.scripts/prompt click-left = sh ~/.scripts/prompt
@ -584,7 +591,7 @@ base-temperature = 0
warn-temperature = 100 warn-temperature = 100
format = <ramp> <label> format = <ramp> <label>
format-background = ${colors.secondary1} format-background = ${colors.background}
;format-warn = <ramp> <label-warn> ;format-warn = <ramp> <label-warn>
;format-warn-padding = 2 ;format-warn-padding = 2
;format-warn-background = ${colors.primaryD2} ;format-warn-background = ${colors.primaryD2}
@ -600,5 +607,5 @@ ramp-font = 5
ramp-0 =  ramp-0 = 
ramp-1 =  ramp-1 = 
ramp-2 =  ramp-2 = 
ramp-foreground = ${colors.foreground} ramp-foreground = ${colors.secondary1L2}

View file

@ -4,10 +4,10 @@
# terminal emulator # terminal emulator
super + Return super + Return
urxvt st
super + alt + t super + alt + t
urxvt st
# program launcher # program launcher
super + space super + space

View file

@ -22,11 +22,13 @@ noremap <C-Y> "+y
noremap <C-P> "+p noremap <C-P> "+p
noremap <C-/> :NERDCommenterToggle noremap <C-/> :NERDCommenterToggle
:set mouse=a :set mouse=a
" specific type maps --
autocmd FileType python map <buffer> <F9> :w<CR>:!clear; python3 %<CR> autocmd FileType python map <buffer> <F9> :w<CR>:!clear; python3 %<CR>
autocmd FileType python imap <buffer> <F9> <esc>:w<CR>:exec '!clear; python3 %'<CR> autocmd FileType python imap <buffer> <F9> <esc>:w<CR>:exec '!clear; python3 %'<CR>
set number
autocmd FileType plaintex command! -nargs=0 Lw w !pdflatex % > /dev/null autocmd FileType plaintex command! -nargs=0 Lw w !pdflatex % > /dev/null
autocmd FileType tex command! -nargs=0 Lw w !pdflatex % > /dev/null autocmd FileType tex command! -nargs=0 Lw w !pdflatex % > /dev/null
" -------------
set number
set ignorecase set ignorecase
set smartcase set smartcase
map <C-n> :NERDTreeToggle<CR> map <C-n> :NERDTreeToggle<CR>

View file

@ -10,6 +10,7 @@ alias sudovim='sudoedit'
alias nano=nvim alias nano=nvim
alias vim=nvim alias vim=nvim
alias vi=nvim alias vi=nvim
alias v=nvim
#curl #curl
alias weather='curl wttr.in' alias weather='curl wttr.in'
@ -51,6 +52,8 @@ alias la='exa -a --color=always --group-directories-first' # all files and dirs
alias ll='exa -l --color=always --group-directories-first' # long format alias ll='exa -l --color=always --group-directories-first' # long format
alias lla='exa -al --color=always --group-directories-first' # long format alias lla='exa -al --color=always --group-directories-first' # long format
alias lt='exa -aT --color=always --group-directories-first' # tree listing alias lt='exa -aT --color=always --group-directories-first' # tree listing
alias reUSD='rm -rf /tmp/rate.html /tmp/rateUSD.txt'
alias upElearn='sh $HOME/.scripts/elearning-isitup.sh'
#config shortcuts #config shortcuts
alias cfvim='vim $XDG_CONFIG_HOME/vim/vimrc' alias cfvim='vim $XDG_CONFIG_HOME/vim/vimrc'
alias cfbash='vim $HOME/.bashrc' alias cfbash='vim $HOME/.bashrc'

View file

@ -1,4 +1,16 @@
#!/bin/zsh #!/bin/zsh
# DEFAULT
if [[ -n $SSH_CONNECTION ]]; then
export EDITOR='vim'
else
export EDITOR='nvim'
fi
export BROWSER='firefox'
export TERMINAL='st'
# vim as manpager
export MANPAGER="/bin/sh -c \"col -b | vim --not-a-term -c 'set ft=man ts=8 nomod nolist noma' -\""
# SUDO # SUDO
export SUDO_ASKPASS=/bin/rofi-askpass export SUDO_ASKPASS=/bin/rofi-askpass
@ -7,6 +19,10 @@ export XDG_CACHE_HOME="$HOME/.cache"
export XDG_DATA_HOME="$HOME/.local/share" export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CONFIG_HOME="$HOME/.config" export XDG_CONFIG_HOME="$HOME/.config"
#cleaning up
export KODI_DATA="$XDG_DATA_HOME/kodi"
export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
# Path to your oh-my-zsh installation. # Path to your oh-my-zsh installation.
export ZSH="$XDG_DATA_HOME/oh-my-zsh" export ZSH="$XDG_DATA_HOME/oh-my-zsh"
export ZSH_CUSTOM="$ZSH/custom" export ZSH_CUSTOM="$ZSH/custom"

View file

@ -12,6 +12,6 @@ case $chosenps2 in
Back)sh ~/.scripts/play.sh ;; Back)sh ~/.scripts/play.sh ;;
"Okami") notify-send "Launching..." "$chosenps2" && PCSX2 --nogui --fullscreen "$HOME/my Games/PS2/Okami.iso" ;; "Okami") notify-send "Launching..." "$chosenps2" && PCSX2 --nogui --fullscreen "$HOME/my Games/PS2/Okami.iso" ;;
"Persona 3 FES") notify-send "Launching..." "$chosenps2" && PCSX2 --nogui --fullscreen "$HOME/my Games/PS2/Persona 3 FES.iso" ;; "Persona 3 FES") notify-send "Launching..." "$chosenps2" && PCSX2 --nogui --fullscreen "$HOME/my Games/PS2/Persona 3 FES.iso" ;;
"Persona 4") notify-send "$chosenps2" "Not available yet." ;; "Persona 4") notify-send "Launching..." "$chosenps2" && PCSX2 --nogui --fullscreen "$HOME/my Games/PS2/Persona 4.iso" ;;
esac esac

View file

@ -10,7 +10,7 @@ chosen=$(echo -e "$choices" | rofi -dmenu -i -theme ~/.config/rofi/theme/sidebar
case "$chosen" in case "$chosen" in
cmus) notify-send "Launching..." "cmus" && urxvt -name cmus -e cmus ;; cmus) notify-send "Launching..." "cmus" && st -n cmus -e cmus ;;
Spotify) notify-send "Launching..." "Spotify" && env LD_PRELOAD=/usr/local/lib/spotify-adblock.so spotify ;; Spotify) notify-send "Launching..." "Spotify" && env LD_PRELOAD=/usr/local/lib/spotify-adblock.so spotify ;;
VLC) notify-send "Launching..." "VLC" && vlc ;; VLC) notify-send "Launching..." "VLC" && vlc ;;
esac esac

12
.zshrc
View file

@ -5,7 +5,7 @@
# Profiles # Profiles
source ~/.config/zsh/profile source ~/.config/zsh/profile
source $XDG_CONFIG_HOME/zsh/icons
# MOTDs # MOTDs
pfetch pfetch
echo "--------------------------------------" echo "--------------------------------------"
@ -39,16 +39,6 @@ SPACESHIP_PYENV_SYMBOL=""
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#60C0FF,bold,underline" ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#60C0FF,bold,underline"
ZSH_AUTOSUGGEST_HISTORY_IGNORE="ls *,cd *" ZSH_AUTOSUGGEST_HISTORY_IGNORE="ls *,cd *"
# Default
if [[ -n $SSH_CONNECTION ]]; then
export EDITOR='vim'
else
export EDITOR='nvim'
fi
export BROWSER='firefox'
export TERMINAL='urxvt'
# vim as manpager
export MANPAGER="/bin/sh -c \"col -b | vim --not-a-term -c 'set ft=man ts=8 nomod nolist noma' -\""
# vimrc # vimrc
export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'