From 6c4c5513618105ea4ce081b04e0545c7c05431d8 Mon Sep 17 00:00:00 2001 From: Matias Linares Date: Tue, 24 Nov 2015 00:29:00 -0300 Subject: Update --- Xresources | 18 +- gitconfig | 8 + herbstluftwm/autostart | 7 +- herbstluftwm/bin/dmenu_wrapper | 3 +- herbstluftwm/fn.sh | 1 - herbstluftwm/log | 2 + herbstluftwm/panel.sh | 49 +++- herbstluftwm/popups.sh | 2 +- irssi/away.log | 4 + irssi/config | 30 ++- mkshrc | 2 +- mpd/mpd.conf | 29 +- mpd/mpd.db | Bin 0 -> 7648 bytes mpd/mpdstate | 35 +++ mpd/pid.log | 1 + mpd/playlists/[Radio Streams].m3u | 0 mutt/aliases | 3 + mutt/opmbx | 20 ++ mutt/signature | 5 +- mutt/team-deprecated | 22 ++ muttrc | 52 ++-- ncmpcpp/error.log | 9 + save-dotfiles.sh | 19 ++ scripts/battery-parse | Bin 0 -> 1201894 bytes scripts/change-xresources | 24 ++ scripts/ix | 3 - scripts/lock | 4 +- scripts/spawn | 3 - scripts/sprunge | 2 - scripts/terminal-colors | 550 +++----------------------------------- termcolors/glam-blue | 20 ++ termcolors/halflife | 38 +++ termcolors/holy | 27 ++ termcolors/rainbown | 20 ++ termcolors/sourcerer | 45 ++++ termcolors/witch | 38 +++ termcolors/yosemite | 8 +- vim/colors/halflife.vim | 105 ++++++++ vim/syntax/vala.vim | 200 ++++++++++++++ vimrc | 2 +- 40 files changed, 795 insertions(+), 615 deletions(-) create mode 100644 herbstluftwm/log create mode 100644 irssi/away.log create mode 100644 mpd/mpd.db create mode 100644 mpd/mpdstate create mode 100644 mpd/pid.log create mode 100644 mpd/playlists/[Radio Streams].m3u create mode 100644 mutt/opmbx create mode 100644 mutt/team-deprecated create mode 100644 ncmpcpp/error.log create mode 100755 save-dotfiles.sh create mode 100755 scripts/battery-parse create mode 100755 scripts/change-xresources delete mode 100755 scripts/ix delete mode 100755 scripts/spawn delete mode 100755 scripts/sprunge create mode 100644 termcolors/glam-blue create mode 100644 termcolors/halflife create mode 100644 termcolors/holy create mode 100644 termcolors/rainbown create mode 100644 termcolors/sourcerer create mode 100644 termcolors/witch create mode 100644 vim/colors/halflife.vim create mode 100644 vim/syntax/vala.vim diff --git a/Xresources b/Xresources index 7d82d2a..f2d95ec 100644 --- a/Xresources +++ b/Xresources @@ -1,9 +1,10 @@ -#include "/home/matias/.config/termcolors/google" -!xterm*faceName: Envy Code R:size=9:antialias=false -*faceName: Fira Mono Medium:size=8:antialias=true -xterm*faceName: Fira Mono Medium:size=9:antialias=true -!xterm*faceName: xft:Termsynu:size=12 -!xterm*boldFont: xft:Termsynu:bold:size=9 +#include "/home/matias/.config/termcolors/sourcerer" +!*font: -*-fixed-medium-r-semicondensed-*-13-*-*-*-*-*-iso8859-* +*font: -*-inconsolata-medium-r-*-*-12-*-*-*-*-*-*-* +dzen2*font: -*-inconsolata-medium-r-*-*-12-*-*-*-*-*-*-* +!dzen2*font: -misc-fixed-medium-r-semicondensed-*-12-*-*-*-*-*-*-* +xterm*faceName: Inconsolata:size=10:antialias=false +!xterm*font: 7x13 xterm*linespace: 0 xterm*VT100*underLine: on @@ -18,13 +19,13 @@ xterm.savelines: 500 xterm*scrollBar: false ! do not scroll with output -xterm*scrollTtyOutput: false +xterm*scrollTtyOutput: true ! scroll in relation to buffer (with mouse scroll or Shift+Page Up) xterm*scrollWithBuffer: true ! scroll back to the bottom on keypress -xterm*scrollTtyKeypress: true +!xterm*scrollTtyKeypress: true ! scroll a single line xterm.keysym.Shift-Up: command:\033]720;1\007 @@ -35,7 +36,6 @@ xterm.perl-ext-common: default,clipboard xterm.keysym.M-c: perl:clipboard:copy xterm.keysym.M-v: perl:clipboard:paste -dzen2*font: Envy Code R:size=9:antialias=false *colorIT: #E3AB8D *VT100.colorBDMode: true diff --git a/gitconfig b/gitconfig index 6550dd6..10a8cd8 100644 --- a/gitconfig +++ b/gitconfig @@ -3,3 +3,11 @@ name = Matias Linares [alias] lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit + +[sendemail] + smtpencryption = tls + smtpserver = smtp.openmailbox.org + smtpuser = matiaslina@openmailbox.org + smtppass = pass + smtpserverport = 587 + suppresscc = self diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart index 89842c6..2ff5939 100755 --- a/herbstluftwm/autostart +++ b/herbstluftwm/autostart @@ -68,7 +68,7 @@ hc keybind $Mod-Control-Right resize right +$resizestep # tags #tag_names=( {1..9} ) -tag_names=( "web" "editors" "chat" "games" "misc" ) +tag_names=( "web" "ed" "more-ed" "chat" "games" "misc" ) tag_keys=( {1..9} 0 ) hc rename default "${tag_names[0]}" || true @@ -124,7 +124,7 @@ hc keybind $Mod-i jumpto urgent #hc set always_show_frame 1 hc set frame_bg_transparent 1 hc set frame_transparent_width 1 -hc set frame_gap 2 +hc set frame_gap 3 hc set frame_border_active_color '#000000' hc set frame_border_normal_color '#1d1f21' hc set frame_bg_normal_color '#151515' @@ -132,7 +132,7 @@ hc set frame_bg_active_color '#151515' hc set frame_border_width 0 hc set window_border_width 2 hc set window_border_normal_color '#3a3a3a' -hc set window_border_active_color "$(xrdb -q | grep color4 | awk '{ print $2; }')" +hc set window_border_active_color "$(xrdb -q | grep color12 | awk '{ print $2; }')" #hc attr theme.active.color '#9E003A' #hc attr theme.normal.color '#252525' @@ -157,6 +157,7 @@ hc set frame_padding 0 # rules hc unrule -F #hc rule class=XTerm tag=3 # move all xterms to tag 3 +hc rule class=Steam tag="games" # move all xterms to tag 3 hc rule focus=on # normally focus new clients #hc rule focus=off # normally do not focus new clients # give focus to most common terminals diff --git a/herbstluftwm/bin/dmenu_wrapper b/herbstluftwm/bin/dmenu_wrapper index 7d9dccf..fbb608d 100755 --- a/herbstluftwm/bin/dmenu_wrapper +++ b/herbstluftwm/bin/dmenu_wrapper @@ -7,5 +7,6 @@ get_xresources() { echo -n "${arr[@]:1}" } -dmenu_run -b -p $(hostname) -nb $(get_xresources background) -sb $(get_xresources color4) -sf $(get_xresources foreground) -fn "$(get_xresources face | sed 's/ /\\ /g')" +echo "'$(get_xresources font | sed 's/ /\\ /g')'" > ~/lgo +dmenu_run -b -p $(hostname) -nb $(get_xresources background) -sb $(get_xresources color4) -sf $(get_xresources background) -fn "$(get_xresources face | sed 's/ /\\ /g')" diff --git a/herbstluftwm/fn.sh b/herbstluftwm/fn.sh index dd7b4ce..0599b1f 100644 --- a/herbstluftwm/fn.sh +++ b/herbstluftwm/fn.sh @@ -1,4 +1,3 @@ - get_xresources() { arr=( $(xrdb -q | grep $1 | head -1) ) echo -n "${arr[@]:1}" diff --git a/herbstluftwm/log b/herbstluftwm/log new file mode 100644 index 0000000..25cedfa --- /dev/null +++ b/herbstluftwm/log @@ -0,0 +1,2 @@ +date ^fg(#efefef)04:15^fg(#909090), 2015-11-^fg(#efefef)05panel width: 1366 and widht 72 for '-*-fixed-medium-r-semicondensed-*-12-*-*-*-*-*-iso8859-*' and ' | 76%% | ' +panel width: 1366 and widht 72 for '-*-fixed-medium-r-semicondensed-*-12-*-*-*-*-*-iso8859-*' and ' | 76%% | ' diff --git a/herbstluftwm/panel.sh b/herbstluftwm/panel.sh index b17eb6d..ad7efbe 100755 --- a/herbstluftwm/panel.sh +++ b/herbstluftwm/panel.sh @@ -1,5 +1,7 @@ #!/bin/bash +source ${HOME}/.config/herbstluftwm/fn.sh + hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;} monitor=${1:-0} geometry=( $(herbstclient monitor_rect "$monitor") ) @@ -12,12 +14,25 @@ x=${geometry[0]} y=${geometry[1]} panel_width=${geometry[2]} panel_height=16 -#font="-Misc-Termsyn.Icons-Medium-R-Normal--11-79-100-100-C-60-ISO8859-1" #font="-*-envy code r-*-*-*-*-11-*-*-*-*-*-*-*" -font="-*-fira mono-*-*-*-*-10-*-*-*-*-*-*-*" -bgcolor=$(hc get frame_border_normal_color) -selbg=$(hc get window_border_active_color) -selfg='#efefef' +xfont=$(get_xresources font) +echo "${xfont}" > log +escaped="${xfont//[a-z 0-9\*-]/}" +if [[ ${#escaped} -gt 0 ]] +then + font="-Misc-Termsyn.Icons-Medium-R-Normal--11-79-100-100-C-60-ISO8859-1" +else + font="${xfont}" + + if [[ "${xfont}" =~ fixed ]] + then + font="${xfont/13/12}" + fi +fi +bgcolor=$(get_xresources background) +fgcolor=$(get_xresources foreground) +selbg=$(get_xresources color12) +selfg=$(get_xresources background) popups="/home/matias/.config/herbstluftwm/popups.sh" #### @@ -74,7 +89,7 @@ hc pad $monitor $panel_height while true ; do # "date" output is checked once a second, but an event is only # generated if the output changed compared to the previous run. - date +$'date\t^fg(#efefef)%H:%M^fg(#909090), %Y-%m-^fg(#efefef)%d' + date +$'date\t^fg('"$fgcolor"')%H:%M^fg(#707070), %Y-%m-^fg('"$fgcolor"')%d' sleep 3 || break done > >(uniq_linebuffered) & childpid=$! @@ -106,19 +121,24 @@ hc pad $monitor $panel_height for i in "${tags[@]}" ; do case ${i:0:1} in '#') + # Current tag echo -n "^bg($selbg)^fg($selfg)" ;; '+') + # Dunno echo -n "^bg(#9CA668)^fg(#141414)" ;; ':') - echo -n "^bg()^fg(#ffffff)" + # with something + echo -n "^bg()^fg($fgcolor)" ;; '!') + # urgent echo -n "^bg(#FF0675)^fg(#141414)" ;; *) - echo -n "^bg()^fg(#ababab)" + # Empty + echo -n "^bg()^fg(#797979)" ;; esac if [ ! -z "$dzen2_svn" ] ; then @@ -139,22 +159,23 @@ hc pad $monitor $panel_height if [ "$battery" = "/" ] ;then right="$separator^bg($hintcolor) $date $separator" else - right="^bg($hintcolor) ^fg(#efefef)$song $separator " + right="^bg($hintcolor) ^fg($fgcolor)$song $separator " if [[ $battery -lt 20 ]] then - right="$right^fg(#ef7f7f)$battery%% $separator $date" + right="$right^fg($(get_xresources color1))$battery%% $separator $date" elif [[ $battery -lt 50 ]] then - right="$right^fg(#e1e17f)$battery%% $separator $date" + right="$right^fg($(get_xresources color3))$battery%% $separator $date" else - right="$right^fg(#efefef)$battery%% $separator $date" + right="$right^fg($fgcolor)$battery%% $separator $date" fi fi right_text_only=$(echo -n "$right" | sed 's.\^[^(]*([^)]*)..g') # get width of right aligned text.. and add some space.. width=$($textwidth "$font" "$right_text_only ") - echo -n "^pa($(($panel_width - $width + 4)))$(printf "$right")" + echo "panel width: $panel_width and widht $width for '$font' and '$right_text_only'" >> log + echo -n "^pa($(($panel_width - $width + 175)))$(printf "$right")" echo ### Data handling ### @@ -220,4 +241,4 @@ hc pad $monitor $panel_height } 2> /dev/null | dzen2 -w $panel_width -x $x -y $y -fn "$font" -h $panel_height \ -e 'button3=;button4=exec:herbstclient use_index -1;button5=exec:herbstclient use_index +1' \ - -ta l -bg "$bgcolor" -fg '#efefef' + -ta l -bg "$bgcolor" -fg "$fgcolor" diff --git a/herbstluftwm/popups.sh b/herbstluftwm/popups.sh index db75c0b..d1dde29 100755 --- a/herbstluftwm/popups.sh +++ b/herbstluftwm/popups.sh @@ -14,7 +14,7 @@ calendary() { position(){ pos=$(mpc | awk 'NR==2' | awk '{print $4}' | sed 's/(//' | sed 's/%)//') - bar=$(echo $pos | gdbar -w $1 -h 3.5 -fg "$(get_xresources color4)" -bg "$(get_xresources color8)") + bar=$(echo $pos | gdbar -w $1 -h 3.5 -fg "$(get_xresources color12)" -bg "$(get_xresources color8)") echo -n "$bar" return } diff --git a/irssi/away.log b/irssi/away.log new file mode 100644 index 0000000..cbc1de7 --- /dev/null +++ b/irssi/away.log @@ -0,0 +1,4 @@ +--- Log opened mié oct 15 19:29:07 2014 +--- Log closed mié oct 15 19:38:13 2014 +--- Log opened mar sep 15 20:26:17 2015 +--- Log closed mar sep 15 20:29:05 2015 diff --git a/irssi/config b/irssi/config index 52852a6..0a76d49 100644 --- a/irssi/config +++ b/irssi/config @@ -1,10 +1,11 @@ ## SERVERS servers = ( { - address = "team-deprecated.org"; + address = "irc.team-deprecated.org"; chatnet = "Team-Deprecated"; port = "6667"; }, + { address = "irc.nixers.net"; chatnet = "Nixers"; port = "6667"; }, { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; }, { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; }, { @@ -82,6 +83,7 @@ chatnets = { Freenode = { type = "IRC"; nick = "matiaslina"; + autosendcmd = "/msg nickserv IDENTIFY pass; wait 2000"; max_kicks = "1"; max_msgs = "4"; max_whois = "1"; @@ -89,6 +91,7 @@ chatnets = { Mozilla = { type = "IRC"; nick = "matiaslina"; + autosendcmd = "/msg nickserv IDENTIFY pass"; max_kicks = "1"; max_msgs = "4"; max_whois = "1"; @@ -145,12 +148,19 @@ chatnets = { SILC = { type = "SILC"; }; Unixporn = { type = "IRC"; + autosendcmd = "/msg pico identify matiaslina pass"; nick = "matiaslina"; }; Snoonet = { type = "IRC"; }; "Team-Deprecated" = { - type = "IRC"; - nick = "park"; + type = "IRC"; + nick = "park"; + autosendcmd = "/msg NickServ identify park pass"; + }; + Nixers = { + type = "IRC"; + nick = "park"; + #autosendcmd = ""; }; }; @@ -166,6 +176,12 @@ channels = ( { name = "#servo"; chatnet = "Mozilla"; autojoin = "Yes"; }, { name = "#suckless"; chatnet = "OFTC"; autojoin = "Yes"; }, + { + name = "#deprecated"; + chatnet = "Team-Deprecated"; + autojoin = "Yes"; + }, + { name = "#nixers"; chatnet = "Nixers"; autojoin = "Yes"; }, { name = "#nomanssky"; chatnet = "Snoonet"; autojoin = "Yes"; }, @@ -338,14 +354,6 @@ statusbar = { barend = { priority = "100"; alignment = "right"; }; }; }; - awl_1 = { - placement = "top"; - items = { - barstart = { priority = "100"; }; - awl_1 = { }; - barend = { priority = "100"; alignment = "right"; }; - }; - }; }; }; settings = { diff --git a/mkshrc b/mkshrc index 0e54931..29df88c 100644 --- a/mkshrc +++ b/mkshrc @@ -3,7 +3,7 @@ export PS1="[\${PWD/\$HOME/\~}] > " # No bold colors. -export LS_COLORS="no=00:fi=00:di=34:ln=01;31:pi=34;43:so=31;43:bd=30;43:cd=30;43:or=01;35:ex=01;31:" +#export LS_COLORS="no=00:fi=00:di=34:ln=01;31:pi=34;43:so=31;43:bd=30;43:cd=30;43:or=01;35:ex=01;31:" export GREP_COLOR=31 # Highlight export ACK_COLOR_FILENAME=red diff --git a/mpd/mpd.conf b/mpd/mpd.conf index 929a3a5..8a9e06c 100644 --- a/mpd/mpd.conf +++ b/mpd/mpd.conf @@ -26,14 +26,35 @@ audio_output { path "/tmp/mpd.fifo" format "44100:16:2" } +#audio_output { + #type "shout" + #encoding "ogg" # optional + #name "My Shout Stream" + #host "localhost" + #port "8000" + #mount "/mpd.ogg" + #password "hackme" +## quality "5.0" + #bitrate "128" + #format "44100:16:1" +## protocol "icecast2" # optional +## user "source" # optional +## description "My Stream Description" # optional +## url "http://example.com" # optional +## genre "jazz" # optional +## public "no" # optional +## timeout "2" # optional +## mixer_type "software" # optional +#} audio_output { type "httpd" name "My HTTP Stream" - encoder "lame" + encoder "lame" # optional, vorbis or lame port "8000" - bind_to_address "0.0.0.0" - bitrate "128" + bind_to_address "0.0.0.0" # optional, IPv4 or IPv6 +# quality "5.0" # do not define if bitrate is defined + bitrate "128" # do not define if quality is defined format "44100:16:1" - max_clients "0" + max_clients "0" # optional 0=no limit } diff --git a/mpd/mpd.db b/mpd/mpd.db new file mode 100644 index 0000000..afeb952 Binary files /dev/null and b/mpd/mpd.db differ diff --git a/mpd/mpdstate b/mpd/mpdstate new file mode 100644 index 0000000..bceafe4 --- /dev/null +++ b/mpd/mpdstate @@ -0,0 +1,35 @@ +sw_volume: 52 +audio_device_state:1:MPD Sound Device (Pulseaudio) +audio_device_state:1:my_fifo +audio_device_state:0:My HTTP Stream +state: stop +current: 0 +random: 0 +repeat: 0 +single: 0 +consume: 0 +crossfade: 0 +mixrampdb: 0.000000 +mixrampdelay: -1.000000 +playlist_begin +0:New Politics - A Bad Girl in Harlem (2013) [FLAC]/01 Tonight You're Perfect.flac +1:New Politics - A Bad Girl in Harlem (2013) [FLAC]/02 Harlem.flac +2:New Politics - A Bad Girl in Harlem (2013) [FLAC]/03 Berlin.flac +3:New Politics - A Bad Girl in Harlem (2013) [FLAC]/04 Stuck On You.flac +4:New Politics - A Bad Girl in Harlem (2013) [FLAC]/05 Give Me Hope.flac +5:New Politics - A Bad Girl in Harlem (2013) [FLAC]/06 Die Together.flac +6:New Politics - A Bad Girl in Harlem (2013) [FLAC]/07 Goodbye Copenhagen.flac +7:New Politics - A Bad Girl in Harlem (2013) [FLAC]/08 Overcome.flac +8:New Politics - A Bad Girl in Harlem (2013) [FLAC]/09 Just Like Me.flac +9:New Politics - A Bad Girl in Harlem (2013) [FLAC]/10 Fall Into These Arms.flac +10:Royal Blood - Royal Blood/01 royal blood-out of the black.mp3 +11:Royal Blood - Royal Blood/02 royal blood-come on over.mp3 +12:Royal Blood - Royal Blood/03 royal blood-figure it out.mp3 +13:Royal Blood - Royal Blood/04 royal blood-you can be so cruel.mp3 +14:Royal Blood - Royal Blood/05 royal blood-blood hands.mp3 +15:Royal Blood - Royal Blood/06 royal blood-little monster.mp3 +16:Royal Blood - Royal Blood/07 royal blood-loose change.mp3 +17:Royal Blood - Royal Blood/08 royal blood-careless.mp3 +18:Royal Blood - Royal Blood/09 royal blood-ten tonne skeleton.mp3 +19:Royal Blood - Royal Blood/10 royal blood-better strangers.mp3 +playlist_end diff --git a/mpd/pid.log b/mpd/pid.log new file mode 100644 index 0000000..a20e4d1 --- /dev/null +++ b/mpd/pid.log @@ -0,0 +1 @@ +715 diff --git a/mpd/playlists/[Radio Streams].m3u b/mpd/playlists/[Radio Streams].m3u new file mode 100644 index 0000000..e69de29 diff --git a/mutt/aliases b/mutt/aliases index b489b49..67c9380 100644 --- a/mutt/aliases +++ b/mutt/aliases @@ -19,8 +19,11 @@ alias manu Manuel Cavallo # Profes alias rafa Rafael Carrascosa +alias sergiocanchi Sergio Canchi ## Arquitectura alias eduardo Eduardo Sanchez alias bubu Ignacio del Rio alias diegolis Diego Lis + +alias amor Fernanda Mendez diff --git a/mutt/opmbx b/mutt/opmbx new file mode 100644 index 0000000..fb7610b --- /dev/null +++ b/mutt/opmbx @@ -0,0 +1,20 @@ +# Smtp opmbx +set my_user=matiaslina@openmailbox.org +set my_pass='pass' +set smtp_url=smtps://$my_user:$my_pass@smtp.openmailbox.org:465 +set from = matiaslina@openmailbox.org +set postponed= +Drafts +set record="+Sent" + +# IMAP opmbx +set imap_user=matiaslina@openmailbox.org +set imap_pass="$my_pass" +set folder=imap://imap.openmailbox.org:143/ + +set imap_check_subscribed = yes +mailboxes = +INBOX +Archlinux +Archlinux/Development \ + +Archlinux/Announces +Suckless \ + +Herbstluftwm +FaMAF +MobaSimulator +team-deprecated + +account-hook $folder "set imap_user=matiaslina@openmailbox.org imap_pass='pass'" +# vim: ft=muttrc diff --git a/mutt/signature b/mutt/signature index 62a9c73..f642421 100644 --- a/mutt/signature +++ b/mutt/signature @@ -1,3 +1,2 @@ -XMPP/Mail: matiaslina@openmailbox.org -GPG: http://www.famaf.unc.edu.ar/~mlm0111/pubkey.asc | BBD8 CADC C236 AD16 -Tox ID: A84709E264C9F10B71D3BC2730685C27CBCC2D280E98744C50803509FB0FEF586EBB101D0694 +Matias Linares +GPG: http://team-deprecated.org/static/pubkey.asc | BBD8 CADC C236 AD16 diff --git a/mutt/team-deprecated b/mutt/team-deprecated new file mode 100644 index 0000000..928b9d7 --- /dev/null +++ b/mutt/team-deprecated @@ -0,0 +1,22 @@ +# Smtp team-deprecated +set my_user=park +set my_pass='pass' + +set smtp_url=smtps://$my_user:$my_pass@smtp.team-deprecated.org +set from = park@team-deprecated.org +set hostname = "team-deprecated.org" +unset ssl_verify_host + +# IMAP team-deprecated +set imap_user=park +set imap_pass='pass' +set folder=imaps://imap.team-deprecated.org:993/ +set spoolfile=+INBOX +set postponed= +Drafts +set record="+Sent" +mailboxes = +INBOX +Sent +Drafts +Team-Deprecated + +# Hook! Important! +account-hook $folder "set imap_user=park imap_pass=pass" + +# vim: ft=muttrc diff --git a/muttrc b/muttrc index f0c9feb..e100580 100644 --- a/muttrc +++ b/muttrc @@ -4,40 +4,17 @@ set message_cachedir = /tmp/mutt-cache set alias_file = ~/.mutt/aliases source $alias_file -# Sidebar settings -set sidebar_visible = yes -set sidebar_width = 24 -set sidebar_sort = yes -#set sidebar_indentstr = ' ' -#set sidebar_folderindent = yes -#set sidebar_shortpath = yes -#set sidebar_format="%B%?F? [%F]?%* %?N?%N/?%S" +#set ssl_starttls = yes -# Smtp opmbx -#set my_user=park -set my_user=matiaslina@openmailbox.org -set my_pass="`echo -n $PASSWORD`" set realname='Matias Linares' -set smtp_url=smtp://$my_user:$my_pass@smtp.team-deprecated.org -#set from = park@team-deprecated.org -set from = matiaslina@openmailbox.org -#unset ssl_verify_host - -# IMAP opmbx -#set imap_user=park -#set imap_pass=$my_pass -#set folder=imap://imap.team-deprecated.org:143/ -set imap_user=matiaslina@openmailbox.org -set imap_pass="$my_pass" -set folder=imap://imap.openmailbox.org:143/ -set spoolfile=+INBOX -set record="+Sent" -#set imap_check_subscribed = yes -#mailboxes = +INBOX -mailboxes = +INBOX +Archlinux +Archlinux/Development \ - +Archlinux/Announces +Suckless \ - +Herbstluftwm +FaMAF +MobaSimulator +team-deprecated +source ~/.mutt/team-deprecated +folder-hook $folder 'source ~/.mutt/team-deprecated' + +source ~/.mutt/opmbx +folder-hook $folder 'source ~/.mutt/opmbx' + set use_from=yes + #set ssl_force_tls = yes # Don't wit to enter mailbox manually unset imap_passive @@ -55,6 +32,7 @@ subscribe dev@suckless.org subscribe arch-general@archlinux.org subscribe arch-announce@archlinux.org subscribe arch-dev-public@archlinux.org +subscribe dev@team-deprecated.org # Misc. #set pager_index_lines=5 @@ -73,6 +51,16 @@ set crypt_verify_sig = yes set crypt_autosign = yes set crypt_replyencrypt = yes +# Sidebar settings +set sidebar_visible = yes +set sidebar_width = 30 +set sidebar_sort = yes +#set sidebar_indentstr = ' ' +#set sidebar_folderindent = yes +#set sidebar_shortpath = yes +#set sidebar_format="%B%?F? [%F]?%* %?N?%N/?%S" + + # Headers my_hdr X-Operating-System: Arch Linux, `uname -o` `uname -r` my_hdr X-PGP-Key: http://www.famaf.unc.edu.ar/~mlm0111/pubkey.asc @@ -172,7 +160,7 @@ color quoted7 green default #color hdrdefault white green color signature brightmagenta default -color indicator default cyan +color indicator brightwhite cyan color attachment black cyan color error red default color message white default diff --git a/ncmpcpp/error.log b/ncmpcpp/error.log new file mode 100644 index 0000000..3e7897f --- /dev/null +++ b/ncmpcpp/error.log @@ -0,0 +1,9 @@ +[2014/07/13 13:34:25] Constructed window is bigger than terminal size! +[2014/07/13 13:34:38] Constructed window is bigger than terminal size! +[2014/07/13 13:35:03] Constructed window is bigger than terminal size! +[2014/09/23 17:42:42] Constructed window is bigger than terminal size +[2014/09/23 17:42:44] Constructed window is bigger than terminal size +[2014/12/23 12:40:26] Constructed window is bigger than terminal size +[2014/12/23 12:40:31] Constructed window is bigger than terminal size +[2014/12/23 12:40:36] Constructed window is bigger than terminal size +[2015/08/24 21:44:54] Constructed window is bigger than terminal size diff --git a/save-dotfiles.sh b/save-dotfiles.sh new file mode 100755 index 0000000..219a64b --- /dev/null +++ b/save-dotfiles.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +repo_path="${HOME}/Workspace/dotfiles" + +cp ~/.Xresources ${repo_path}/Xresources +cp ~/.vimrc ${repo_path}/vimrc +cp -r ~/.irssi ${repo_path}/irssi +cp ~/.muttrc ${repo_path}/muttrc +cp ~/.mkshrc ${repo_path}/mkshrc +cp ~/.gitconfig ${repo_path}/gitconfig +cp -r ~/.mutt ${repo_path}/mutt +cp -r ~/.vim ${repo_path}/vim +cp -r ~/.config/herbstluftwm/ ${repo_path}/herbstluftwm +cp -r ~/.config/termcolors/ ${repo_path}/termcolors +cp -r ~/scripts/ ${repo_path}/scripts +cp -r ~/.mpd/ ${repo_path}/mpd +cp -r ~/.ncmpcpp/ ${repo_path}/ncmpcpp + +echo "Now check your passwords :)" diff --git a/scripts/battery-parse b/scripts/battery-parse new file mode 100755 index 0000000..7eaebad Binary files /dev/null and b/scripts/battery-parse differ diff --git a/scripts/change-xresources b/scripts/change-xresources new file mode 100755 index 0000000..1dd7718 --- /dev/null +++ b/scripts/change-xresources @@ -0,0 +1,24 @@ +#!/bin/bash + +show_help() { + cat <> Be nice! +EOF +} + +case "$1" in + dark) + cp ${HOME}/Workspace/dotfiles/Xresources ${HOME}/.Xresources + ;; + light) + cp ${HOME}/Workspace/dotfiles/Xresources-light ${HOME}/.Xresources + ;; + *) + show_help + exit 0 + ;; +esac + +xrdb -l ${HOME}/.Xresources \ No newline at end of file diff --git a/scripts/ix b/scripts/ix deleted file mode 100755 index 47c3e2b..0000000 --- a/scripts/ix +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -curl -F 'f:1=<-' -F "ext:1=$1" ix.io #| \ - #xclip -i -selection clipboard diff --git a/scripts/lock b/scripts/lock index 4046b49..aea1a7d 100755 --- a/scripts/lock +++ b/scripts/lock @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/mksh bg=/tmp/screen.png lock_png=${HOME}/scripts/lock.png @@ -12,7 +12,7 @@ convert ${bg} -blur 0x2 -sharpen 1x4 ${bg} [[ -f ${lock_png} ]] && convert ${bg} ${lock_png} \ -gravity center -composite -matte \ ${bg} -xbacklight -set 10 +xbacklight -set 5 i3lock -u -n -i ${bg} rm ${bg} xbacklight -set $backlight diff --git a/scripts/spawn b/scripts/spawn deleted file mode 100755 index 6a30ee1..0000000 --- a/scripts/spawn +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -$@ 2>&1 >/dev/null & disown %1 diff --git a/scripts/sprunge b/scripts/sprunge deleted file mode 100755 index ba30dae..0000000 --- a/scripts/sprunge +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -curl -F sprunge=@- sprunge.us diff --git a/scripts/terminal-colors b/scripts/terminal-colors index 985cefb..c39164a 100755 --- a/scripts/terminal-colors +++ b/scripts/terminal-colors @@ -1,529 +1,39 @@ -#!/usr/bin/env python +#!/usr/bin/bash +# +# ANSI color scheme script featuring Space Invaders +# +# Original: http://crunchbang.org/forums/viewtopic.php?pid=126921%23p126921#p126921 +# Modified by lolilolicon +# -"""2.2 John Eikenberry GPL-3+ http://zhar.net/projects/ +f=3 b=4 +for j in f b; do + for i in {0..7}; do + printf -v $j$i %b "\e[${!j}${i}m" + done +done +bld=$'\e[1m' +rst=$'\e[0m' -Copyright - Copyright (C) 2010-2013 John Eikenberry +cat << EOF -License - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + $f1 ▀▄ ▄▀ $f2 ▄▄▄████▄▄▄ $f3 ▄██▄ $f4 ▀▄ ▄▀ $f5 ▄▄▄████▄▄▄ $f6 ▄██▄ $rst + $f1 ▄█▀███▀█▄ $f2███▀▀██▀▀███ $f3▄█▀██▀█▄ $f4 ▄█▀███▀█▄ $f5███▀▀██▀▀███ $f6▄█▀██▀█▄$rst + $f1█▀███████▀█ $f2▀▀███▀▀███▀▀ $f3▀█▀██▀█▀ $f4█▀███████▀█ $f5▀▀███▀▀███▀▀ $f6▀█▀██▀█▀$rst + $f1▀ ▀▄▄ ▄▄▀ ▀ $f2 ▀█▄ ▀▀ ▄█▀ $f3▀▄ ▄▀ $f4▀ ▀▄▄ ▄▄▀ ▀ $f5 ▀█▄ ▀▀ ▄█▀ $f6▀▄ ▄▀$rst - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + $bld$f1▄ ▀▄ ▄▀ ▄ $f2 ▄▄▄████▄▄▄ $f3 ▄██▄ $f4▄ ▀▄ ▄▀ ▄ $f5 ▄▄▄████▄▄▄ $f6 ▄██▄ $rst + $bld$f1█▄█▀███▀█▄█ $f2███▀▀██▀▀███ $f3▄█▀██▀█▄ $f4█▄█▀███▀█▄█ $f5███▀▀██▀▀███ $f6▄█▀██▀█▄$rst + $bld$f1▀█████████▀ $f2▀▀▀██▀▀██▀▀▀ $f3▀▀█▀▀█▀▀ $f4▀█████████▀ $f5▀▀▀██▀▀██▀▀▀ $f6▀▀█▀▀█▀▀$rst + $bld$f1 ▄▀ ▀▄ $f2▄▄▀▀ ▀▀ ▀▀▄▄ $f3▄▀▄▀▀▄▀▄ $f4 ▄▀ ▀▄ $f5▄▄▀▀ ▀▀ ▀▀▄▄ $f6▄▀▄▀▀▄▀▄$rst - You should have received a copy of the GNU General Public License - along with this program. If not, see . -Description - My goal in writing this script was to provide all the functionality of all - the various perl/sh scripts found around the web in one place with some - additional bells and whistles. + $f7▌$rst - It automatically detects 8, 16, 88, 256 color capabilities (via ncurses) - and displays the appropriate color charts. It can display the colors as - blocks or (2d) cubes optionally with color values overlaid in int or hex - values. It can show the full rgb text string as well. It can also show the - display with a vertical (default) or horizontal orientation. It has the - option of additional padding and supports -h --help as well. + $f7▌$rst - It also works as a utility for converting between 256 and 88 color values. - -Development - A note on coding style. I was playing around with using classes as simple - module-esque namespaces; i.e. having classes that have all staticmethods - and never get instatiated. As a side effect of this it makes calls at the - module level thus this script is not really importable, thus limiting - reuse. - -Contributors - Isaac Cammann - cube display bugfix - Jan Larres - submitted patches for.. - - compact rgb display - - use of color intensity to determine foreground contrast color - - 16 color SGR ANSI chart - - 88 color rgb display bugfix - -""" -from __future__ import print_function - -__version__ = __doc__.split('\n')[0] - -import sys -import curses -from optparse import OptionParser, OptionGroup, make_option -from math import ceil, sqrt -from functools import wraps - -# output constants -fg_escape = "\x1b[38;5;%dm" -bg_escape = "\x1b[48;5;%dm" -clear = "\x1b[0m" - -def _get_options(args): - """ Setup and parse options. - """ - option_list = [ - make_option("-b", "--block", action="store_true", dest="block", - default=True, help="Display as block format (vs cube) [default]."), - make_option("-c", "--cube-slice", action="store_true", dest="cube", - default=False, help="Display as cube slices (vs block)."), - make_option("-f", "--foreground", action="store_true", - dest="foreground", default=False, - help="Use color for foreground text."), - make_option("-l", "--rgb", action="store_true", dest="rgb", - default=False, help="Long format. RGB values as text."), - make_option("-n", "--numbers", action="store_true", dest="numbers", - default=False, help="Include color escape numbers on chart."), - make_option("-o", "--basiccodes", action="store_true", - dest="basiccodes", default=False, - help="Display 16 color chart with SGR ANSI escape codes."), - make_option("-p", "--padding", action="store_true", dest="padding", - default=False, help="Add extra padding (helps discern colors)."), - make_option("-v", "--vertical", action="store_true", dest="vertical", - default=True, help="Display with vertical orientation [default]."), - make_option("-x", "--hex", action="store_true", dest="hex", - default=False, help="Include hex color numbers on chart."), - make_option("-z", "--horizontal", action="store_true", - dest="horizontal", default=False, - help="Display with horizontal orientation."), - ] - - parser = OptionParser(version=__version__, option_list=option_list) - - convert_option_list = [ - make_option("-r", "--256to88", action="store", dest="reduce", - metavar="N", type="int", - help="Convert (reduce) 256 color value N to an 88 color value."), - make_option("-e", "--88to256", action="store", dest="expand", - metavar="N", type="int", - help="Convert (expand) 88 color value N to an 256 color value."), - ] - group = OptionGroup(parser, "Conversion options") - group.add_options(option_list=convert_option_list) - parser.add_option_group(group) - - (options, args) = parser.parse_args(args) - return options - -# instantiate global options based on command arguments -options = _get_options(sys.argv[1:]) -# don't allow -f by itself -options.foreground = options.foreground and ( - options.numbers or options.hex or options.rgb ) - -class _staticmethods(type): - """ Got tired of adding @staticmethod in front of every method. - """ - def __new__(m, n, b, d): - """ turn all methods in to staticmethods. - staticmethod() deals correctly with class attributes. - """ - for (n, f) in d.items(): - if callable(f): - d[n] = staticmethod(f) - return type.__new__(m, n, b, d) - -def _cached(f): - """ Memoize function w/ no params - """ - _cache = {} - def cache(): - if None not in _cache: - _cache[None] = f() - return _cache[None] - return cache - - -class term16(object): - """ Basic 16 color terminal. - """ - __metaclass__ = _staticmethods - - def label(n, esc): - """ color label for 256 color values - """ - if options.numbers: - return esc(n) + "%3d " % n - elif options.hex: - return esc(n) + " %2x " % n - return esc(n) + " " - - def _render(): - """ 16 color info - """ - if options.foreground: - esc = lambda n: fg_escape % n - else: - esc = lambda n: bg_escape % n + fg_escape % (15 if n < 9 else 0) - return [[term16.label(n, esc) + clear for n in range(8)], - [term16.label(n, esc) + clear for n in range(8,16)]] - - def basiccodes(): - text = " gYw " - esc_code = "\x1b[%sm" - print(' ' * 17 + ' '.join([str(40 + n) + "m" for n in range(8)])) - fg_codes = ['0', '1'] - for i in range(30, 38): - fg_codes.extend([str(i), "1;%d" % i]) - for fg in fg_codes: - print("%5sm " % fg + esc_code % fg + text + clear + ' ', end='') - print(' '.join([esc_code % fg + esc_code % bg + text + clear - for bg in range(40, 48)])) - - def display(): - """ display 16 color info - """ - print("System colors:") - colors = term16._render() - padding=' ' if options.padding else '' - for r in colors: - print(padding.join(i for i in r)) - if options.padding: print() - - -class term256(term16): - """ eg. xterm-256 - """ - - @_cached - def _rgb_lookup(): - """ color rgb lookup dict - """ - # color increment is based on xterm/rxvt palette - cincr = [0] + [95+40*n for n in range(5)] - color_rgb = [rgb(i, j, k) - for i in cincr for j in cincr for k in cincr] - color_rgb = dict(zip(range(16, len(color_rgb)+16), color_rgb)) - greys = [rgb(*((n,)*3)) for n in range(8, 248, 10)] - greys = dict(zip(range(232, 256), greys)) - color_rgb.update(greys) - return color_rgb - - def _to_rgb(n): - """ Convert color value to rgb tuple. - """ - return term256._rgb_lookup()[n] - - def _rgb_color_table(): - """ 256 color info - """ - rgbl = term256._rgb_lookup() - label_num = "% 4d: " - label_val = "%s" - if options.foreground: - render = lambda n: fg_escape % n + label_num % n + \ - label_val % str(rgbl[n]) + clear - else: - render = lambda n: fg_escape % n + label_num % n + \ - fg_escape % (16 if rgbl[n].is_light() else 255) \ - + bg_escape % n + label_val % str(rgbl[n]) + clear - return [[render(n) for n in [i+j for j in range(6)]] - for i in range(16, 256, 6)] - - def _rgb_display(): - """ display colors with rgb hex info - """ - colors = term256._rgb_color_table() - padding=' ' if options.padding else '' - while colors: - rows, colors = colors[:6], colors[6:] - if not options.horizontal: - rows = zip(*rows) - for r in rows: - print(padding.join(i for i in r)) - if options.padding: print() - print() - - def _colors(): - """ 256 color numbers - """ - return [[i+j for j in range(6)] for i in range(16, 232, 6)] - - def _greyscale(): - """ 256 greyscale numbers - """ - return [[i+j for j in range(12)] for i in range(232, 256, 12)] - - def _render(palette): - """ compact 256 color info - """ - if options.foreground: - esc = lambda n: fg_escape % n - render = lambda n: term256.label(n, esc) + clear - else: - esc = lambda n: fg_escape % \ - (16 if term256._to_rgb(n).is_light() else 255) - render = lambda n: bg_escape % n + term256.label(n, esc) + clear - return [[render(n) for n in i] for i in palette] - - def _compact_display(): - """ display colors in compact format - """ - colors = term256._render(term256._colors()) - if options.cube: - _cube_display(colors) - elif options.block: - _block_display(colors) - print() - greys = term256._render(term256._greyscale()) - padding=' ' if options.padding else '' - for r in greys: - print(padding.join(i for i in r)) - if options.padding: print() - - def display(): - """ display 256 color info (+ 16 in compact format) - """ - if options.rgb: - print("Xterm RGB values for 6x6x6 color cube and greyscale.") - print() - term256._rgb_display() - else: - term16.display() - print() - print("6x6x6 color cube and greyscale:") - term256._compact_display() - - -class term88(term16): - """ xterm-88 or urxvt - """ - - @_cached - def _rgb_lookup(): - """ color rgb lookup dict - """ - # color increment is based on rxvt palette - cincr = [0, 0x8b, 0xcd, 0xff] - color_rgb = [rgb(i, j, k) - for i in cincr for j in cincr for k in cincr] - color_rgb = dict(zip(range(16, len(color_rgb)+16), color_rgb)) - greys = [rgb(*((n,)*3)) - for n in [0x2e, 0x5c, 0x73, 0x8b, 0xa2, 0xb9, 0xd0, 0xe7]] - greys = dict(zip(range(80, 88), greys)) - color_rgb.update(greys) - return color_rgb - - def _to_rgb(n): - """ Convert color value to rgb tuple. - """ - return term88._rgb_lookup()[n] - - def _rgb_color_table(): - """ 88 color info - """ - rgbl = term88._rgb_lookup() - label_num = "% 4d: " - label_val = "%s" - if options.foreground: - render = lambda n: fg_escape % n + label_num % n + \ - label_val % str(rgbl[n]) + clear - else: - render = lambda n: fg_escape % n + label_num % n + \ - fg_escape % (16 if rgbl[n].is_light() else 87) \ - + bg_escape % n + label_val % str(rgbl[n]) + clear - return [[render(n) for n in [i+j for j in range(4)]] - for i in range(16, 88, 4)] - - def _rgb_display(): - """ display colors with rgb hex info - """ - colors = term88._rgb_color_table() - while colors: - rows, colors = colors[:4], colors[4:] - for r in zip(*rows): - print(''.join(i for i in r)) - print() - - def _render(palette): - """ 88 color info - """ - if options.foreground: - esc = lambda n: fg_escape % n - render = lambda n: term88.label(n, esc) + clear - else: - esc = lambda n: fg_escape % \ - (16 if term88._to_rgb(n).is_light() else 87) - render = lambda n: bg_escape % n + term88.label(n, esc) + clear - return [[render(n) for n in i] for i in palette] - #for n in [i+j for j in range(4)]] - #for i in range(16, 80, 4)] - - def _colors(): - """ 88 color numbers - """ - return [[i+j for j in range(4)] for i in range(16, 80, 4)] - - def _greyscale(): - """ 88 greyscale numbers - """ - return [range(80,88)] - - - def display(): - """ display 16 + 88 color info - """ - if options.rgb: - print("Xterm RGB values for 4x4x4 color cube and greyscale.") - print() - term88._rgb_display() - else: - padding = ' ' if options.padding else '' - term16.display() - print() - print("4x4x4 color cube and greyscale:") - colors = term88._render(term88._colors()) - if options.cube: - _cube_display(colors) - elif options.block: - _block_display(colors) - print() - greys = term88._render(term88._greyscale()) - for r in greys: - print(padding.join(i for i in r)) - -class rgb(tuple): - """ An RGB, (red, green, blue) tuple. Takes integers. - """ - def __new__(cls, r, g, b): - """ We want 3 colors. - """ - return super(rgb, cls).__new__(cls, (r,g,b)) - - def __str__(self): - """ Display in compact rgb format. - """ - return "#%02x%02x%02x" % self - - def is_light(self): - """ Is this color light (or dark). - """ - red, green, blue = self[0], self[1], self[2] - intensity = red*0.2126 + green*0.7152 + blue*0.0722 - return intensity > 127 - - -def _cube_display(colors): - """ Display color cube as color aligned flatten cube sides. - """ - padding = ' ' if options.padding else '' - if options.horizontal: - def _horizontal(colors): - size = int(sqrt(len(colors))) - for n in (n*size for n in range(size)): - colors[n:n+size] = zip(*colors[n:n+size]) - while colors: - rows, colors = colors[:size*2], colors[size*2:] - for n in range(size): - print(padding.join(i - for i in rows[n]+tuple(reversed(rows[n+size])))) - if options.padding: print(padding) - if colors: print() - _horizontal(colors) - else: #options.vertical - default - def _vertical(colors): - size = int(sqrt(len(colors))) - top = [colors[n:len(colors):size*2] for n in range(size)] - bottom = [colors[n+size:len(colors):size*2] - for n in reversed(range(size))] - for group in [top, bottom]: - for rows in group: - for r in rows: - print(padding.join(i for i in r), end=' ') - if options.padding: print(padding, end=' ') - if options.padding: print() - print() - _vertical(colors) - -def _block_display(colors): - """ Display color cube as cube sides organized by color #s (default). - """ - padding = ' ' if options.padding else '' - size = int(sqrt(len(colors))) - if not options.horizontal: - for n in (n*size for n in range(size)): - colors[n:n+size] = zip(*colors[n:n+size]) - while colors: - half = size*(size//2) - rows, colors = colors[:half], colors[half:] - for n in range(size): - for r in rows[n:len(rows):size]: - print(padding.join(i for i in r), end=' ') - if options.padding: print(padding, end=' ') - if options.padding: print() - print() - if colors: print() - -def convert88to256(n): - """ 88 (4x4x4) color cube to 256 (6x6x6) color cube values - """ - if n < 16: - return n - elif n > 79: - return 234 + (3 * (n - 80)) - else: - def m(n): - "0->0, 1->1, 2->3, 3->5" - return n and n + n-1 or n - b = n - 16 - x = b % 4 - y = (b // 4) % 4 - z = b // 16 - return 16 + m(x) + (6 * m(y) + 36 * m(z)) - -def convert256to88(n): - """ 256 (6x6x6) color cube to 88 (4x4x4) color cube values - """ - if n < 16: - return n - elif n > 231: - if n < 234: - return 0 - return 80 + ((n - 234) // 3) - else: - def m(n, _ratio=(4./6.)): - if n < 2: - return int(ceil(_ratio*n)) - else: - return int(_ratio*n) - b = n - 16 - x = b % 6 - y = (b // 6) % 6 - z = b // 36 - return 16 + m(x) + (4 * m(y) + 16 * m(z)) - -def _terminal(): - """ detect # of colors supported by terminal and return appropriate - terminal class - """ - curses.setupterm() - num_colors = curses.tigetnum('colors') - if num_colors > 0: - return {16:term16, 88:term88, 256:term256}.get(num_colors, term16) - -def main(): - if options.reduce: - v = convert256to88(options.reduce) - # reconvert back to display reduction in context - print("%s (equivalent to 256 value: %s)" % (v, convert88to256(v))) - elif options.expand: - print(convert88to256(options.expand)) - else: - term = _terminal() - if term is None: - print("Your terminal reports that it has no color support.") - else: - if options.basiccodes: - print("Basic 16 color chart with SGR ANSI escape codes.\n") - term16.basiccodes() - else: - term.display() - -if __name__ == "__main__": - main() + $f7 ▄█▄ $rst + $f7▄█████████▄$rst + $f7▀▀▀▀▀▀▀▀▀▀▀$rst +EOF diff --git a/termcolors/glam-blue b/termcolors/glam-blue new file mode 100644 index 0000000..a9ded2e --- /dev/null +++ b/termcolors/glam-blue @@ -0,0 +1,20 @@ +*.foreground: #C4C4C4 +*.background: #2F343F +*.cursorColor: #7ea2b4 +*.color0: #161b1d +*.color8: #3A3D3F +*.color1: #64B2DB +*.color9: #64B2DB +*.color2: #64B2DB +*.color10: #64B2DB +*.color3: #64B2DB +*.color11: #64B2DB +*.color4: #64B2DB +*.color12: #64B2DB +*.color5: #64B2DB +*.color13: #64B2DB +*.color6: #64B2DB +*.color14: #64B2DB +*.color7: #C4C4C4 +*.color15: #C4C4C4 + diff --git a/termcolors/halflife b/termcolors/halflife new file mode 100644 index 0000000..e53fe7c --- /dev/null +++ b/termcolors/halflife @@ -0,0 +1,38 @@ +!Black background. +*background: #222222 +*foreground: #cccccc +*.cursorColor: #c5c8c6 + +! black +*.color0: #323232 +*.color8: #555555 + +! red +*.color1: #cc342b +*.color9: #cc342b + +! green +*.color2: #198844 +*.color10: #198844 + +! yellow +*.color3: #F9D423 +*.color11: #F9e413 + +! blue +*.color4: #3971ed +*.color12: #3971ed + +! magenta +*.color5: #a36ac7 +*.color13: #a36ac7 + +! cyan +*.color6: #3971ed +*.color14: #3971ed + +! white +*.color7: #c5c8c6 +*.color15: #ffffff + +! vim: ft=xdefaults diff --git a/termcolors/holy b/termcolors/holy new file mode 100644 index 0000000..6e5dfe5 --- /dev/null +++ b/termcolors/holy @@ -0,0 +1,27 @@ + +*background: #1D2426 +*foreground: #8FA388 + +! Alternate foreground +!*foreground: #AB9C71 + +*cursorColor: #BE5E1E + +*color0: #39474A +*color1: #986345 +*color2: #788249 +*color3: #9B6A46 +*color4: #3E5951 +*color5: #B9924A +*color6: #5d796a +*color7: #977D5E +*color8: #4C5F63 +*color9: #B07350 +*color10: #869151 +*color11: #AF6B42 +*color12: #567A6E +*color13: #D69D55 +*color14: #668574 +*color15: #AB9C71 + +! vim: ft=xdefaults diff --git a/termcolors/rainbown b/termcolors/rainbown new file mode 100644 index 0000000..dba2f1e --- /dev/null +++ b/termcolors/rainbown @@ -0,0 +1,20 @@ +!Black background. +*background: #2d2d2d +*foreground: #EFECE3 + +*color0: #4B3822 +*color8: #4B3822 +*color1: #A93D2E +*color9: #A93D2E +*color2: #7D893E +*color10: #7D893E +*color3: #D9AF30 +*color11: #D9AF30 +*color4: #557E8D +*color12: #557E8D +*color5: #D1725C +*color13: #D1725C +*color6: #8BBCCB +*color14: #8BBCCB +*color7: #EFECE3 +*color15: #EFECE3 diff --git a/termcolors/sourcerer b/termcolors/sourcerer new file mode 100644 index 0000000..5f0c3c5 --- /dev/null +++ b/termcolors/sourcerer @@ -0,0 +1,45 @@ +! +! ██████ ██████ ██ ██ ██████ █████ █████ ██████ █████ ██████ +! ██░░░░ ██░░░░██░██ ░██░░██░░████░░░██ ██░░░██░░██░░████░░░██░░██░░██ +! ░░█████ ░██ ░██░██ ░██ ░██ ░░░██ ░░ ░███████ ░██ ░░░███████ ░██ ░░ +! ░░░░░██░██ ░██░██ ░██ ░██ ░██ ██░██░░░░ ░██ ░██░░░░ ░██ +! ██████ ░░██████ ░░██████░███ ░░█████ ░░██████░███ ░░██████░███ +! ░░░░░░ ░░░░░░ ░░░░░░ ░░░ ░░░░░ ░░░░░░ ░░░ ░░░░░░ ░░░ +! r e a d c o d e l i k e a w i z a r d +! +! sourcerer by xero harrison (http://sourcerer.xero.nu) +! ├─ based on sorcerer by Jeet Sukumaran (http://jeetworks.org) +! └─ based on mustang by Henrique C. Alves (hcarvalhoalves@gmail.com) + +! █▓▒░ scorcerer colors +*.foreground: #c2c2b0 +*.background: #222222 +*.cursorColor: #c2c2b0 +! black +*.color0: #111111 +*.color8: #181818 +! red +*.color1: #aa4450 +*.color9: #ff6a6a +! green +*.color2: #719611 +*.color10: #b1d631 +! yellow +*.color3: #cc8800 +*.color11: #ff9800 +! blue +*.color4: #6688aa +*.color12: #90b0d1 +! magenta +*.color5: #8f6f8f +*.color13: #8181a6 +! cyan +*.color6: #528b8b +*.color14: #87ceeb +! white +*.color7: #d3d3d3 +*.color15: #c1cdc1 +! stylized +*.colorIT: #719611 +*.colorBD: #d3d3d3 +*.colorUL: #528b8b diff --git a/termcolors/witch b/termcolors/witch new file mode 100644 index 0000000..522cde2 --- /dev/null +++ b/termcolors/witch @@ -0,0 +1,38 @@ +*background: #0f0f0f +*foreground: #f0f0f0 + +!URxvt.colorIT: # +!URxvt.colorUL: # +!URxvt.colorBD: # + +! BLACK +*color0: #0f0f0f +*color8: #2f2f2f + +! RED +*color1: #aa6644 +*color9: #dd9955 + +! GREEN +*color2: #445533 +*color10: #778844 + +! YELLOW +*color3: #eeddaa +*color11: #eedd66 + +! BLUE +*color4: #445566 +*color12: #5b94c7 + +! MAGENTA +*color5: #ab4489 +*color13: #de5499 + +! CYAN +*color6: #4499ab +*color14: #5499de + +! WHITE +*color7: #f0f0f0 +*color15: #ffffff diff --git a/termcolors/yosemite b/termcolors/yosemite index 240b057..e3055a7 100644 --- a/termcolors/yosemite +++ b/termcolors/yosemite @@ -4,8 +4,8 @@ ! Sunday, 01 November 2015 14:34 IST ! -*background: #E0E0E0 -*foreground: #333333 +*background: #E0E0E1 +*foreground: #232323 ! BLACK *color0: #ECECEC @@ -39,6 +39,6 @@ *color7: #909090 *color15: #2A2A2A -dzen2.foreground: #a0a0a0 -dzen2.background: #262626 +!dzen2.background: #a0a0a0 +!dzen2.foreground: #262626 ! vim: ft=xdefaults diff --git a/vim/colors/halflife.vim b/vim/colors/halflife.vim new file mode 100644 index 0000000..fdca7d0 --- /dev/null +++ b/vim/colors/halflife.vim @@ -0,0 +1,105 @@ +" ====================================================================== +" Halflife +" ====================================================================== +" A Sublime Text 2 / Textmate theme. +" Copyright (c) 2014 Dayle Rees. +" Released under the MIT License +" ====================================================================== +" Find more themes at : https://github.com/daylerees/colour-schemes +" ====================================================================== + +set background=dark +hi clear +syntax reset + +" Colors for the User Interface. + +hi Cursor guibg=#cc4455 guifg=white ctermbg=4 ctermfg=15 +hi link CursorIM Cursor +hi Normal guibg=#222222 guifg=#cccccc gui=none ctermbg=0 ctermfg=15 +hi NonText guibg=bg guifg=#cccccc ctermbg=8 ctermfg=14 +hi Visual guibg=#557799 guifg=white gui=none ctermbg=9 ctermfg=15 + +hi Linenr guibg=bg guifg=#aaaaaa gui=none ctermbg=bg ctermfg=7 + +hi Directory guibg=bg guifg=#337700 gui=none ctermbg=bg ctermfg=10 + +hi IncSearch guibg=#0066cc guifg=white gui=none ctermbg=1 ctermfg=15 +hi link Seach IncSearch + +hi SpecialKey guibg=bg guifg=fg gui=none ctermbg=bg ctermfg=fg +hi Titled guibg=bg guifg=fg gui=none ctermbg=bg ctermfg=fg + +hi ErrorMsg guibg=bg guifg=#ff0000 ctermbg=bg ctermfg=12 +hi ModeMsg guibg=bg guifg=#ffeecc gui=none ctermbg=bg ctermfg=14 +hi link MoreMsg ModeMsg +hi Question guibg=bg guifg=#FC913A ctermbg=bg ctermfg=10 +hi link WarningMsg ErrorMsg + +hi StatusLine guibg=#ffeecc guifg=black ctermbg=14 ctermfg=0 +hi StatusLineNC guibg=#cc4455 guifg=white gui=none ctermbg=4 ctermfg=11 +hi VertSplit guibg=#cc4455 guifg=white gui=none ctermbg=4 ctermfg=11 + +hi DiffAdd guibg=#446688 guifg=fg gui=none ctermbg=1 ctermfg=fg +hi DiffChange guibg=#558855 guifg=fg gui=none ctermbg=2 ctermfg=fg +hi DiffDelete guibg=#884444 guifg=fg gui=none ctermbg=4 ctermfg=fg +hi DiffText guibg=#884444 guifg=fg ctermbg=4 ctermfg=fg + +" Colors for Syntax Highlighting. + +hi Comment guibg=bg guifg=#555555 gui=none ctermbg=8 ctermfg=7 + +hi Constant guibg=bg guifg=white ctermbg=8 ctermfg=15 +hi String guibg=bg guifg=#F9D423 ctermbg=bg ctermfg=14 +hi Character guibg=bg guifg=#7D8991 ctermbg=bg ctermfg=14 +hi Number guibg=bg guifg=#F9D423 ctermbg=1 ctermfg=15 +hi Boolean guibg=bg guifg=#F9D423 gui=none ctermbg=1 ctermfg=15 +hi Float guibg=bg guifg=#F9D423 ctermbg=1 ctermfg=15 + +hi Identifier guibg=bg guifg=#cccccc ctermbg=bg ctermfg=12 +hi Function guibg=bg guifg=#7D8991 ctermbg=bg ctermfg=12 +hi Statement guibg=bg guifg=#7D8991 ctermbg=bg ctermfg=14 + +hi Conditional guibg=bg guifg=#7D8991 ctermbg=bg ctermfg=12 +hi Repeat guibg=bg guifg=#7D8991 ctermbg=4 ctermfg=14 +hi Label guibg=bg guifg=#ffccff ctermbg=bg ctermfg=13 +hi Operator guibg=bg guifg=#7D8991 ctermbg=6 ctermfg=15 +hi Keyword guibg=bg guifg=#7D8991 ctermbg=bg ctermfg=10 +hi Exception guibg=bg guifg=#7D8991 ctermbg=bg ctermfg=10 + +hi PreProc guibg=bg guifg=#ffcc99 ctermbg=4 ctermfg=14 +hi Include guibg=bg guifg=#FC913A ctermbg=bg ctermfg=10 +hi link Define Include +hi link Macro Include +hi link PreCondit Include + +hi Type guibg=bg guifg=#FC913A ctermbg=bg ctermfg=12 +hi StorageClass guibg=bg guifg=#7D8991 ctermbg=bg ctermfg=10 +hi Structure guibg=bg guifg=#cccccc ctermbg=bg ctermfg=10 +hi Typedef guibg=bg guifg=#FC913A ctermbg=bg ctermfg=10 + +hi Special guibg=bg guifg=#bbddff ctermbg=1 ctermfg=15 +hi SpecialChar guibg=bg guifg=#bbddff ctermbg=1 ctermfg=15 +hi Tag guibg=bg guifg=#bbddff ctermbg=1 ctermfg=15 +hi Delimiter guibg=bg guifg=fg ctermbg=1 ctermfg=fg +hi SpecialComment guibg=#334455 guifg=#808080 ctermbg=1 ctermfg=15 +hi Debug guibg=bg guifg=#ff9999 gui=none ctermbg=8 ctermfg=12 + +hi Underlined guibg=bg guifg=#99ccff gui=underline ctermbg=bg ctermfg=9 cterm=underline + +hi Title guibg=bg guifg=#cccccc ctermbg=1 ctermfg=15 +hi Ignore guibg=bg guifg=#cccccc ctermbg=bg ctermfg=8 +hi Error guibg=#ff0000 guifg=white ctermbg=12 ctermfg=15 +hi Todo guibg=#556677 guifg=#ff0000 ctermbg=1 ctermfg=12 + +hi htmlH2 guibg=bg guifg=fg ctermbg=8 ctermfg=fg +hi link htmlH3 htmlH2 +hi link htmlH4 htmlH3 +hi link htmlH5 htmlH4 +hi link htmlH6 htmlH5 + +" And finally. + +let g:colors_name = "Halflife" +let colors_name = "Halflife" + diff --git a/vim/syntax/vala.vim b/vim/syntax/vala.vim new file mode 100644 index 0000000..3700fb6 --- /dev/null +++ b/vim/syntax/vala.vim @@ -0,0 +1,200 @@ +" Vim syntax file +" Language: Vala +" Maintainers: Emmanuele Bassi +" Hans Vercammen +" pancake +" Sebastian Reichel +" Last Change: 2012-02-19 +" Filenames: *.vala *.vapi +" +" REFERENCES: +" [1] http://live.gnome.org/Vala +" +" TODO: Possibly when reaching vala 1.0 release +" - validate code attributes +" - better error checking for known errors +" - full support for valadoc +" +" add vala in /usr/share/vim/vim73/scripts.vim below ruby +" to have shebang support + +if exists("b:current_syntax") + finish +endif + +let s:vala_cpo_save = &cpo +set cpo&vim + +" Types +syn keyword valaType bool char double float size_t ssize_t string unichar void +syn keyword valaType int int8 int16 int32 int64 long short +syn keyword valaType uint uint8 uint16 uint32 uint64 ulong ushort +" Storage keywords +syn keyword valaStorage class delegate enum errordomain interface namespace struct +" repeat / condition / label +syn keyword valaRepeat break continue do for foreach return while +syn keyword valaConditional else if switch assert +" User Labels +syn keyword valaLabel case default + +" Modifiers +syn keyword valaModifier abstract const dynamic ensures extern inline internal override +syn keyword valaModifier private protected public requires signal static virtual volatile weak +syn keyword valaModifier async owned unowned +" Constants +syn keyword valaConstant false null true +" Exceptions +syn keyword valaException try catch finally throw +" Unspecified Statements +syn keyword valaUnspecifiedStatement as base construct delete get in is lock new out params ref sizeof set this throws typeof using value var yield + +" Comments +syn cluster valaCommentGroup contains=valaTodo +syn keyword valaTodo contained TODO FIXME XXX NOTE + +" valadoc Comments (ported from javadoc comments in java.vim) +" TODO: need to verify valadoc syntax +if !exists("vala_ignore_valadoc") + syn cluster valaDocCommentGroup contains=valaDocTags,valaDocSeeTag + syn region valaDocTags contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}" + syn match valaDocTags contained "@\(param\|exception\|throws\|since\)\s\+\S\+" contains=valaDocParam + syn match valaDocParam contained "\s\S\+" + syn match valaDocTags contained "@\(author\|brief\|version\|return\|deprecated\)\>" + syn region valaDocSeeTag contained matchgroup=valaDocTags start="@see\s\+" matchgroup=NONE end="\_."re=e-1 contains=valaDocSeeTagParam + syn match valaDocSeeTagParam contained @"\_[^"]\+"\|\|\(\k\|\.\)*\(#\k\+\((\_[^)]\+)\)\=\)\=@ extend +endif + +" Comment Strings (ported from c.vim) +if exists("vala_comment_strings") + syn match valaCommentSkip contained "^\s*\*\($\|\s\+\)" + syn region valaCommentString contained start=+L\=\\\@" skip="\\$" end="$" end="//"me=s-1 +syn match valaPreCondit display "^\s*\(%:\|#\)\s*\(else\|endif\)\>" + +" Comment if 0 blocks (ported from c.vim) +if !exists("vala_no_if0") + syn region valaCppOut start="^\s*\(%:\|#\)\s*if\s\+0\+\>" end=".\@=\|$" contains=valaCppOut2 fold + syn region valaCppOut2 contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=valaSpaceError,valaCppSkip + syn region valaCppSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=valaSpaceError,valaCppSkip +endif + +" match comment errors +syntax match valaCommentError display "\*/" +syntax match valaCommentStartError display "/\*"me=e-1 contained +" match the special comment /**/ +syn match valaComment "/\*\*/" + +" Vala Code Attributes +syn region valaAttribute start="^\s*\[" end="\]$" contains=valaComment,valaString keepend +syn region valaAttribute start="\[CCode" end="\]" contains=valaComment,valaString + +" Avoid escaped keyword matching +syn match valaUserContent display "@\I*" + +" Strings and constants +syn match valaSpecialError contained "\\." +syn match valaSpecialCharError contained "[^']" +syn match valaSpecialChar contained +\\["\\'0abfnrtvx]+ +syn region valaString start=+"+ end=+"+ end=+$+ contains=valaSpecialChar,valaSpecialError,valaUnicodeNumber,@Spell +syn region valaVerbatimString start=+"""+ end=+"""+ contains=@Spell +syn match valaUnicodeNumber +\\\(u\x\{4}\|U\x\{8}\)+ contained contains=valaUnicodeSpecifier +syn match valaUnicodeSpecifier +\\[uU]+ contained +syn match valaCharacter "'[^']*'" contains=valaSpecialChar,valaSpecialCharError +syn match valaCharacter "'\\''" contains=valaSpecialChar +syn match valaCharacter "'[^\\]'" +syn match valaNumber display "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>" +syn match valaNumber display "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\=" +syn match valaNumber display "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>" +syn match valaNumber display "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>" + +" when wanted, highlight trailing white space +if exists("vala_space_errors") + if !exists("vala_no_trail_space_error") + syn match valaSpaceError display excludenl "\s\+$" + endif + if !exists("vala_no_tab_space_error") + syn match valaSpaceError display " \+\t"me=e-1 + endif +endif + +" when wanted, set minimum lines for comment syntax syncing +if exists("vala_minlines") + let b:vala_minlines = vala_minlines +else + let b:vala_minlines = 50 +endif +exec "syn sync ccomment valaComment minlines=" . b:vala_minlines + +" code folding +syn region valaBlock start="{" end="}" transparent fold + +" The default highlighting. +hi def link valaType Type +hi def link valaStorage StorageClass +hi def link valaRepeat Repeat +hi def link valaConditional Conditional +hi def link valaLabel Label +hi def link valaModifier StorageClass +hi def link valaConstant Constant +hi def link valaException Exception +hi def link valaUnspecifiedStatement Statement +hi def link valaUnspecifiedKeyword Keyword +hi def link valaContextualStatement Statement + +hi def link valaCommentError Error +hi def link valaCommentStartError Error +hi def link valaSpecialError Error +hi def link valaSpecialCharError Error +hi def link valaSpaceError Error + +hi def link valaTodo Todo +hi def link valaCommentL valaComment +hi def link valaCommentStart valaComment +hi def link valaCommentSkip valaComment +hi def link valaComment Comment +hi def link valaDocComment Comment +hi def link valaDocTags Special +hi def link valaDocParam Function +hi def link valaDocSeeTagParam Function +hi def link valaAttribute PreCondit + +hi def link valaCommentString valaString +hi def link valaComment2String valaString +hi def link valaString String +hi def link valaVerbatimString String +hi def link valaCharacter Character +hi def link valaSpecialChar SpecialChar +hi def link valaNumber Number +hi def link valaUnicodeNumber SpecialChar +hi def link valaUnicodeSpecifier SpecialChar + +hi def link valaPreCondit PreCondit + +if !exists("vala_no_if0") + hi def link valaCppSkip valaCppOut + hi def link valaCppOut2 valaCppOut + hi def link valaCppOut Comment +endif + +let b:current_syntax = "vala" + +let &cpo = s:vala_cpo_save +unlet s:vala_cpo_save + +" vim: ts=8 diff --git a/vimrc b/vimrc index 79033a0..f74196d 100644 --- a/vimrc +++ b/vimrc @@ -13,7 +13,7 @@ if has("gui_running") colo hybrid set bg=dark "set guifont=Envy\ Code\ R\ 9 - set guifont=Fira\ Mono\ Medium\ 9 + set guifont=Fira\ Mono\ Regular\ 9 else set bg=light endif -- cgit v1.2.3-70-g09d2