From efadbafb79535ebfafd37494e3e61cbdbfa4a4ec Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 4 Aug 2015 14:05:12 +0200 Subject: Fix password for gmail --- Xresources | 53 ------------------------------------------- Xresources.dark | 28 ----------------------- Xresources.default | 29 ----------------------- Xresources.light | 28 ----------------------- Xresources/Xresources | 53 +++++++++++++++++++++++++++++++++++++++++++ Xresources/Xresources.dark | 28 +++++++++++++++++++++++ Xresources/Xresources.default | 29 +++++++++++++++++++++++ Xresources/Xresources.light | 28 +++++++++++++++++++++++ bookmarks | 4 ++-- i3/config | 17 +++++++++----- ncmpcpp/config | 2 +- passwords/main.asc | 45 ++++++++++++------------------------ repos.zsh | 9 ++++---- todo | 0 vim/.netrwhist | 6 ++++- xinitrc | 4 ++-- xsession | 1 - zshrc | 6 ++--- 18 files changed, 180 insertions(+), 190 deletions(-) delete mode 100644 Xresources delete mode 100644 Xresources.dark delete mode 100644 Xresources.default delete mode 100644 Xresources.light create mode 100644 Xresources/Xresources create mode 100644 Xresources/Xresources.dark create mode 100644 Xresources/Xresources.default create mode 100644 Xresources/Xresources.light delete mode 100644 todo delete mode 120000 xsession diff --git a/Xresources b/Xresources deleted file mode 100644 index 96582a7..0000000 --- a/Xresources +++ /dev/null @@ -1,53 +0,0 @@ -! XTERM ! - -! Appearance xterm -*xterm*faceName: Monaco -*xterm*faceSize: 11 -*xterm*background: Black -*xterm*foreground: White -*xterm*cursorColor: Green - -! Copy-paste support -XTerm*selectToClipboard: true - -! URXVT ! - -! General settings -URxvt.loginShell : true -URxvt.termName : rxvt-256color - -! Custom META key -URxvt*modifier: alt - -! Copy-paste configuration -URxvt.clipboard.copycmd: xclip -i -selection clipboard -URxvt.clipboard.pastecmd: xclip -o -selection clipboard - -! Perl extensions configuration -URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,fullscreen -URxvt.url-select.launcher: /usr/bin/uzbl -URxvt.url-select.underline: true - -! Key bindings for extensions -URxvt.keysym.M-Escape: perl:keyboard-select:activate -URxvt.keysym.M-s: perl:keyboard-select:search -URxvt.keysym.M-u: perl:url-select:select_next -URxvt.keysym.M-y: perl:clipboard:copy -URxvt.keysym.M-p: perl:clipboard:paste -URxvt.keysym.F11: perl:fullscreen:switch - -! Appearance -! URxvt*font: xft:DejaVu Sans Mono:size=12 -URxvt*font: xft:monaco:size=11:antialias=false -URxvt*scrollBar: false -URxvt*internalBorder: 0 - -! True transparency -URxvt.depth: 32 - -! Font configuration -! Xft.dpi: 96 -! Xft.antialias: false -! Xft.hinting: true -! Xft.rgba: rgb -! Xft.hintstyle: hintslight diff --git a/Xresources.dark b/Xresources.dark deleted file mode 100644 index ab44f0d..0000000 --- a/Xresources.dark +++ /dev/null @@ -1,28 +0,0 @@ -# include "/home/urbain/.Xresources" - -URxvt.borderColor: #002b36 - -*background: #002b36 -*foreground: #839496 -*fadeColor: #002b36 -*cursorColor: #93a1a1 - -*pointerColorBackground: #586e75 -*pointerColorForeground: #93a1a1 - -*color0: #073642 -*color8: #002b36 -*color1: #dc322f -*color9: #cb4b16 -*color2: #859900 -*color10: #586e75 -*color3: #b58900 -*color11: #657b83 -*color4: #268bd2 -*color12: #839496 -*color5: #d33682 -*color13: #6c71c4 -*color6: #2aa198 -*color14: #93a1a1 -*color7: #eee8d5 -*color15: #fdf6e3 diff --git a/Xresources.default b/Xresources.default deleted file mode 100644 index c3af2bd..0000000 --- a/Xresources.default +++ /dev/null @@ -1,29 +0,0 @@ -# include "/home/urbain/.Xresources" - -! Border color -URxvt.borderColor: #3a3a3a - -! Background / Foreground -URxvt*background: #3a3a3a -URxvt*foreground: #d0d0d0 - -! Other colors -URxvt*color0: #4e4e4e -URxvt*color1: #d68787 -URxvt*color2: #5f865f -URxvt*color3: #d8af5f -URxvt*color4: #85add4 -URxvt*color5: #d7afaf -URxvt*color6: #87afaf -URxvt*color7: #d0d0d0 -URxvt*color8: #626262 -URxvt*color9: #d75f87 -URxvt*color10: #87af87 -URxvt*color11: #ffd787 -URxvt*color12: #add4fb -URxvt*color13: #ffafaf -URxvt*color14: #87d7d7 -URxvt*color15: #e4e4e4 -URxvt*cursorColor: #d0d0d0 -URxvt*cursorColor2: #3a3a3a -URxvt*colorBD: #e4e4e4 diff --git a/Xresources.light b/Xresources.light deleted file mode 100644 index b8d4012..0000000 --- a/Xresources.light +++ /dev/null @@ -1,28 +0,0 @@ -# include "/home/urbain/.Xresources" - -URxvt.borderColor: #fdf6e3 - -*background: #fdf6e3 -*foreground: #657b83 -*fadeColor: #fdf6e3 -*cursorColor: #586e75 - -*pointerColorBackground: #93a1a1 -*pointerColorForeground: #586e75 - -*color0: #073642 -*color8: #002b36 -*color1: #dc322f -*color9: #cb4b16 -*color2: #859900 -*color10: #586e75 -*color3: #b58900 -*color11: #657b83 -*color4: #268bd2 -*color12: #839496 -*color5: #d33682 -*color13: #6c71c4 -*color6: #2aa198 -*color14: #93a1a1 -*color7: #eee8d5 -*color15: #fdf6e3 diff --git a/Xresources/Xresources b/Xresources/Xresources new file mode 100644 index 0000000..96582a7 --- /dev/null +++ b/Xresources/Xresources @@ -0,0 +1,53 @@ +! XTERM ! + +! Appearance xterm +*xterm*faceName: Monaco +*xterm*faceSize: 11 +*xterm*background: Black +*xterm*foreground: White +*xterm*cursorColor: Green + +! Copy-paste support +XTerm*selectToClipboard: true + +! URXVT ! + +! General settings +URxvt.loginShell : true +URxvt.termName : rxvt-256color + +! Custom META key +URxvt*modifier: alt + +! Copy-paste configuration +URxvt.clipboard.copycmd: xclip -i -selection clipboard +URxvt.clipboard.pastecmd: xclip -o -selection clipboard + +! Perl extensions configuration +URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,fullscreen +URxvt.url-select.launcher: /usr/bin/uzbl +URxvt.url-select.underline: true + +! Key bindings for extensions +URxvt.keysym.M-Escape: perl:keyboard-select:activate +URxvt.keysym.M-s: perl:keyboard-select:search +URxvt.keysym.M-u: perl:url-select:select_next +URxvt.keysym.M-y: perl:clipboard:copy +URxvt.keysym.M-p: perl:clipboard:paste +URxvt.keysym.F11: perl:fullscreen:switch + +! Appearance +! URxvt*font: xft:DejaVu Sans Mono:size=12 +URxvt*font: xft:monaco:size=11:antialias=false +URxvt*scrollBar: false +URxvt*internalBorder: 0 + +! True transparency +URxvt.depth: 32 + +! Font configuration +! Xft.dpi: 96 +! Xft.antialias: false +! Xft.hinting: true +! Xft.rgba: rgb +! Xft.hintstyle: hintslight diff --git a/Xresources/Xresources.dark b/Xresources/Xresources.dark new file mode 100644 index 0000000..05660f5 --- /dev/null +++ b/Xresources/Xresources.dark @@ -0,0 +1,28 @@ +# include "/home/urbain/.Xresources/Xresources" + +URxvt.borderColor: #002b36 + +*background: #002b36 +*foreground: #839496 +*fadeColor: #002b36 +*cursorColor: #93a1a1 + +*pointerColorBackground: #586e75 +*pointerColorForeground: #93a1a1 + +*color0: #073642 +*color8: #002b36 +*color1: #dc322f +*color9: #cb4b16 +*color2: #859900 +*color10: #586e75 +*color3: #b58900 +*color11: #657b83 +*color4: #268bd2 +*color12: #839496 +*color5: #d33682 +*color13: #6c71c4 +*color6: #2aa198 +*color14: #93a1a1 +*color7: #eee8d5 +*color15: #fdf6e3 diff --git a/Xresources/Xresources.default b/Xresources/Xresources.default new file mode 100644 index 0000000..f9f6b1b --- /dev/null +++ b/Xresources/Xresources.default @@ -0,0 +1,29 @@ +# include "/home/urbain/.Xresources/Xresources" + +! Border color +URxvt.borderColor: #3a3a3a + +! Background / Foreground +URxvt*background: #3a3a3a +URxvt*foreground: #d0d0d0 + +! Other colors +URxvt*color0: #4e4e4e +URxvt*color1: #d68787 +URxvt*color2: #5f865f +URxvt*color3: #d8af5f +URxvt*color4: #85add4 +URxvt*color5: #d7afaf +URxvt*color6: #87afaf +URxvt*color7: #d0d0d0 +URxvt*color8: #626262 +URxvt*color9: #d75f87 +URxvt*color10: #87af87 +URxvt*color11: #ffd787 +URxvt*color12: #add4fb +URxvt*color13: #ffafaf +URxvt*color14: #87d7d7 +URxvt*color15: #e4e4e4 +URxvt*cursorColor: #d0d0d0 +URxvt*cursorColor2: #3a3a3a +URxvt*colorBD: #e4e4e4 diff --git a/Xresources/Xresources.light b/Xresources/Xresources.light new file mode 100644 index 0000000..993b040 --- /dev/null +++ b/Xresources/Xresources.light @@ -0,0 +1,28 @@ +# include "/home/urbain/.Xresources/Xresources" + +URxvt.borderColor: #fdf6e3 + +*background: #fdf6e3 +*foreground: #657b83 +*fadeColor: #fdf6e3 +*cursorColor: #586e75 + +*pointerColorBackground: #93a1a1 +*pointerColorForeground: #586e75 + +*color0: #073642 +*color8: #002b36 +*color1: #dc322f +*color9: #cb4b16 +*color2: #859900 +*color10: #586e75 +*color3: #b58900 +*color11: #657b83 +*color4: #268bd2 +*color12: #839496 +*color5: #d33682 +*color13: #6c71c4 +*color6: #2aa198 +*color14: #93a1a1 +*color7: #eee8d5 +*color15: #fdf6e3 diff --git a/bookmarks b/bookmarks index aa9a61f..d9cc26d 100644 --- a/bookmarks +++ b/bookmarks @@ -1,9 +1,9 @@ paper : /home/urbain/Dropbox/phd/papers/spectral presentation : /home/urbain/Dropbox/phd/presentations/spectral develop : /home/urbain/Dropbox/phd/code/spectral/develop -code : /home/urbain/Dropbox/phd/code/spectral report : /home/urbain/Dropbox/phd/reports/esa github : /home/urbain/github -phd : /home/urbain/Dropbox/phd dotfiles : /home/urbain/dotfiles feature : /home/urbain/Dropbox/phd/code/spectral/feature +code : /home/urbain/Dropbox/phd/code/spectral +phd : /home/urbain/Dropbox/phd diff --git a/i3/config b/i3/config index 9cfcff6..3fb2a37 100644 --- a/i3/config +++ b/i3/config @@ -159,15 +159,20 @@ bar { status_command i3status } -# Personal Customization - +# Workspaces bindsym $mod+Tab workspace back_and_forth +bindsym $mod+comma workspace prev +bindsym $mod+period workspace next -# Shortcuts +# Programs shortcuts bindsym $mod+b exec chromium-browser -# Init script -exec $HOME/.xinitrc +# Configuration +bindsym F1 exec $HOME/.xinitrc # Font -font xft:Droid Sans Mono 10 +# font xft:Droid Sans Mono 10 + +# Init script +exec /home/urbain/.xinitrc +exec /home/urbain/.xmodmap diff --git a/ncmpcpp/config b/ncmpcpp/config index 3b3b3dc..ae1f77b 100644 --- a/ncmpcpp/config +++ b/ncmpcpp/config @@ -28,7 +28,7 @@ ncmpcpp_directory = "~/.ncmpcpp" # # mpd_host = "192.168.0.20" -mpd_host = "192.168.1.5" +mpd_host = "192.168.1.10" # mpd_port = "6600" # diff --git a/passwords/main.asc b/passwords/main.asc index b8ff442..e284c92 100644 --- a/passwords/main.asc +++ b/passwords/main.asc @@ -1,35 +1,18 @@ -----BEGIN PGP MESSAGE----- Version: GnuPG v1 -<<<<<<< HEAD -hQIMA2AwAsuYqCfXAQ//Rh9CxPBXFCTJWb50Leo+ajlLyNp24f18iKgHajWCWl+L -LnHZULza+gGDCZ0nCx5j0R8KLLmzBm7OtHQeinGt6GA5hn6eswjHUhRK5JJmmaU/ -0YICerPyxAMwb/ilseH9dzyJEWsfh37vK8+ErxlsaOSDseWTGpI9rSAo2jUucx3C -0HJo1mXz6CTFjqy/DzwVnuXWEB4eFLyp7u68oHUK8OB2hWAVNjqTEZO5hAfpC/+A -b2a1UKUdPMxTOkyfj7BcZN2vQZbw/j/h4LzLcu6CulpC5qG2/n4zFfoHyKNlzKGg -SLzilb2dRLz572jVuyHwfvU2qjbty/py5uuyxjSermmi1vRbgHxEEJ3zKARTKePb -9IxxBRFej4N7QHyU9HSIwMcq/5F0wanTddr9gpmA6KJDbJ+X5OKJ16TtNj2gbj7w -re2EFoms5EKOiDplTo9A0ssUzvN4mNmip9JbGKOf5s6kCgkBGVU4Zreo+Rv7h9B1 -x+42TjozDOkOsyikW+wVCWl6K32SgVREXeBhG1t9Z1QQCdHKWNi/oc5lreisX+co -3mQepxyk7/ypLJOxkyUjLqfVmLQUwZ/DLbtnYITA9XmuwfeAlRThj0LhVT4eRjW5 -/fxvTee2bbNp89nBSUv1CbW/DVkgCY82QsOMuI1RbYxjnN9zV/VEM+j9O9EEJGjS -SwFdNekRg7yThIt1NpeYZO5CYbxF6dPE4bK7Xk3mBnlK1mfN13DiGZQLQBcbdLhE -NsllvDHSGxV6JZ5SQWlX2tV7jdnt2mzsGV0OTQ== -=wQzI -======= -hQIMA2AwAsuYqCfXARAAlhm8lNd42G6z48Ox7gGPkbEaLhN5ujX7mjZfsI5nwoQw -pASBnrOdhQQPPu0QLTmCmnHNIsTc8lcH4WJ00d7txyRZRFdxVdKtb2qLSyHgleEG -7xDy3svWRRHaRmPpzCBPvQ/zmD728ZFELcgrY5/VdG4XMQ7XQLt4fCFM825L4htv -3ReCW9s5Ex6ifviAhKIJABCwN2P0O7iKgUHn4Nclfdxq+K79ztoJBvAFLwslk9la -MawPpbEORx9Y1GnZJZp1Cz6ZAWuwGbV5e31+twsbOOMHTR/UflxOCZVqvXr+KwCW -QeEdYgOmFj4A4YQAB0zHl7Pok5A7zUgI1Su+lJcHK7vVr5ZdaHR0w+qTBt72h5G+ -+buySGN0b0zypyS4AkQB8CfVcl8JMZJuTH3NervvY16hvZ/spWkVpwszjhgivVkL -9NzhcrUofnnxI10AoyTbb7sKgcwnxufgamoCOEdDZwGxANx1DxDw7UMPNOgB9D7/ -6acqBgopqhjDfuNoV4BSFuK0xjhtQ/+MHW0ri82htGirQAToz1uy2k7K0rah5R3R -4jUe3AWB3VCdFDpjlCdLWWpw0pv2Nfr0f/89HsWaLf9DDwk5HzeCiEO9a3gPMcff -A7TbTX1P8/XEQQRSKoZ0FK4hLa1xVJMXedC+yUsc1v9O/brpnoocCgUIuyptZ5LS -SwEZdECMFBCaJfVL6a7oKFkKE6JyHGguwdRbp9WQY1M1eSr2X1cKmayMHs4ZpQxN -WRPiMvRU3SmTH8OfTtJ3ge6bAdfZ4RpNMu6bQg== -=TddI ->>>>>>> 198ed10e9c4c725808e68aeb6885446d6d586f24 +hQIMA2AwAsuYqCfXAQ//blWCbEjK0MvbTlB/V6F2S6TmPdnen0CZ9e7l2Ix5Vkd7 +MdUiNVZoIp2dbkw/3S3dxh+v1koMrfuzV4vdRhF0kZyrX4RLRkTQP0B9q8OJYPre +6NY7VS4WWQpiRT4qiFgsMsVvdZp2vqHmVHp2fRwWl3cMNkWNSuBNMoT8a2wA3bMi +4r0RIdKDVa7jM9+g4TwbnuQ0z9jR3NqFMk4lKs7NeRMbg6AotyimKEbm+qbpKxnA +00GeGdV/CbiDfwEUKh+UYLLrD1p9thCsJkO64uVyskmcZHT49k+PXUieESLDSpOP +7nPmS9dGsPmsBmpI2MDei8EEN+6ALdlrxd7FQHc7FTOVOPwLPawS3FKF0GPxDdfq +gW50KFq9lm42wZdcNoai5kLgYlVoyf1WnA7wiIi8pPQZKjSgcLm6mCAV+hehF9vf +t2FUoNx6cMI4+eMWEaoK9lPpVe1Ejxac1NZJCTZt9dqjL6sjZB4h/O9PEPzaJWn7 +O4DbUx+GkiFWYdETa9C1Dhy1fuA12CPGqbM1DP92bCCQXnG3dfjR3AVWbQ4RcjdX +BFE2blsQuP4+/d0DjJdY645wb/m9WS02TYgHuENVXq9LZ5OV3Es6g7xSSEVHhp3a +TN2RPwna2YPjCC45wcqXFdfkT3bQFogOjdYQgWWj1S3PPyI/5+D4aAKqJjNYPu3S +SwH0IjgFdLIBxjm9DJm4u47MKQ3jDFczYIgRl/BrgdldTjTDjQkIP/GyCFv9ODHH +tp3zYiJJLuls3RBiUgqzZvLE1Hw/eIHt/CtVMQ== +=hmGk -----END PGP MESSAGE----- diff --git a/repos.zsh b/repos.zsh index 888682f..95b0fa2 100644 --- a/repos.zsh +++ b/repos.zsh @@ -1,4 +1,6 @@ -declare -A repodirs install uninstall +declare -A repodirs +declare -A install +declare -A uninstall # General purpose repodirs[icholy/ttygif]=/home/urbain/github/ttygif @@ -17,16 +19,13 @@ repodirs[atweiden/fzf-extras]=/home/urbain/github/fzf-extras # Plugin managers repodirs[junegunn/vim-plug]=/home/urbain/.vim/vim-plug repodirs[tmux-plugins/tpm]=/home/urbain/.tmux/plugins/tpm -repodirs[tarjoilija/zgen]=/home/urbain/.zgen +# repodirs[tarjoilija/zgen]=/home/urbain/.zgen # Experimental repodirs[adbrebs/taxi]=/home/urbain/github/adbrebs/taxi repodirs[adbrebs/meg]=/home/urbain/github/adbrebs/meg repodirs[adbrebs/brain_segmentation]=/home/urbain/github/adbrebs/brain_segmentation -# Experimental -repodirs[adbrebs/taxi]=/home/urbain/github/taxi - # Installation function after_vimplug { cd .. diff --git a/todo b/todo deleted file mode 100644 index e69de29..0000000 diff --git a/vim/.netrwhist b/vim/.netrwhist index 6cd9ac6..e0e2d39 100644 --- a/vim/.netrwhist +++ b/vim/.netrwhist @@ -1,5 +1,9 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =3 +let g:netrw_dirhist_cnt =7 let g:netrw_dirhist_1='/home/urbain/dotfiles/ncmpcpp' let g:netrw_dirhist_2='/etc/NetworkManager' let g:netrw_dirhist_3='/etc/NetworkManager/dnsmasq.d' +let g:netrw_dirhist_4='/home/urbain/.gnupg/private-keys-v1.d' +let g:netrw_dirhist_5='/home/urbain/.gnupg' +let g:netrw_dirhist_6='/home/urbain/dotfiles' +let g:netrw_dirhist_7='/home/urbain/dotfiles/passwords' diff --git a/xinitrc b/xinitrc index 2e100d6..211eb34 100755 --- a/xinitrc +++ b/xinitrc @@ -10,7 +10,7 @@ setxkbmap us -variant dvp $HOME/.xmodmap # Set colorscheme to light -export COLORSCHEME=default +export COLORSCHEME=dark # Load Xresources to light colorscheme -xrdb $HOME/.Xresources.default +xrdb $HOME/.Xresources/Xresources.dark diff --git a/xsession b/xsession deleted file mode 120000 index 5539532..0000000 --- a/xsession +++ /dev/null @@ -1 +0,0 @@ -xinitrc \ No newline at end of file diff --git a/zshrc b/zshrc index d7555a7..0cfa521 100644 --- a/zshrc +++ b/zshrc @@ -159,15 +159,15 @@ fi # Colors # export TERM=xterm-256color -export COLORSCHEME=dark +export COLORSCHEME=light function colo { # Change colors for current session - $HOME/.bin/recolor.sh < ~/.Xresources.$1 + $HOME/.bin/recolor.sh < ~/.Xresources/Xresources.$1 # Load Xresources file for future sessions - xrdb ~/.Xresources.$1 + xrdb ~/.Xresources/Xresources.$1 # Change environment variable export COLORSCHEME=$1 -- cgit v1.2.3