diff --git a/README.md b/README.md index fb8ec4b..35a9461 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,19 @@ # Kevin's Linux Setup -![desktop-screenshot](https://i.imgur.com/hrSnXmV.png) +![desktop-screenshot](https://i.imgur.com/mbu9aYf.png) +*Screenshot from my dual-monitor desktop config.* + +![laptop-screenshot](https://i.imgur.com/hrSnXmV.png) *Screenshot from my laptop config.* -This repository contains the dotfiles for my Linux ["rice"](https://www.reddit.com/r/unixporn/comments/3iy3wd/stupid_question_what_is_ricing/cukxwog/). It's always going to -be a work-in-progress, but it's satisfactory for the time being. My dotfiles are -primarily focused on workflow efficiency. +This repository contains the dotfiles for my Linux +["rice"](https://www.reddit.com/r/unixporn/comments/3iy3wd/stupid_question_what_is_ricing/cukxwog/). +It's always going to be a work-in-progress, but it's satisfactory for the time +being. My dotfiles are primarily focused on workflow efficiency. ## Basic Info * **OS**: Linux Mint 18.2 -* **Terminal**: Terminator +* **Terminal**: [rxvt](https://www.wikiwand.com/en/Rxvt) * **Shell**: Bash * **WM**: [i3-gaps](https://github.com/Airblader/i3) * **Editor**: Vim @@ -23,16 +27,20 @@ in the system. `set-configs.sh` sets different config files for my PC and laptop as they have slightly different needs (multiple monitors, screen size, etc.). ## Programs Used -* [Bash-it](https://github.com/Bash-it/bash-it/) -* [i3blocks](https://github.com/vivien/i3blocks) -* [Various Vim plug-ins](https://github.com/Kevin-Mok/linux-config/blob/f922e56b50635c9344b26f9088e37acea5647359/dotfiles/vimrc#L38) -* [Neofetch](https://github.com/dylanaraps/neofetch) -* [pipes.sh](https://github.com/pipeseroni/pipes.sh) - -### Switch From/Try Out: -* Arch Linux +* [Bash-it](https -//github.com/Bash-it/bash-it/) - For autocompletion and themes. +* [cmatrix](https -//github.com/abishekvashok/cmatrix) - Matrix screensaver. +* [i3blocks](https -//github.com/vivien/i3blocks) - Alternative status bar for + i3wm. +* [Various Vim plug-ins](https -//github.com/Kevin-Mok/linux-config/blob/f922e56b50635c9344b26f9088e37acea5647359/dotfiles/vimrc#L38) +* [Neofetch](https -//github.com/dylanaraps/neofetch) - CLI-based app to display + system information. +* [pipes.sh](https -//github.com/pipeseroni/pipes.sh) - Animated pipes + screensaver. +* [pywal](https -//github.com/dylanaraps/pywal) - Color scheme coordinator. + +## Switch From: +* Linux Mint ➔ Arch Linux * Bash ➔ [Zsh](http://zsh.sourceforge.net/) -* Terminator ➔ [rxvt](https://www.wikiwand.com/en/Rxvt) * Vim(-based) apps: * Vim ➔ [Neovim](https://github.com/neovim/neovim) * Google Chrome ➔ [qutebrowser](https://github.com/qutebrowser/qutebrowser) diff --git a/aliases/.bash_aliases b/aliases/.bash_aliases index 6aec977..c4fb728 100644 --- a/aliases/.bash_aliases +++ b/aliases/.bash_aliases @@ -41,6 +41,7 @@ py() { python $1 ; } # Config {{{ # alias lc="d ~/linux-config/" alias vv="vi ~/.vimrc" +alias vu="vi ~/.Xresources" alias r=". ~/.bashrc" # aliases alias lca="d ~/linux-config/aliases" @@ -51,8 +52,9 @@ alias r=". ~/.bashrc" # }}} Config # # redshift -rs(){ redshift -O $(($1 * 1000)) ; } +rs(){ redshift -O $(echo "scale=2;$1*1000" | bc) ; } alias rx="redshift -x" + mrk() { pandoc -o ${1%.*}.html $1 && chr ${1%.*}.html ; } # UltiSnips {{{ # diff --git a/aliases/.git_aliases b/aliases/.git_aliases index af93645..8724128 100644 --- a/aliases/.git_aliases +++ b/aliases/.git_aliases @@ -19,6 +19,7 @@ alias gst="git stash" alias gstore="git config credential.helper store" alias gstp="git stash pop" alias vig="vi .gitignore" +alias vir="vi README.md" gcm(){ git commit -m "$1" ; } # Aliases }}} diff --git a/aliases/.pc_aliases b/aliases/.pc_aliases index 8a74bde..fe2a548 100644 --- a/aliases/.pc_aliases +++ b/aliases/.pc_aliases @@ -1,5 +1,7 @@ # Both PC/Laptop {{{ if [ "$(whoami)" == "kevin" ]; then + apti() { sudo apt install $1 ; } + aptr() { sudo apt remove $1 ; } alias vbn="cvlc --loop --alsa-gain 1 ~/Downloads/brown-noise.mp3" # school {{{ # @@ -15,6 +17,7 @@ if [ "$(whoami)" == "kevin" ]; then alias i3b="d /usr/share/i3blocks" alias pipes="pipes.sh -t 2" + alias bgs="nemo ~/Pictures/Backgrounds" # }}} i3 # # coding projs {{{ # @@ -71,6 +74,8 @@ if [ "$(hostname)" == "NZXT" ]; then alias spt="speedtest" alias pg="ping -c 5 google.ca" alias w7="VBoxManage startvm W7 --type headless" + gvx() { urxvt --help 2>&1 | grep $1 ; } + alias rur="xrdb ~/.Xresources" # }}} apps # # various coding projs {{{ # @@ -102,7 +107,7 @@ if [ "$(hostname)" == "X1-Carbon" ]; then # }}} key swaps # alias gbl="xbacklight -get" - sbl() { xbacklight -set $1 ; } + sbl() { xbacklight -set $(echo "scale=2;$1*10" | bc) ; } alias thn="thunar ." diff --git a/configs/NZXT/i3.conf b/configs/NZXT/i3.conf index 488bdfb..9e2d78c 100644 --- a/configs/NZXT/i3.conf +++ b/configs/NZXT/i3.conf @@ -1,7 +1,11 @@ # applications {{{ # # startup {{{ # exec redshift -O 4000 -exec_always feh --bg-center ~/Pictures/Backgrounds/samurai-astronaut.jpg +# random bg +# exec_always feh -z --bg-fill ~/Pictures/Backgrounds/* +# exec_always feh --bg-fill ~/Pictures/Backgrounds/ +# exec_always ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/" +exec_always ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/retro-mountains-pink.jpg" exec imwheel exec --no-startup-id i3-msg 'workspace 1 ; exec terminator' exec --no-startup-id i3-msg 'workspace 2 ; exec terminator' @@ -12,7 +16,9 @@ set $sch_dir "$HOME/Documents/School" # app shortcuts {{{ # bindsym Mod4+a exec studio -bindsym $mod+control+Return exec i3-sensible-terminal +# bindsym $mod+control+Return exec i3-sensible-terminal +# bindsym $mod+control+Return exec rxvt-unicode +bindsym $mod+control+Return exec xrdb .Xresources; exec rxvt-unicode bindsym Mod4+c exec google-chrome bindsym Mod4+e exec nemo bindsym Mod4+o exec okular @@ -24,9 +30,9 @@ bindsym Print exec ksnapshot # redshift {{{ # bindsym $mod+Mod4+1 exec redshift -O 1500 bindsym $mod+Mod4+2 exec redshift -O 2000 -bindsym $mod+Mod4+3 exec redshift -O 3000 -bindsym $mod+Mod4+4 exec redshift -O 4000 -bindsym $mod+Mod4+5 exec redshift -O 5000 +bindsym $mod+Mod4+3 exec redshift -O 2500 +bindsym $mod+Mod4+4 exec redshift -O 3000 +bindsym $mod+Mod4+5 exec redshift -O 4000 bindsym $mod+Mod4+0 exec redshift -x # }}} redshift # @@ -81,6 +87,12 @@ bindsym control+Shift+x kill # }}} changing/focusing/moving windows # # container display {{{ # +# backgrounds +# bindsym $mod+g exec feh -z --bg-fill ~/Pictures/Backgrounds/* +bindsym $mod+g exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/" +# bindsym $mod+z exec feh --bg-max ~/Pictures/Backgrounds/deadpool.png +bindsym $mod+z exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/sunset-2.jpg" + # enter fullscreen mode for the focused container bindsym $mod+f fullscreen toggle @@ -207,13 +219,16 @@ bindsym $mod+control+l resize shrink width 10 px or 10 ppt # }}} resizing windows # # gaps {{{ # +# remove window titlebars for_window [class="^.*"] border pixel 0 -smart_gaps on -gaps inner 10 -gaps outer 15 - -bindsym control+shift+plus gaps inner all plus 5;gaps outer all plus 5 -bindsym control+shift+0 gaps inner all minus 5;gaps outer all minus 5 +# default gaps +gaps inner 25 +gaps outer 5 + +# increase/decrease gaps +bindsym control+shift+plus gaps inner all plus 2;gaps outer all plus 2 +# bindsym control+shift+plus gaps inner all plus 2 +bindsym control+shift+0 gaps inner all minus 2;gaps outer all minus 2 # }}} gaps # # status bar {{{ # diff --git a/configs/NZXT/neofetch.conf b/configs/NZXT/neofetch.conf index 689dbc9..ed1de87 100644 --- a/configs/NZXT/neofetch.conf +++ b/configs/NZXT/neofetch.conf @@ -10,30 +10,30 @@ print_info() { info "OS" distro info "Terminal" term + info "Font" font + info "Terminal Font" term_font + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + # info "Icons" icons info "CPU" cpu + info "CPU Usage" cpu_usage info "GPU" gpu info "Memory" memory info "Resolution" resolution info "Uptime" uptime info "Install Date" install_date + info "Song" song # info "Users" users - # info "Terminal Font" term_font # info "Host" model # info "Kernel" kernel # info "Packages" packages # info "Shell" shell # info "DE" de - # info "WM" wm - # info "WM Theme" wm_theme - # info "Theme" theme - # info "Icons" icons # info "GPU Driver" gpu_driver # Linux only - # info "CPU Usage" cpu_usage # info "Disk" disk # info "Battery" battery - # info "Font" font - # info "Song" song # info "Local IP" local_ip # info "Public IP" public_ip # info "Locale" locale # This only works on glibc systems. diff --git a/dotfiles/Xresources b/dotfiles/Xresources new file mode 100644 index 0000000..c9b37fe --- /dev/null +++ b/dotfiles/Xresources @@ -0,0 +1,8 @@ +URxvt.font: xft:hack:size=11 + +URxvt*inheritPixmap: true +URxvt*transparent: true +! URxvt*shading: 0 to 99 darkens, 101 to 200 lightens +URxvt*shading: 20 + +URxvt.scrollBar: false diff --git a/dotfiles/bashrc b/dotfiles/bashrc index 6cd4935..5b080eb 100644 --- a/dotfiles/bashrc +++ b/dotfiles/bashrc @@ -124,11 +124,13 @@ fi # Path to the bash it configuration export BASH_IT="$DIR_BASH_IT" +# store current working dir after every command so can launch new +# terminals from same dir (for i3) +PROMPT_COMMAND='pwd > "${HOME}/.cwd"' +[[ -f "${HOME}/.cwd" ]] && cd "$(< ${HOME}/.cwd)" # Lock and Load a custom theme file # location /.bash_it/themes/ -PROMPT_COMMAND='pwd > "${HOME}/.cwd"' -[[ -f "${HOME}/.cwd" ]] && cd "$(< ${HOME}/.cwd)" export BASH_IT_THEME='nwinkler' # (Advanced): Change this to the name of your remote repo if you @@ -189,6 +191,8 @@ export VISUAL='vim' # Both PC/Laptop {{{ if [ "$(whoami)" == "kevin" ]; then xset r rate 200 90 + export PATH="${PATH}:${HOME}/.local/bin/" + (cat ~/.cache/wal/sequences &) fi # NZXT if [ "$(hostname)" == "NZXT" ]; diff --git a/dotfiles/set-dotfiles.sh b/dotfiles/set-dotfiles.sh index 2018fc8..c5364e6 100755 --- a/dotfiles/set-dotfiles.sh +++ b/dotfiles/set-dotfiles.sh @@ -1,7 +1,7 @@ # Get directory variables from script. . ../dirs.sh # List of dotfiles I want to link to system. -dotfiles="bashrc gitconfig inputrc vimrc" +dotfiles="bashrc gitconfig inputrc vimrc Xresources" # cd $dot_dir for dotfile in $dotfiles; do # Remove system dotfile. diff --git a/dotfiles/vimrc b/dotfiles/vimrc index 36285b3..506b24f 100644 --- a/dotfiles/vimrc +++ b/dotfiles/vimrc @@ -8,7 +8,7 @@ syntax on set tabstop=4 set tw=80 set linebreak -set colorcolumn=80 +" set colorcolumn=80 set shiftwidth=4 set autoindent set mouse=c @@ -17,8 +17,8 @@ set foldmethod=marker set linespace=5 " set listchars=tab:\|\ " set list -set cursorcolumn -set cursorline +" set cursorcolumn +" set cursorline set timeoutlen=300 set hlsearch " }}} set x=y " @@ -57,6 +57,7 @@ Plug 'easymotion/vim-easymotion' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'dkarter/bullets.vim' +Plug 'dylanaraps/wal.vim' " }}} vim-plug " " YCM/UltiSnips {{{ " @@ -71,7 +72,8 @@ let g:UltiSnipsJumpBackwardTrigger = "" " }}} YCM/UltiSnips " call plug#end() -colorscheme gotham256 +" colorscheme gotham256 +colorscheme wal " Mappings {{{ " map :wa