geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Monokai

Browse source 
Well, this is the only theme I found that had a correct vim plugin and
had enough contrast (this is important for me). The dark-brown
background is a bit sadder than the blue one I might revert to
solarized at one moment or another.
This commit is contained in:
Geoffrey Frogeye 2017-02-12 07:45:14 +01:00
parent 93ca57c9a3
commit 105f34ca50
13 changed files with 134 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Xresources
View file

@ -1,3 +1,3 @@
#include ".Xresources.d/xft" #include ".Xresources.d/xft"
#include ".Xresources.d/solarized.dark" #include ".Xresources.d/theme"
#include ".Xresources.d/xterm" #include ".Xresources.d/xterm"

56
Xresources.d/Xresources.dark
View file

@ -1,56 +0,0 @@
#define S_base03 #002b36
#define S_base02 #073642
#define S_base01 #586e75
#define S_base00 #657b83
#define S_base0 #839496
#define S_base1 #93a1a1
#define S_base2 #eee8d5
#define S_base3 #fdf6e3
*background: S_base03
*foreground: S_base0
*fadeColor: S_base03
*cursorColor: S_base1
*pointerColorBackground:S_base01
*pointerColorForeground:S_base1
#define S_yellow #b58900
#define S_orange #cb4b16
#define S_red #dc322f
#define S_magenta #d33682
#define S_violet #6c71c4
#define S_blue #268bd2
#define S_cyan #2aa198
#define S_green #859900
!! black dark/light
*color0: S_base02
*color8: S_base03
!! red dark/light
*color1: S_red
*color9: S_orange
!! green dark/light
*color2: S_green
*color10: S_base01
!! yellow dark/light
*color3: S_yellow
*color11: S_base00
!! blue dark/light
*color4: S_blue
*color12: S_base0
!! magenta dark/light
*color5: S_magenta
*color13: S_violet
!! cyan dark/light
*color6: S_cyan
*color14: S_base1
!! white dark/light
*color7: S_base2
*color15: S_base3

2
Xresources.d/configure vendored
View file

