commit ff79ac0bb4cd9fb538a5573f9bdccc1ec9b0d560
parent 05a36c1937fda726b0c3234323b8e5f62876836f
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Sun, 5 Feb 2017 11:20:33 +0100
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
13 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/Xdefaults b/Xdefaults
@@ -9,11 +9,13 @@ URxvt.visualBell: true
URxvt*depth: 32
URxvt*scrollBar: false
URxvt*borderLess: false
-URxvt.cursorColor: #0000FF
-URxvt.cursorColor2: #FFFFFF
+URxvt.cursorColor: #00FF00
+URxvt.cursorColor2: #000000
URxvt.jumpScroll: true
-urxvt*font: -*-Terminus*-*-*-*-*-*-*-*-*-*-*-*
-urxvt*boldFont: -*-Terminus-*-*-*-*-*-*-*-*-*-*-*-*
+#urxvt*font: -*-Terminus*-*-*-*-*-*-*-*-*-*-*-*
+#urxvt*boldFont: -*-Terminus-*-*-*-*-*-*-*-*-*-*-*-*
+URxvt.font:xft:Terminus:size=8
+URxvt.boldfont:xft:Terminus:size=8
#urxvt*perl-lib: config/urxvt/perl
urxvt*perl-lib: /usr/lib/urxvt/perl
URxvt.perl-ext: default,matcher,url-picker,keyboard-select,url-select,urxvt-pipe,clipboard
@@ -54,3 +56,5 @@ rofi.font: "Terminus 8"
rofi.hlbg: green
rofi.hlfg: black
URxvt*iso14755: False
+URxvt.color12: CornflowerBlue
+URxvt.intensityStyles: false
diff --git a/apt/desktop b/apt/desktop
@@ -25,7 +25,7 @@ xpdf
xterm
xtrlock
pulseaudio
-transmission
+transmission-gtk
ttf-lyx
ttf-mscorefonts-installer
diff --git a/apt/games b/apt/games
@@ -43,9 +43,7 @@ fortune-mod
supertux
cowsay
crawl
-winetricks
xaos
robotfindskitten
caca-utils
-wine-development
comix # read manga
diff --git a/apt/headless b/apt/headless
@@ -42,3 +42,4 @@ dovecot-sieve # to edit my filters
pelican # blog
convmv # rename files with broken names
mediainfo # show meta-information of videos
+colortest # test terminal colors
diff --git a/apt/laptop_desktop b/apt/laptop_desktop
@@ -5,3 +5,4 @@ iodine
network-manager
network-manager-gnome
system-config-printer
+mosh
diff --git a/apt/wine b/apt/wine
@@ -6,3 +6,5 @@ libasound2:i386
libasound2-plugins:i386
libc6-i386
libcurl3-gnutls:i386 # for don't starve
+winetricks
+wine-development
diff --git a/apt/wine_staging b/apt/wine_staging
@@ -0,0 +1,3 @@
+# deb https://repos.wine-staging.com/debian/ stretch main
+winehq-staging
+wine-staging
diff --git a/i3/config b/i3/config
@@ -24,11 +24,11 @@ floating_modifier $mod
focus_follows_mouse yes
-bindsym $mod+shift+Return exec "urxvtcd"
-bindsym $mod+Return exec "urxvtpwd urxvtcd"
+bindsym $mod+shift+Return exec "~/bin/urxvtcdfont"
+bindsym $mod+Return exec "urxvtpwd ~/bin/urxvtcdfont"
bindsym $mod+b exec "firefox"
-bindsym $mod+o exec "urxvtcd -e ~/bin/my-mutt"
-bindsym $mod+i exec "urxvtcd -e ~/bin_private/weechat"
+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+f exec ~/bin/xpapers
bindsym $mod+y [urgent=latest] focus
diff --git a/install.sh b/install.sh
@@ -32,7 +32,7 @@ mkdir -p ~/.elinks
mkdir -p ~/Mail_inbox
mkdir -p ~/Mail_inbox/draft_tmp/{cur,new,tmp}
mkdir -p ~/.i3
-ls ~/config/ | grep -vE "(README|TODO|elinks|mutt|vim|zsh|subversion|i3)" | while read l; do ln -s ~/config/$l ~/.$l; done
+ls ~/config/ | grep -vE "(README|TODO|elinks|mutt|vim|zsh|subversion|i3|weechat)" | 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
diff --git a/mutt/colors b/mutt/colors
@@ -25,10 +25,10 @@ color markers brightcyan black # the + for wrapped pager lines
color message brightcyan black # informational messages, not mail
color search brightgreen black # hilite search patterns in the pager
color signature red black # signature (after "-- ") is red
-color status brightyellow blue # status bar is yellow *on blue*
+color status brightyellow blue # status bar is yellow on dark blue
color tilde blue black # ~'s after message body
color tree red default # thread tree in index menu is magenta
-color normal brightwhite black # message
+color normal white black # message
color signature green default
color underline yellow black
color tilde green default
@@ -57,5 +57,5 @@ color body yellow black "[;:][)/(|]"
color body green black "[[:alpha:]]\+://[^ ]*"
# colors for deleted mail
-color index brightblack black ~D # deleted
+color index color8 black ~D # deleted, renders as gray
color index black red !~(!~D) # deleted THREADS
diff --git a/nethackrc b/nethackrc
@@ -11,7 +11,7 @@ OPTIONS=dogname:Slinky
OPTIONS=catname:RexS
OPTIONS=pickup_types:$
OPTIONS=nomail
-OPTIONS=name:a3_nm
+OPTIONS=name:a3nm
OPTIONS=pickup_burden:b
# Enable this if you want to see your inventory sorted in alphabetical
diff --git a/zsh/fontsize b/zsh/fontsize
@@ -6,7 +6,7 @@ function fontsize () {
for a in 710 711 712 713;
do
- echo -e "\033]$a;xft:DejaVu Sans Mono:size=$1\033\\"
+ echo -e "\033]$a;xft:Terminus:size=$1\033\\"
done
}
diff --git a/zsh/zshrc b/zsh/zshrc
@@ -18,6 +18,7 @@ RED=$'%{\e[31m%}'
GREEN=$'%{\e[32m%}'
YELLOW=$'%{\e[33m%}'
BLUE=$'%{\e[34m%}'
+LIGHTBLUE=$'%{\e[94m%}'
MAGENTA=$'%{\e[35m%}'
CYAN=$'%{\e[36m%}'
@@ -244,3 +245,8 @@ eval $(dircolors -p | perl -pe 's/^((CAP|S[ET]|O[TR]|M|E)\w+).*/$1 00/' | dircol
bindkey '^U' backward-kill-line
+# directories in lighter blue
+# cf http://askubuntu.com/questions/466198/how-do-i-change-the-color-for-directories-with-ls-in-the-console/466203#466203
+LS_COLORS=$LS_COLORS:'di=0;94:'
+export LS_COLORS
+
