Merge branch 'display'

This commit is contained in:
2018-12-03 19:08:22 -05:00
5 changed files with 30 additions and 31 deletions

View File

@@ -1,8 +1,10 @@
<!--- Intro {{{ --> <!--- Intro {{{ -->
# Kevin's Linux Setup # Kevin's Linux Setup
![desktop-screenshot](https://i.imgur.com/DivyfTu.png) ![desktop-screenshot](https://i.imgur.com/lkicLP5.png)
*Screenshot from my desktop config.*
![desktop-screenshot-2](https://i.imgur.com/DivyfTu.png)
*Screenshots from my desktop config.*
This repository contains the dotfiles to increase my workflow efficiency. They This repository contains the dotfiles to increase my workflow efficiency. They
are also for my Linux are also for my Linux
@@ -30,15 +32,11 @@ they should be in the system.
<!-- History {{{ --> <!-- History {{{ -->
## History ## History
### 3/7 ### 3/7
![laptop-screenshot](https://i.imgur.com/UpdX90A.png) * [laptop](https://i.imgur.com/UpdX90A.png)
*Laptop.*
### 3/5 ### 3/5
![desktop-screenshot](https://i.imgur.com/mbu9aYf.png) * [dual-monitor desktop](https://i.imgur.com/mbu9aYf.png)
*Dual-monitor desktop.* * [laptop](https://i.imgur.com/hrSnXmV.png)
![laptop-screenshot](https://i.imgur.com/hrSnXmV.png)
*Laptop.*
<!-- }}} History --> <!-- }}} History -->

View File

@@ -24,7 +24,7 @@ function src() { source $1 ; }
alias cs='printf "\033c"' alias cs='printf "\033c"'
alias hst="history" alias hst="history"
alias nf="neofetch | lolcat" alias nf="cs && neofetch | lolcat"
alias rur="xrdb ~/.Xresources" alias rur="xrdb ~/.Xresources"
function gvx() { urxvt --help 2>&1 | grep $1 ; } function gvx() { urxvt --help 2>&1 | grep $1 ; }
# list file sizes in megabytes with depth 1 # list file sizes in megabytes with depth 1
@@ -127,7 +127,7 @@ alias lca="f ~/linux-config/aliases"
source ~/.shortcuts source ~/.shortcuts
# i3 # i3
alias i3b="f ~/i3blocks" alias i3b="f ~/i3blocks"
alias pipes="pipes.sh -t 2" alias pipes="pipes.sh -t 3"
# UltiSnips {{{ # # UltiSnips {{{ #
urnp_dir="~/.vim/plugged/vim-snippets/UltiSnips" urnp_dir="~/.vim/plugged/vim-snippets/UltiSnips"
@@ -150,7 +150,6 @@ function xv() { nohup xviewer $1 > /dev/null 2>&1& ; }
function chr() { google-chrome $1 ; } function chr() { google-chrome $1 ; }
function ni() { nvim $1 ; } function ni() { nvim $1 ; }
function sni() { sudo nvim $1 ; } function sni() { sudo nvim $1 ; }
alias spt="spotify $silent"
# function mrk() { pandoc -o ${1%.*}.html $1 && chr ${1%.*}.html ; } # function mrk() { pandoc -o ${1%.*}.html $1 && chr ${1%.*}.html ; }
function mrk() { pandoc -o ${1%.*}.html $1 ; } function mrk() { pandoc -o ${1%.*}.html $1 ; }
function auc() { xdotool click --repeat 1000000 --delay $1 1 ; } function auc() { xdotool click --repeat 1000000 --delay $1 1 ; }
@@ -234,7 +233,7 @@ alias grbc="git rebase --continue"
# }}} update # # }}} update #
# edit {{{ # # edit {{{ #
alias vir="ni README.md" alias vre="ni README.md"
alias crm="mrk README.md" alias crm="mrk README.md"
# }}} edit # # }}} edit #

View File

@@ -37,38 +37,39 @@ markup=pango
label= label=
command=date '+%H:%M.%a-%m-%d' command=date '+%H:%M.%a-%m-%d'
interval=30 interval=30
color=#cccccc color=#acc0cd
[spotify] [spotify]
command=python ~/linux-config/configs/i3blocks-scripts/spotify.py command=python ~/linux-config/configs/i3blocks-scripts/spotify.py
label= label=
# color=#006600 color=#999999
color=#388E8E
interval=5 interval=5
# [wifi] # [wifi]
# label= # label=
# instance=wlp3s0 # instance=wlp4s0
# interval=10 # interval=10
# unbold this? # unbold this?
[load_average] # [load_average]
# label=
# interval=5
# color=#990000
# [cpu_usage -w 50 -c 80]
[cpu_usage]
label= label=
interval=5
color=#990000 color=#990000
interval=5
[memory] [memory]
label= label=
color=#006600 color=#3da061
interval=5
[cpu_usage -w 50 -c 80]
label=
min_width=CPU: 100.00%
color=#adeaea
[name] [name]
label= label=
color=#cc5490 color=#1e5b99
interval=6000 interval=6000
# unused blocks {{{ # # unused blocks {{{ #

View File

@@ -37,7 +37,7 @@ markup=pango
label= label=
command=date '+%H:%M.%a-%m-%d' command=date '+%H:%M.%a-%m-%d'
interval=30 interval=30
color=#cccccc color=#acc0cd
# [wifi] # [wifi]
# label= # label=
@@ -58,12 +58,13 @@ interval=5
[memory] [memory]
label= label=
color=#addfe3 color=#3da061
interval=5 interval=5
[name] [name]
label= label=
color=#cc5490 # color=#ba50a9
color=#1e5b99
interval=6000 interval=6000
# unused blocks {{{ # # unused blocks {{{ #

View File

@@ -1,9 +1,9 @@
# sys {{{ * # sys {{{ *
3 ~/.config/i3/config 3 ~/.config/i3/config
3b ~/.config/i3blocks/i3blocks.conf
d ~/linux-config/txt/key_dirs.txt d ~/linux-config/txt/key_dirs.txt
f ~/linux-config/txt/key_files.txt f ~/linux-config/txt/key_files.txt
i ~/.config/i3blocks/i3blocks.conf
r ~/.config/ranger/rc.conf r ~/.config/ranger/rc.conf
sr ~/linux-config/configs/ranger/shortcuts.conf sr ~/linux-config/configs/ranger/shortcuts.conf
ss ~/.shortcuts ss ~/.shortcuts
@@ -19,8 +19,8 @@ z ~/linux-config/aliases/zsh_aliases
hlg ~/coding/spotify-lib-vis/src/api/management/commands/update-history.log hlg ~/coding/spotify-lib-vis/src/api/management/commands/update-history.log
jn ~/Documents/journal/todo/11.md jn ~/Documents/journal/todo/11.md
jnt ~/Documents/journal/todo/todo.md jnt ~/Documents/journal/todo/todo.md
n ./.gitignore
tm ~/.vim/plugged/vim-snippets/UltiSnips/texmath.snippets tm ~/.vim/plugged/vim-snippets/UltiSnips/texmath.snippets
ig ./.gitignore
# }}} cdn * # }}} cdn *