@ -1,7 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
wget "https://raw.githubusercontent.com/solarized/xresources/master/Xresources.light" -O solarized.light
wget "https://raw.githubusercontent.com/solarized/xresources/master/Xresources.dark" -O solarized.dark
mkdir -p $HOME/.local/share/fonts mkdir -p $HOME/.local/share/fonts
echo $(for i in "" "%20Bold" "%20Oblique" "%20Bold%20Oblique"; do echo $(for i in "" "%20Bold" "%20Oblique" "%20Bold%20Oblique"; do
cd $HOME/.local/share/fonts cd $HOME/.local/share/fonts

56
Xresources.d/solarized.dark
View file

@ -1,56 +0,0 @@
#define S_base03 #002b36
#define S_base02 #073642
#define S_base01 #586e75
#define S_base00 #657b83
#define S_base0 #839496
#define S_base1 #93a1a1
#define S_base2 #eee8d5
#define S_base3 #fdf6e3
*background: S_base03
*foreground: S_base0
*fadeColor: S_base03
*cursorColor: S_base1
*pointerColorBackground:S_base01
*pointerColorForeground:S_base1
#define S_yellow #b58900
#define S_orange #cb4b16
#define S_red #dc322f
#define S_magenta #d33682
#define S_violet #6c71c4
#define S_blue #268bd2
#define S_cyan #2aa198
#define S_green #859900
!! black dark/light
*color0: S_base02
*color8: S_base03
!! red dark/light
*color1: S_red
*color9: S_orange
!! green dark/light
*color2: S_green
*color10: S_base01
!! yellow dark/light
*color3: S_yellow
*color11: S_base00
!! blue dark/light
*color4: S_blue
*color12: S_base0
!! magenta dark/light
*color5: S_magenta
*color13: S_violet
!! cyan dark/light
*color6: S_cyan
*color14: S_base1
!! white dark/light
*color7: S_base2
*color15: S_base3

56
Xresources.d/solarized.light
View file

@ -1,56 +0,0 @@
#define S_base03 #002b36
#define S_base02 #073642
#define S_base01 #586e75
#define S_base00 #657b83
#define S_base0 #839496
#define S_base1 #93a1a1
#define S_base2 #eee8d5
#define S_base3 #fdf6e3
*background: S_base3
*foreground: S_base00
*fadeColor: S_base3
*cursorColor: S_base01
*pointerColorBackground:S_base1
*pointerColorForeground:S_base01
#define S_yellow #b58900
#define S_orange #cb4b16
#define S_red #dc322f
#define S_magenta #d33682
#define S_violet #6c71c4
#define S_blue #268bd2
#define S_cyan #2aa198
#define S_green #859900
!! black dark/light
*color0: S_base02
*color8: S_base03
!! red dark/light
*color1: S_red
*color9: S_orange
!! green dark/light
*color2: S_green
*color10: S_base01
!! yellow dark/light
*color3: S_yellow
*color11: S_base00
!! blue dark/light
*color4: S_blue
*color12: S_base0
!! magenta dark/light
*color5: S_magenta
*color13: S_violet
!! cyan dark/light
*color6: S_cyan
*color14: S_base1
!! white dark/light
*color7: S_base2
*color15: S_base3

36
Xresources.d/theme Normal file
View file

@ -0,0 +1,36 @@
! special
*.foreground: #f1ebeb
*.background: #272822
*.cursorColor: #f1ebeb
! black
*.color0: #48483e
*.color8: #76715e
! red
*.color1: #dc2566
*.color9: #fa2772
! green
*.color2: #8fc029
*.color10: #a7e22e
! yellow
*.color3: #d4c96e
*.color11: #e7db75
! blue
*.color4: #55bcce
*.color12: #66d9ee
! magenta
*.color5: #9358fe
*.color13: #ae82ff
! cyan
*.color6: #56b7a5
*.color14: #66efd5
! white
*.color7: #acada1
*.color15: #cfd0c2

38
bashrc
View file

@ -84,30 +84,8 @@ alias pacman='pacman --color auto'
alias x='startx; logout' alias x='startx; logout'
alias s='sudo -s -E' alias s='sudo -s -E'
# Solarized theme for tty, the dark version. if which gopass &> /dev/null; then
# Based on: alias pass='gopass'
# - Solarized (http://ethanschoonover.com/solarized)
# - Xresources from http://github.com/altercation/solarized
# Generated with pty2tty.awk by Joep van Delft
# http://github.com/joepvd/tty-solarized
if [ "$TERM" = "linux" ]; then
echo -en "\e]PB657b83" # S_base00
echo -en "\e]PA586e75" # S_base01
echo -en "\e]P0073642" # S_base02
echo -en "\e]P62aa198" # S_cyan
echo -en "\e]P8002b36" # S_base03
echo -en "\e]P2859900" # S_green
echo -en "\e]P5d33682" # S_magenta
echo -en "\e]P1dc322f" # S_red
echo -en "\e]PC839496" # S_base0
echo -en "\e]PE93a1a1" # S_base1
echo -en "\e]P9cb4b16" # S_orange
echo -en "\e]P7eee8d5" # S_base2
echo -en "\e]P4268bd2" # S_blue
echo -en "\e]P3b58900" # S_yellow
echo -en "\e]PFfdf6e3" # S_base3
echo -en "\e]PD6c71c4" # S_violet
clear # against bg artifacts
fi fi
# Utils # Utils
@ -144,3 +122,15 @@ function dafont {
alias nw="sudo systemctl restart NetworkManager" alias nw="sudo systemctl restart NetworkManager"
# Clears everything it can to save space
function emergency-space {
rm -rf $HOME/.cache
if which pacman &> /dev/null; then
sudo pacman -Scc
elif which apt-get &> /deb/null; then
sudo apt-get clean
fi
if which journalctl &> /dev/null; then
sudo journalctl --vacuum-size=100M
fi
}

2
config/htop/htoprc
View file

@ -1,7 +1,7 @@
# Beware! This file is rewritten by htop when settings are changed in the interface. # Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly. # The parser is also very primitive, and not human-friendly.
fields=0 48 17 18 38 39 40 2 46 47 49 1 fields=0 48 17 18 38 39 40 2 46 47 49 1
sort_key=46 sort_key=47
sort_direction=1 sort_direction=1
hide_threads=0 hide_threads=0
hide_kernel_threads=0 hide_kernel_threads=0

48
config/i3/config
View file

@ -357,6 +357,26 @@ mode "$mode_temp" {
bindsym Escape mode "default" bindsym Escape mode "default"
} }
# Colors
set $bg #272822
set $fg #f1ebeb
set $00 #48483e
set $01 #dc2566
set $02 #8fc029
set $03 #d4c96e
set $04 #55bcce
set $05 #9358fe
set $06 #56b7a5
set $07 #acada1
set $08 #76715e
set $09 #fa2772
set $10 #a7e22e
set $11 #e7db75
set $12 #66d9ee
set $13 #ae82ff
set $14 #66efd5
set $15 #cfd0c2
# Start i3bar to display a workspace bar (plus the system information i3status if available) # Start i3bar to display a workspace bar (plus the system information i3status if available)
bar { bar {
#i3bar_command ~/.config/lemonbar/i3_lemonbar.sh #i3bar_command ~/.config/lemonbar/i3_lemonbar.sh
@ -367,13 +387,13 @@ bar {
font pango:DejaVu Sans Mono 9 font pango:DejaVu Sans Mono 9
font pango:Sans 8 font pango:Sans 8
colors { colors {
separator #4E9C00 separator $08
background #333333 background $00
statusline #FFFFFF statusline $fg
focused_workspace #4E9C00 #4E9C00 #FFFFFF focused_workspace $02 $02 $bg
active_workspace #333333 #333333 #FFFFFF active_workspace $00 $03 $08
inactive_workspace #333333 #222222 #888888 inactive_workspace $00 $08 $fg
urgent_workspace #C20000 #C20000 #FFFFFF urgent_workspace $00 $01 $fg
} }
} }
@ -402,8 +422,14 @@ exec --no-startup-id $HOME/.config/i3/clipmenud # Clipboard manager
#exec --no-startup-id evolution #exec --no-startup-id evolution
#exec --no-startup-id pidgin #exec --no-startup-id pidgin
set $ignore #ff00000
# Theme colors # Theme colors
client.focused #4E9C00 #4E9C00 #FFFFFF #FFFFFF # class border backgr. text indicator child_border
client.focused_inactive #1B3600 #1B3600 #888888 #FFFFFF client.focused $02 $02 $bg $07 $10
client.unfocused #333333 #333333 #888888 #FFFFFF client.focused_inactive $03 $03 $08 $15 $14
client.urgent #C20000 #C20000 #FFFFFF #FFFFFF client.unfocused $08 $08 $fg $11 $00
client.urgent $01 $01 $fg $05 $09
client.placeholder $ignore $06 $fg $ignore $14
client.background $15

24
config/linuxColors.sh Normal file
View file

@ -0,0 +1,24 @@
#!/bin/sh
if [ "$TERM" = "linux" ]; then
/bin/echo -e "
\e]P048483e
\e]P1dc2566
\e]P28fc029
\e]P3d4c96e
\e]P455bcce
\e]P59358fe
\e]P656b7a5
\e]P7acada1
\e]P876715e
\e]P9fa2772
\e]PAa7e22e
\e]PBe7db75
\e]PC66d9ee
\e]PDae82ff
\e]PE66efd5
\e]PFcfd0c2
"
# get rid of artifacts
clear
fi

5
profile
View file

@ -5,4 +5,9 @@ if [ -z "$SSH_AUTH_SOCK" ] ; then
eval `ssh-agent -s` > /dev/null eval `ssh-agent -s` > /dev/null
fi fi
if [ -f "$HOME/.config/linuxColors.sh" ]; then
source "$HOME/.config/linuxColors.sh"
fi
[[ -f ~/.bashrc ]] && . ~/.bashrc [[ -f ~/.bashrc ]] && . ~/.bashrc

7
scripts/installPreferences.sh
View file

@ -176,7 +176,12 @@ function install-preferences {
inst tsu inst tsu
fi fi
fi fi
inst moreutils screen ncdu lsof htop proxytunnel pass pv curl wget sshfs netcat inst moreutils screen ncdu lsof htop proxytunnel pv curl wget sshfs netcat mosh
if [ $ARCH == 1 ]; then
inst gopass
else
inst pass
fi
if [[ $ARCH == 1 && $ROOT == 1 ]]; then if [[ $ARCH == 1 && $ROOT == 1 ]]; then
inst pkgfile inst pkgfile
systemctl enable pkgfile-update.timer systemctl enable pkgfile-update.timer

16
vimrc
View file

@ -13,7 +13,7 @@ Plugin 'gmarik/Vundle.vim'
Plugin 'L9' Plugin 'L9'
Plugin 'rstacruz/sparkup', {'rtp': 'vim/'} Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
Plugin 'altercation/vim-colors-solarized' Plugin 'tomasr/molokai'
Bundle 'Shougo/neosnippet' Bundle 'Shougo/neosnippet'
Bundle 'Shougo/neosnippet-snippets' Bundle 'Shougo/neosnippet-snippets'
Plugin 'tpope/vim-surround' Plugin 'tpope/vim-surround'
@ -24,8 +24,8 @@ Plugin 'vim-airline/vim-airline-themes'
Plugin 'airblade/vim-gitgutter' Plugin 'airblade/vim-gitgutter'
Plugin 'kien/ctrlp.vim' Plugin 'kien/ctrlp.vim'
Plugin 'mbbill/undotree' Plugin 'mbbill/undotree'
Plugin 'scrooloose/nerdtree' "Plugin 'scrooloose/nerdtree'
Plugin 'Xuyuanp/nerdtree-git-plugin' "Plugin 'Xuyuanp/nerdtree-git-plugin'
Plugin 'xolox/vim-misc' Plugin 'xolox/vim-misc'
Plugin 'xolox/vim-easytags' Plugin 'xolox/vim-easytags'
Plugin 'majutsushi/tagbar' Plugin 'majutsushi/tagbar'
@ -33,7 +33,9 @@ Plugin 'majutsushi/tagbar'
Plugin 'wellle/targets.vim' Plugin 'wellle/targets.vim'
Plugin 'Chiel92/vim-autoformat' Plugin 'Chiel92/vim-autoformat'
Plugin 'Valloric/YouCompleteMe' Plugin 'Valloric/YouCompleteMe'
Plugin 'Raimondi/delimitMate' "Plugin 'Raimondi/delimitMate'
"Plugin 'Cocophotos/vim-ycm-latex-semantic-completer'
"Plugin 'IN3D/vim-raml'
call vundle#end() " required call vundle#end() " required
filetype plugin indent on " required filetype plugin indent on " required
@ -57,6 +59,7 @@ let g:airline#extensions#tabline#enabled = 1
let g:airline_section_a = airline#section#create(['mode']) let g:airline_section_a = airline#section#create(['mode'])
let g:airline_section_b = airline#section#create(['branch', 'hunks']) let g:airline_section_b = airline#section#create(['branch', 'hunks'])
let g:airline_section_z = airline#section#create(['%B', '@', '%l', ':', '%c']) let g:airline_section_z = airline#section#create(['%B', '@', '%l', ':', '%c'])
let g:airline_theme = 'wombat'
""" NERDTREE-GIT-PLUGIN """ """ NERDTREE-GIT-PLUGIN """
@ -111,9 +114,10 @@ set cursorcolumn
syntax enable syntax enable
"set t_Co=256
"let g:molokai_original = 1
set background=dark set background=dark
set t_Co=256 colorscheme molokai
colorscheme solarized
" From http://stackoverflow.com/a/5004785/2766106 " From http://stackoverflow.com/a/5004785/2766106
set list set list