commit 6e98d3ecf0d8a87d7a525e667ea43a2745593c92
parent f34019b52222b71b2e49af00de645110c33819b8
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Thu, 13 Apr 2017 11:47:03 +0200
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
7 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/Xdefaults b/Xdefaults
@@ -50,11 +50,10 @@ URxvt.keysym.M-v: perl:clipboard:paste
URxvt.keysym.M-C-v: perl:clipboard:paste_escaped
rofi.width: 100
rofi.location: 2
-rofi.fg: white
-rofi.bg: black
-rofi.font: "Terminus 8"
-rofi.hlbg: green
-rofi.hlfg: black
+rofi.color-normal: #000000, #FFFFFF, #222222, #008800, #FFFFFF
+rofi.color-urgent: #000000, #FFFFFF, #222222, #008800, #FFFFFF
+rofi.color-active: #000000, #FFFFFF, #222222, #008800, #FFFFFF
+rofi.color-window: #000000, #002b36, #002b36
URxvt*iso14755: False
URxvt.color12: CornflowerBlue
URxvt.intensityStyles: false
diff --git a/apt/desktop b/apt/desktop
@@ -85,9 +85,6 @@ totem
vlc
mpv
-libpango1.0-dev # rofi
-libpangoxft-1.0-0 # rofi
-
electrum # bitcoin client
compton # to try and solve tearing
@@ -114,3 +111,6 @@ xournal # draw on PDF
josm # don't bother having a more recent version
+gnome-clocks # measure time
+
+rofi
diff --git a/apt/server b/apt/server
@@ -13,7 +13,6 @@ pigz
lrzip
liblz4-tool
-vrms
sqlite3
sshfs
apt-rdepends
diff --git a/i3/config b/i3/config
@@ -30,6 +30,7 @@ bindsym $mod+b exec "firefox"
bindsym $mod+o exec "urxvtcdfont -e ~/bin/my-mutt"
bindsym $mod+i exec "urxvtcdfont -e ~/bin_private/weechat"
bindsym $mod+Shift+s exec ~/bin/xpass
+bindsym $mod+Shift+y exec ~/bin/my-rofi -show ssh
bindsym $mod+Shift+f exec ~/bin/xpapers
bindsym $mod+y [urgent=latest] focus
@@ -42,8 +43,8 @@ bindsym $mod+Shift+c kill
bindsym $mod+q kill
# start dmenu (a program launcher)
-bindsym $mod+e exec dmenu_run
-bindsym $mod+shift+e exec ~/bin/dmenu_run_urxvtcd
+bindsym $mod+e exec ~/bin/my-rofi -show run
+bindsym $mod+shift+e exec ~/bin/my-rofi -show window
bindsym $mod+Shift+w exec "wen=`dmenu < /dev/null` && exec ~/bin/wwen $wen"
# change focus
diff --git a/install.sh b/install.sh
@@ -34,12 +34,14 @@ mkdir -p ~/.elinks
mkdir -p ~/Mail_inbox
mkdir -p ~/Mail_inbox/draft_tmp/{cur,new,tmp}
mkdir -p ~/.i3
+mkdir -p ~/.w3m
ls ~/config/ |
- grep -vE "(README|TODO|elinks|mutt|vim|zsh|subversion|i3|weechat|lblb)" |
+ grep -vE "(README|TODO|elinks|mutt|vim|zsh|subversion|i3|weechat|lbdb|w3m)" |
while read l; do ln -s ~/config/$l ~/.$l; done
mkdir -p ~/.mutt
for a in ~/config/mutt/*; do ln -s $a ~/.mutt/; done
ln -s ~/config/elinks ~/.elinks/elinks.conf
+ln -s ~/config/w3m ~/.w3m/config
for app in vim zsh
do
@@ -70,6 +72,7 @@ mkdir -p ~/.vim/autoload ~/.vim/bundle
curl -LSso ~/.vim/autoload/pathogen.vim 'https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim'
cd ~/.vim/bundle
git clone 'https://github.com/vim-scripts/vimwiki'
+git clone 'https://github.com/ervandew/supertab'
touch ~/.vim/perso
mkdir -p ~/scratch
mkdir -p ~/.subversion
diff --git a/w3m b/w3m
@@ -26,7 +26,7 @@ cookie_accept_domains
cookie_reject_domains
accept_bad_cookie 0
accept_cookie 1
-show_cookie 1
+show_cookie 0
use_cookie 1
ssl_ca_file
ssl_ca_path /etc/ssl/certs
@@ -102,7 +102,7 @@ use_history 1
pagerline 10000
visited_color magenta
visited_anchor 0
-active_color cyan
+active_color yellow
active_style 0
bg_color terminal
mark_color cyan
diff --git a/zsh/fontsize b/zsh/fontsize
@@ -1,4 +1,14 @@
-# fontsize N changes font size to DejaVu Sans Mono N pts
+# fontsized N changes font size to DejaVu Sans Mono N pts
+
+function fontsized () {
+ # inspired by
+ # https://github.com/majutsushi/urxvt-font-size
+
+ for a in 710 711 712 713;
+ do
+ echo -e "\033]$a;xft:DejaVu Sans Mono:size=$1\033\\"
+ done
+}
function fontsize () {
# inspired by