From adc333d9880a3ec832da14b11a9e28c644ea3f5e Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Thu, 12 Apr 2018 14:37:15 -0400 Subject: [PATCH] Updated config to work with Arch --- aliases/zsh_aliases | 11 ++++-- configs/i3blocks-scripts/name | 2 +- configs/{NZXT => nzxt}/i3/config | 34 +++++++++++-------- configs/{NZXT => nzxt}/i3blocks/i3blocks.conf | 0 configs/{NZXT => nzxt}/neofetch/config.conf | 6 ++-- configs/{NZXT => nzxt}/ranger/commands.py | 0 .../{NZXT => nzxt}/ranger/commands_full.py | 0 configs/{NZXT => nzxt}/ranger/rc.conf | 0 configs/{NZXT => nzxt}/ranger/rifle.conf | 0 configs/{NZXT => nzxt}/ranger/scope.sh | 0 .../sam-i3blocks/sam-i3blocks.conf | 0 configs/{NZXT => nzxt}/terminator | 0 dotfiles/set-dotfiles.sh | 2 +- dotfiles/vimrc | 21 ++++++------ dotfiles/zshrc | 3 +- 15 files changed, 46 insertions(+), 33 deletions(-) rename configs/{NZXT => nzxt}/i3/config (92%) rename configs/{NZXT => nzxt}/i3blocks/i3blocks.conf (100%) rename configs/{NZXT => nzxt}/neofetch/config.conf (99%) rename configs/{NZXT => nzxt}/ranger/commands.py (100%) rename configs/{NZXT => nzxt}/ranger/commands_full.py (100%) rename configs/{NZXT => nzxt}/ranger/rc.conf (100%) rename configs/{NZXT => nzxt}/ranger/rifle.conf (100%) rename configs/{NZXT => nzxt}/ranger/scope.sh (100%) rename configs/{NZXT => nzxt}/sam-i3blocks/sam-i3blocks.conf (100%) rename configs/{NZXT => nzxt}/terminator (100%) diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index 13b53d5..0eb020c 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -26,6 +26,11 @@ function gvx() { urxvt --help 2>&1 | grep $1 ; } # list file sizes in megabytes with depth 1 alias dum="du -d 1 -B M" +# pacman +function pcs() { sudo pacman -S $1 ; } +function pcr() { sudo pacman -R $1 ; } +function mpk() { makepkg -si ; } + # install deb files function ideb() { sudo dpkg -i $1 ; } @@ -122,10 +127,11 @@ alias auc5="xdotool click --repeat 1000000 --delay 500 1" alias kauc="pkill -f xdotool" alias vbn="cvlc --loop --alsa-gain 1 ~/Music/brown-noise.mp3" -alias vlm="alsamixer -c 2" +alias vlm="alsamixer -c 0" alias rmsw="rm .sw*" -function rs(){ redshift -O $(echo "scale=2;$1*1000" | bc) ; } +# function rs(){ redshift -O $(echo "scale=2;$1*1000" | bc) ; } +function rs(){ redshift -O $1 ; } alias rx="redshift -x" # python related {{{ # @@ -140,6 +146,7 @@ function py() { python $1 ; } # NZXT {{{ if [ "$(hostname)" = "NZXT" ]; then + # rotate monitor {{{ # function rt() { output="HDMI-0" diff --git a/configs/i3blocks-scripts/name b/configs/i3blocks-scripts/name index 38a9977..96dad5b 100755 --- a/configs/i3blocks-scripts/name +++ b/configs/i3blocks-scripts/name @@ -1 +1 @@ -echo "Kevin 🚀" +echo "Kevin" diff --git a/configs/NZXT/i3/config b/configs/nzxt/i3/config similarity index 92% rename from configs/NZXT/i3/config rename to configs/nzxt/i3/config index 276920e..903e42e 100644 --- a/configs/NZXT/i3/config +++ b/configs/nzxt/i3/config @@ -1,14 +1,17 @@ +set $mod Mod1 + # applications {{{ # # startup {{{ # -set $def_term "rxvt-unicode" +set $browser "firefox" +set $def_term "urxvt" exec redshift -O 4000 # random bg -exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/vibrant" +exec wal -i "$HOME/Pictures/Backgrounds/dim" # exec_always ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/retro-mountains-pink.jpg" exec imwheel # exec --no-startup-id i3-msg 'workspace 1 ; exec $def_term' exec --no-startup-id i3-msg 'workspace 2 ; exec $def_term' -exec --no-startup-id i3-msg 'workspace 3 ; exec google-chrome' +exec --no-startup-id i3-msg 'workspace 3 ; exec $browser' # }}} startup # set $sch_dir "$HOME/Documents/School" @@ -20,7 +23,7 @@ bindsym Mod4+2 exec xdotool click --repeat 10 --delay 100 1 bindsym Mod4+3 exec xdotool click --repeat 20 --delay 100 1 # bindsym $mod+control+Return exec i3-sensible-terminal bindsym $mod+control+Return exec $def_term -bindsym Mod4+c exec google-chrome +bindsym Mod4+c exec $browser bindsym Mod4+e exec nemo bindsym Mod4+f exec firefox bindsym Mod4+o exec okular @@ -91,10 +94,10 @@ bindsym control+Shift+x kill # container display {{{ # # backgrounds -bindsym $mod+q exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/vibrant" -bindsym $mod+w exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/dim" -bindsym $mod+r exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/" -bindsym $mod+z exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/sunset-2.jpg" +bindsym $mod+q exec wal -i "$HOME/Pictures/Backgrounds/vibrant" +bindsym $mod+w exec wal -i "$HOME/Pictures/Backgrounds/dim" +bindsym $mod+r exec wal -i "$HOME/Pictures/Backgrounds/" +bindsym $mod+z exec wal -i "$HOME/Pictures/Backgrounds/sunset-2.jpg" # enter fullscreen mode for the focused container bindsym $mod+f fullscreen toggle @@ -132,14 +135,14 @@ bindsym $mod+F2 workspace $ws2; exec $def_term set $ws3 "3 " workspace $ws3 output $benq -bindsym $mod+F3 workspace $ws3; exec google-chrome +bindsym $mod+F3 workspace $ws3; exec $browser set $ws4 "4 " workspace $ws4 output $samsung set $ws5 "5 " workspace $ws5 output $benq -bindsym $mod+F5 workspace $ws5; exec google-chrome +bindsym $mod+F5 workspace $ws5; exec $browser bindsym Mod4+g workspace $ws5; layout stacking; exec steam set $ws6 "6 " @@ -228,8 +231,9 @@ bindsym $mod+control+l resize shrink width 3 px or 3 ppt # remove window titlebars for_window [class="^.*"] border pixel 2 # default gaps -gaps inner 25 -gaps outer 5 +# gaps inner 25 +gaps inner 0 +gaps outer 0 bindsym control+shift+plus gaps inner all set 25;gaps outer all set 5 bindsym control+shift+0 gaps inner all set 0;gaps outer all set 0 @@ -274,9 +278,9 @@ font pango:Hack 11 # }}} mod key/font # # media keys {{{ # -bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -c 2 sset Master 3+ -bindsym XF86AudioLowerVolume exec --no-startup-id amixer -c 2 sset Master 3- -bindsym XF86AudioMute exec --no-startup-id amixer -D pulse set Master 2+ toggle +bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -c 0 sset Master 3+ +bindsym XF86AudioLowerVolume exec --no-startup-id amixer -c 0 sset Master 3- +bindsym XF86AudioMute exec --no-startup-id amixer -D pulse set Master 0+ toggle # Media player controls bindsym XF86AudioPlay exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause" diff --git a/configs/NZXT/i3blocks/i3blocks.conf b/configs/nzxt/i3blocks/i3blocks.conf similarity index 100% rename from configs/NZXT/i3blocks/i3blocks.conf rename to configs/nzxt/i3blocks/i3blocks.conf diff --git a/configs/NZXT/neofetch/config.conf b/configs/nzxt/neofetch/config.conf similarity index 99% rename from configs/NZXT/neofetch/config.conf rename to configs/nzxt/neofetch/config.conf index 821fe47..6196d49 100644 --- a/configs/NZXT/neofetch/config.conf +++ b/configs/nzxt/neofetch/config.conf @@ -12,24 +12,24 @@ print_info() { info "Terminal" term info "Shell" shell info "Font" font + info "Packages" packages 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 "CPU Usage" cpu_usage info "GPU" gpu info "Memory" memory info "Resolution" resolution - info "Uptime" uptime + # info "Uptime" uptime info "Install Date" install_date info "Song" song # info "Users" users # info "Host" model # info "Kernel" kernel - # info "Packages" packages # info "DE" de # info "GPU Driver" gpu_driver # Linux only # info "Disk" disk diff --git a/configs/NZXT/ranger/commands.py b/configs/nzxt/ranger/commands.py similarity index 100% rename from configs/NZXT/ranger/commands.py rename to configs/nzxt/ranger/commands.py diff --git a/configs/NZXT/ranger/commands_full.py b/configs/nzxt/ranger/commands_full.py similarity index 100% rename from configs/NZXT/ranger/commands_full.py rename to configs/nzxt/ranger/commands_full.py diff --git a/configs/NZXT/ranger/rc.conf b/configs/nzxt/ranger/rc.conf similarity index 100% rename from configs/NZXT/ranger/rc.conf rename to configs/nzxt/ranger/rc.conf diff --git a/configs/NZXT/ranger/rifle.conf b/configs/nzxt/ranger/rifle.conf similarity index 100% rename from configs/NZXT/ranger/rifle.conf rename to configs/nzxt/ranger/rifle.conf diff --git a/configs/NZXT/ranger/scope.sh b/configs/nzxt/ranger/scope.sh similarity index 100% rename from configs/NZXT/ranger/scope.sh rename to configs/nzxt/ranger/scope.sh diff --git a/configs/NZXT/sam-i3blocks/sam-i3blocks.conf b/configs/nzxt/sam-i3blocks/sam-i3blocks.conf similarity index 100% rename from configs/NZXT/sam-i3blocks/sam-i3blocks.conf rename to configs/nzxt/sam-i3blocks/sam-i3blocks.conf diff --git a/configs/NZXT/terminator b/configs/nzxt/terminator similarity index 100% rename from configs/NZXT/terminator rename to configs/nzxt/terminator diff --git a/dotfiles/set-dotfiles.sh b/dotfiles/set-dotfiles.sh index 83f5d22..77ff1af 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 Xresources zshrc" +dotfiles=(bashrc gitconfig inputrc vimrc Xresources zshrc) # cd $dot_dir for dotfile in $dotfiles; do # Remove system dotfile. diff --git a/dotfiles/vimrc b/dotfiles/vimrc index f7508b6..c849b61 100644 --- a/dotfiles/vimrc +++ b/dotfiles/vimrc @@ -66,25 +66,25 @@ Plug 'lervag/vimtex' let g:vimtex_view_general_viewer = 'okular' " auto-completion for various languages -Plug 'Valloric/YouCompleteMe' +" Plug 'Valloric/YouCompleteMe' " wrote short bits of text that expand into whatever you want " demo: https://www.youtube.com/watch?v=Zik6u0klD40 -Plug 'SirVer/ultisnips' +" Plug 'SirVer/ultisnips' " better key bindings for UltiSnipsExpandTrigger - let g:UltiSnipsExpandTrigger = "" - let g:UltiSnipsJumpForwardTrigger = "" - let g:UltiSnipsJumpBackwardTrigger = "" + " let g:UltiSnipsExpandTrigger = "" + " let g:UltiSnipsJumpForwardTrigger = "" + " let g:UltiSnipsJumpBackwardTrigger = "" " custom snippets -Plug 'Kevin-Mok/vim-snippets' +" Plug 'Kevin-Mok/vim-snippets' " to make YouCompleteMe work with UltiSnips (both use Tab) -Plug 'ervandew/supertab' +" Plug 'ervandew/supertab' " make YCM compatible with UltiSnips (using supertab) - let g:ycm_key_list_select_completion = ['', ''] - let g:ycm_key_list_previous_completion = ['', ''] - let g:SuperTabDefaultCompletionType = '' + " let g:ycm_key_list_select_completion = ['', ''] + " let g:ycm_key_list_previous_completion = ['', ''] + " let g:SuperTabDefaultCompletionType = '' " easily comment/uncomment lines Plug 'scrooloose/nerdcommenter' @@ -100,6 +100,7 @@ Plug 'easymotion/vim-easymotion' " status bar displaying various info about the current buffer Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' + let g:airline_powerline_fonts = 1 " continue Markdown lists when started Plug 'dkarter/bullets.vim' diff --git a/dotfiles/zshrc b/dotfiles/zshrc index d5f49ca..99a2bdb 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -1,8 +1,9 @@ # If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. export ZSH=/home/kevin/.oh-my-zsh + export EDITOR=/usr/bin/vim + export VISUAL=/usr/bin/vim # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded.