From a0f4ffbbc3b1a48e5840015dd4440decb9dd5b52 Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Mon, 7 Nov 2016 15:32:44 +1300 Subject: [PATCH] Replace urxvt with termite due to incorrect font rendering --- Makefile | 9 ++++---- README.md | 3 ++- termite/.config/termite/config | 42 ++++++++++++++++++++++++++++++++++ urxvt/.Xresources | 41 --------------------------------- zsh/.zshrc | 4 ++-- 5 files changed, 51 insertions(+), 48 deletions(-) create mode 100644 termite/.config/termite/config delete mode 100644 urxvt/.Xresources diff --git a/Makefile b/Makefile index 08586b0..d61fd02 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ help: @echo "nvim > neovim config & plugins" @echo "ssh > safe-ish ssh config" @echo "sway > minimal tiling wm for naughty computers" + @echo "termite > terminal colours & keyboard settings" @echo "tmux > tmux config" - @echo "urxvt > terminal colours & keyboard settings" @echo "wallpapers > system wallpapers" @echo "weechat > irc client ui/colour configuration" @echo "zsh > shell, aliases and cool stuff" @@ -50,13 +50,13 @@ ssh: sway: @stow -t ~/ --no-folding sway +termite: + @stow -t ~/ --no-folding termite + tmux: git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm @stow -t ~/ --no-folding tmux -urxvt: - @stow -t ~/ --no-folding urxvt - wallpapers: @stow -t ~/ --no-folding wallpapers @@ -66,6 +66,7 @@ weechat: zsh: git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh git clone https://github.com/zsh-users/zsh-completions.git ~/.oh-my-zsh/custom/plugins/zsh-completions + git clone https://github.com/bhilburn/powerlevel9k.git ~/.oh-my-zsh/custom/themes/powerlevel9k @stow -t ~/ --no-folding zsh clean: diff --git a/README.md b/README.md index 36e32e1..38e6492 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # dotfiles & system setup ``` +bin > helpful shell scripts git > global git config & aliases lftp > sftp management mail > mail config - mutt/mbsync @@ -10,8 +11,8 @@ npm > npm configuration (ha ha) nvim > neovim config & plugins ssh > safe-ish ssh config sway > minimal tiling wm for naughty computers +termite > terminal colours & keyboard settings tmux > tmux config -urxvt > terminal colours & keyboard settings wallpapers > system wallpapers weechat > irc client ui/colour configuration zsh > shell, aliases and cool stuff diff --git a/termite/.config/termite/config b/termite/.config/termite/config new file mode 100644 index 0000000..bbb0311 --- /dev/null +++ b/termite/.config/termite/config @@ -0,0 +1,42 @@ +[options] +font = DejaVu Sans Mono for Powerline 10 + +[colors] + +# monokai + +# bg/fg +background = #272822 +foreground = #f8f8f2 + +# black +color0 = #272822 +color8 = #75715e + +# red +color1 = #f92672 +color9 = #f92672 + +# green +color2 = #a6e22e +color10 = #a6e22e + +# yellow +color3 = #f4bf75 +color11 = #f4bf75 + +# blue +color4 = #66d9ef +color12 = #66d9ef + +# magenta +color5 = #ae81ff +color13 = #ae81ff + +# cyan +color6 = #a1efe4 +color14 = #a1efe4 + +# white +color7 = #f8f8f2 +color15 = #f9f8f5 diff --git a/urxvt/.Xresources b/urxvt/.Xresources deleted file mode 100644 index 2864f5c..0000000 --- a/urxvt/.Xresources +++ /dev/null @@ -1,41 +0,0 @@ -! monokai colours -URxvt.background: #272822 -URxvt.foreground: #f8f8f2 -URxvt.color0: #272822 -URxvt.color1: #f92672 -URxvt.color2: #a6e22e -URxvt.color3: #f4bf75 -URxvt.color4: #66d9ef -URxvt.color5: #ae81ff -URxvt.color6: #a1efe4 -URxvt.color7: #f8f8f2 -URxvt.color8: #75715e -URxvt.color9: #f92672 -URxvt.color10: #a6e22e -URxvt.color11: #f4bf75 -URxvt.color12: #66d9ef -URxvt.color13: #ae81ff -URxvt.color14: #a1efe4 -URxvt.color15: #f9f8f5 - -! powerline font -URxvt.font: xft:DejaVu\ Sans\ Mono\ for\ Powerline:size=10:antialias=true:hinting=true - -! font config -xft.autohint: 0 -xft.lcdfilter: lcddefault -xft.hintstyle: hintslight -xft.hinting: 1 -xft.antialias: 1 -xft.rgba: rgb - -! remove scroll bar -URxvt.scrollBar: false - -! remove internal border -URxvt.internalBorder: 0 - -! perl extensions: clickable urls -URxvt.perl-ext-common: default,matcher -URxvt.url-launcher: /usr/bin/xdg-open -URxvt.matcher.button: 1 diff --git a/zsh/.zshrc b/zsh/.zshrc index 1c99068..713e5b5 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -2,14 +2,14 @@ export ZSH=$HOME/.oh-my-zsh # Theme -ZSH_THEME="ys" +ZSH_THEME="ys" #powerlevel9k/powerlevel9k" # Disable updates DISABLE_UPDATE_PROMPT=true DISABLE_AUTO_UPDATE=true # Plugins -plugins=(archlinux common-aliases git sudo ssh-agent rust colored-man-pages) +plugins=(archlinux common-aliases git sudo ssh-agent rust colored-man-pages gpg-agent) # ZSH-Completions plugins+=(zsh-completions)