diff --git a/.Readme.md.swp b/.Readme.md.swp deleted file mode 100644 index 2fd88fe..0000000 Binary files a/.Readme.md.swp and /dev/null differ diff --git a/.install.sh.swp b/.install.sh.swp deleted file mode 100644 index 988e002..0000000 Binary files a/.install.sh.swp and /dev/null differ diff --git a/Readme.md b/Readme.md index 057ddd1..744e523 100644 --- a/Readme.md +++ b/Readme.md @@ -1,11 +1,11 @@ ## Requires -compton -lemonbar -pkgfile -zsh -zsh-syntax-highlighting -vim -bspwm -sxhkd -yaourt (for install script) +compton +lemonbar +pkgfile +zsh +zsh-syntax-highlighting +vim +bspwm +sxhkd +yaourt (for install script) diff --git a/install.sh b/install.sh index 6d1653b..2c35bd7 100755 --- a/install.sh +++ b/install.sh @@ -2,3 +2,10 @@ sudo pacman -S pkgfile zsh vim zsh-syntax-highlighting yaourt -S bspwm-git sxhkd-git compton-git lemonbar-git pkgfile --update +stow bspwm +stow compton +stow panel +stow sxhkd +stow vim +stow x +stow zsh diff --git a/panel/bspwm/panel/panel_colors b/panel/bspwm/panel/panel_colors index a7fad64..cbf105a 100644 --- a/panel/bspwm/panel/panel_colors +++ b/panel/bspwm/panel/panel_colors @@ -1,24 +1,24 @@ -COLOR_FOREGROUND='#FFA3A6AB' -COLOR_BACKGROUND='#FF34322E' -COLOR_ACTIVE_MONITOR_FG='#FF34322E' -COLOR_ACTIVE_MONITOR_BG='#FF58C5F1' -COLOR_INACTIVE_MONITOR_FG='#FF58C5F1' -COLOR_INACTIVE_MONITOR_BG='#FF34322E' -COLOR_FOCUSED_OCCUPIED_FG='#FFF6F9FF' +COLOR_FOREGROUND='#FF98D1CE' # +COLOR_BACKGROUND='#FF0A0F14' # +COLOR_ACTIVE_MONITOR_FG='#FF0A0F14' # +COLOR_ACTIVE_MONITOR_BG='#FF10151B' # +COLOR_INACTIVE_MONITOR_FG='#FF10151B' # +COLOR_INACTIVE_MONITOR_BG='#FF0A0F14' # +COLOR_FOCUSED_OCCUPIED_FG='#FFD3EBE9' # COLOR_FOCUSED_OCCUPIED_BG='#FF5C5955' -COLOR_FOCUSED_FREE_FG='#FFF6F9FF' -COLOR_FOCUSED_FREE_BG='#FF6D561C' -COLOR_FOCUSED_URGENT_FG='#FF34322E' +COLOR_FOCUSED_FREE_FG='#FFD3EBE9' # +COLOR_FOCUSED_FREE_BG='#FF081f2d' # +COLOR_FOCUSED_URGENT_FG='#FF0A0F14' # COLOR_FOCUSED_URGENT_BG='#FFF9A299' -COLOR_OCCUPIED_FG='#FFA3A6AB' -COLOR_OCCUPIED_BG='#FF34322E' +COLOR_OCCUPIED_FG='#FF98D1CE' # +COLOR_OCCUPIED_BG='#FF0A0F14' # COLOR_FREE_FG='#FF6F7277' -COLOR_FREE_BG='#FF34322E' +COLOR_FREE_BG='#FF0A0F14' # COLOR_URGENT_FG='#FFF9A299' -COLOR_URGENT_BG='#FF34322E' -COLOR_LAYOUT_FG='#FFA3A6AB' -COLOR_LAYOUT_BG='#FF34322E' -COLOR_TITLE_FG='#FFA3A6AB' -COLOR_TITLE_BG='#FF34322E' -COLOR_STATUS_FG='#FFA3A6AB' -COLOR_STATUS_BG='#FF34322E' +COLOR_URGENT_BG='#FF0A0F14' # +COLOR_LAYOUT_FG='#FF98D1CE' # +COLOR_LAYOUT_BG='#FF0A0F14' # +COLOR_TITLE_FG='#FF98D1CE' # +COLOR_TITLE_BG='#FF0A0F14' # +COLOR_STATUS_FG='#FF98D1CE' # +COLOR_STATUS_BG='#FF0A0F14' # diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist index a6e85ce..54d4da1 100644 --- a/vim/.vim/.netrwhist +++ b/vim/.vim/.netrwhist @@ -1,3 +1,5 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =1 +let g:netrw_dirhist_cnt =3 let g:netrw_dirhist_1='/home/alex/.config/bspwm' +let g:netrw_dirhist_2='/home/alex/dotfiles' +let g:netrw_dirhist_3='/home/alex/dotfiles/feh' diff --git a/vim/.vim/bundle/vim-gotham b/vim/.vim/bundle/vim-gotham new file mode 160000 index 0000000..3c5c613 --- /dev/null +++ b/vim/.vim/bundle/vim-gotham @@ -0,0 +1 @@ +Subproject commit 3c5c6130b8f87a0772f9d33e2808e30fe669b49d diff --git a/vim/.vimrc b/vim/.vimrc index ee6d808..5b1662d 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -9,7 +9,6 @@ set wildignore=*.o,*~,*.pyc set ruler syntax enable -colorscheme desert " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/Vundle.vim @@ -20,6 +19,7 @@ call vundle#begin() " let Vundle manage Vundle, required Plugin 'gmarik/Vundle.vim' Plugin 'bling/vim-airline' +Plugin 'whatyouhide/vim-gotham' " All of your Plugins must be added before the following line call vundle#end() " required filetype plugin indent on " required @@ -35,6 +35,8 @@ filetype plugin indent on " required " see :h vundle for more details or wiki for FAQ " Put your non-Plugin stuff after this line +colorscheme gotham + set laststatus=2 let g:airline_powerline_fonts = 1 let g:airline#extensions#tabline#enabled = 1 diff --git a/x/.Xresources b/x/.Xresources index 9a5a944..fbf3062 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -3,164 +3,39 @@ URxvt.keysym.Control-t: perl:tabbedex:new_tab URxvt.keysym.Control-Tab: perl:tabbedex:next_tab URxvt.keysym.Control-Shift-Tab: perl:tabbedex:prev_tab -! URxvt*rxvt-unicode (urxvt) v9.21 - released: 2014-12-31 -! URxvt*options: perl,xft,styles,combining,blink,iso14755,unicode3,encodings=eu+vn+jp+jp-ext+kr+zh+zh-ext,fade,transparent,tint,XIM,frills,selectionscrolling,wheel,slipwheel,cursorBlink,pointerBlank,scrollbars=plain+rxvt+NeXT+xterm -! URxvt*Usage: urxvt [options] [-e command args] -! URxvt*termName: string -! URxvt*geometry: geometry -! URxvt*chdir: string -! URxvt*reverseVideo: boolean -! URxvt*loginShell: boolean -! URxvt*multiClickTime: number -! URxvt*jumpScroll: boolean -! URxvt*skipScroll: boolean -! URxvt*pastableTabs: boolean -! URxvt*scrollstyle: plain URxvt*scrollBar: false -! URxvt*scrollBar_right: boolean -! URxvt*scrollBar_floating: boolean -! URxvt*scrollBar_align: mode -! URxvt*thickness: number -! URxvt*scrollTtyOutput: boolean -! URxvt*scrollTtyKeypress: boolean -! URxvt*scrollWithBuffer: boolean -! URxvt*inheritPixmap: boolean - URxvt*transparent: false -! URxvt*tintColor: color -! URxvt*shading: number -! URxvt*blurRadius: HxV -! URxvt*fading: number -! URxvt*fadeColor: color -! URxvt*utmpInhibit: boolean -! URxvt*urgentOnBell: boolean -! URxvt*visualBell: boolean -! URxvt*mapAlert: boolean -! URxvt*meta8: boolean -! URxvt*mouseWheelScrollPage: boolean -! URxvt*tripleclickwords: boolean -! URxvt*insecure: boolean -! URxvt*cursorUnderline: boolean -! URxvt*cursorBlink: boolean -! URxvt*pointerBlank: boolean -URxvt*background: #3e3e3e -URxvt*foreground: #f2f2f2 -! URxvt*foreground: #fffbe2 -! Normal -! color0 black -! color1 red -! color2 green -! color3 yellow -! color4 blue -! color5 purple -! color6 cyan -! color7 white - - URxvt*color0: #6c6c6c - URxvt*color1: #f02d5e - URxvt*color2: #26c97f - URxvt*color3: #ffc730 - URxvt*color4: #b9f42e - URxvt*color5: #ee0054 - URxvt*color6: #00d383 - URxvt*color7: #f2f2f2 - -! Light -! color8 black -! color9 red(red-pink) -! color10 green(blue-green) -! color11 yellow -! color12 blue(green) -! color13 purple(pink) -! color14 cyan(green) -! color15 white - - URxvt*color8: #6c6c6c - URxvt*color9: #f3003d - URxvt*color10: #00d574 - URxvt*color11: #ffba00 - URxvt*color12: #adf700 - URxvt*color13: #ee0054 - URxvt*color14: #00d383 - URxvt*color15: #f2f2f2 - -! URxvt*colorBD: white -! URxvt*colorIT: white -! URxvt*colorUL: color -! URxvt*colorRV: color -! URxvt*underlineColor: white -! URxvt*scrollColor: color -! URxvt*troughColor: color - URxvt*highlightColor: #202020 - URxvt*highlightTextColor: #383838 - URxvt*cursorColor: #202020 -! URxvt*cursorColor2: color -! URxvt*pointerColor: color -! URxvt*pointerColor2: color -! URxvt*borderColor: color -! URxvt*iconFile: file +URxvt*transparent: false +URxvt*highlightColor: #202020 +URxvt*highlightTextColor: #383838 URxvt*font: xft:Inconsolata for Powerline:size=10:antialias=true:hinting=true -! URxvt*boldFont: fontname -! URxvt*italicFont: fontname -! URxvt*boldItalicFont: fontname -! URxvt*intensityStyles: boolean -! URxvt*inputMethod: name -! URxvt*preeditType: style -! URxvt*imLocale: string -! URxvt*imFont: fontname -! URxvt*title: string -! URxvt*iconName: string -! URxvt*saveLines: number -! URxvt*buffered: boolean URxvt*depth: 32 -! URxvt*visual: number -! URxvt*transient-for: windowid -! URxvt*override-redirect: boolean -! URxvt*hold: boolean -! URxvt*externalBorder: number -! URxvt*internalBorder: number -! URxvt*borderLess: boolean -! URxvt*lineSpace: number - URxvt*letterSpace: -1 -! URxvt*skipBuiltinGlyphs: boolean -! URxvt*pointerBlankDelay: number -! URxvt*backspacekey: string -! URxvt*deletekey: string -! URxvt*print-pipe: string -! URxvt*modifier: modifier -! URxvt*cutchars: string -! URxvt*answerbackString: string -! URxvt*secondaryScreen: boolean -! URxvt*secondaryScroll: boolean -! URxvt*perl-lib: string -! URxvt*perl-eval: perl-eval +URxvt*letterSpace: -1 URxvt*perl-ext-common: tabbedex -! URxvt*perl-ext: string -! URxvt*iso14755: boolean -! URxvt*iso14755_52: boolean -! URxvt*xrm: string -! URxvt*keysym.sym: keysym -! URxvt*background.border: boolean -! URxvt*background.expr: string -! URxvt*background.interval: seconds -! URxvt*bell-command: string -! URxvt*kuake.hotkey: string -! URxvt*matcher.button: string -! URxvt*matcher.launcher: string -! URxvt*matcher.launcher.*: string -! URxvt*matcher.pattern.*: string -! URxvt*matcher.rend.*: string -! URxvt*remote-clipboard.fetch: string -! URxvt*remote-clipboard.store: string -! URxvt*searchable-scrollback: string -! URxvt*selection-autotransform.*: string -! URxvt*selection-pastebin.cmd: string -! URxvt*selection-pastebin.url: string -! URxvt*selection.pattern-0: string -! URxvt*tab-bg: colour -! URxvt*tab-fg: colour -! URxvt*tabbar-bg: colour -! URxvt*tabbar-fg: colour -! URxvt*url-launcher: lynx +URxvt*foreground: #98d1ce +URxvt*background: #0a0f14 +URxvt*cursorColor: #98d1ce +URxvt*color0: #0a0f14 +URxvt*color8: #10151b +URxvt*color1: #c33027 +URxvt*color9: #d26939 + +URxvt*color2: #26a98b +URxvt*color10: #081f2d + +URxvt*color3: #edb54b +URxvt*color11: #245361 + +URxvt*color4: #195465 +URxvt*color12: #093748 + +URxvt*color5: #4e5165 +URxvt*color13: #888ba5 + +URxvt*color6: #33859d +URxvt*color14: #599caa + +URxvt*color7: #98d1ce +URxvt*color15: #d3ebe9 diff --git a/zsh/.zshrc b/zsh/.zshrc index 0c9d1a4..929ab39 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,6 +1,9 @@ # Path to your oh-my-zsh installation. +cd ~/.oh-my-zsh/custom/plugins export ZSH=~/.oh-my-zsh +cd ~ + # Set name of the theme to load. # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each diff --git a/zsh/.zshrc.swp b/zsh/.zshrc.swp deleted file mode 100644 index fe3df51..0000000 Binary files a/zsh/.zshrc.swp and /dev/null differ