From: Samir Benmendil Date: Thu, 29 Jan 2015 15:50:17 +0000 (+0000) Subject: Merge branch 'master' of tardis:dotfiles X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/ca5e587bfa6ad1b35f11e899575cb872cf000fd0?hp=03e579243f0a60f763bbc40ab5cfa7cd964b719e Merge branch 'master' of tardis:dotfiles --- diff --git a/Makefile b/Makefile index 3c9162d..9c266c3 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ APATH := $(realpath .) FILES := bin -DOTFILES := conky* git* goobookrc msmtp* mutt ncmpcpp profile weechat xbindkeysrc Xresources xprofile zprofile zshenv zshrc -CONFIGFILES := aliases compton.conf git mimeo.conf mpd mpv offlineimap ranger retroarch systemd vim xkb zsh +DOTFILES := conky* git* goobookrc msmtp* mutt ncmpcpp profile weechat Xresources xprofile zprofile zshenv zshrc +CONFIGFILES := aliases compton.conf git mimeo.conf mpd mpv offlineimap ranger retroarch systemd vim xbindkeys xkb zsh .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES) install: $(FILES) $(DOTFILES) $(CONFIGFILES) diff --git a/Xresources b/Xresources index d309ca8..068d705 100644 --- a/Xresources +++ b/Xresources @@ -21,7 +21,7 @@ URxvt.iso14755: false URxvt.iso14755_52: false ! {{{1 Perl extensions -URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select +URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,autocomplete-ALL-the-things ! {{{2 url-select URxvt.keysym.C-F: perl:url-select:select_next URxvt.url-select.button: 1 @@ -34,6 +34,9 @@ URxvt.keysym.C-question: perl:keyboard-select:search URxvt.keysym.C-C: perl:clipboard:copy URxvt.keysym.C-V: perl:clipboard:paste URxvt.keysym.C-A-V: perl:clipboard:paste_escaped +! {{{2 autocomplete-ALL-the-things +URxvt.keysym.C-S-ISO_Left_Tab: perl:aAtt:fuzzy-WORD-complete +URxvt.keysym.C-S-BackSpace: perl:aAtt:undo ! {{{1 Colours URxvt*.background: #000000 diff --git a/awesome/bindings.lua b/awesome/bindings.lua index 5ff504e..d8e1531 100644 --- a/awesome/bindings.lua +++ b/awesome/bindings.lua @@ -15,9 +15,6 @@ clientbuttons = awful.util.table.join( -- Global Keys {{{1 globalkeys = awful.util.table.join(globalkeys, -- Awesome Keys {{{2 - awful.key({ modkey, }, "Left", awful.tag.viewprev ), - awful.key({ modkey, }, "Right", awful.tag.viewnext ), - awful.key({ modkey, }, "j", function () awful.client.focus.byidx( 1) @@ -62,9 +59,14 @@ globalkeys = awful.util.table.join(globalkeys, awful.util.getdir("cache") .. "/history_eval") end), -- Menubar - awful.key({ modkey }, "p", function() menubar.show() end), + -- awful.key({ modkey }, "p", function() menubar.show() end), -- My Keys {{{2 + awful.key({ modkey, }, "Left", awful.tag.viewprev ), + awful.key({ modkey, }, "Down", awful.tag.viewprev ), + awful.key({ modkey, }, "Right", awful.tag.viewnext ), + awful.key({ modkey, }, "Up", awful.tag.viewnext ), + -- Menu awful.key({ modkey }, "w", function () mymainmenu:show({ coords = { x = 0, y = 0}}) end), -- Prompt @@ -84,12 +86,16 @@ globalkeys = awful.util.table.join(globalkeys, awful.key({ modkey, }, "Escape", awful.tag.history.restore), awful.key({ modkey, }, "#49", function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (chronos) awful.key({ modkey, }, "#94", function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (shada) + awful.key({ modkey, }, "=", function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (kinesis) awful.key({ modkey, "Control" }, "Left", function () awful.screen.focus_relative( 1) end), awful.key({ modkey, "Control" }, "Right", function () awful.screen.focus_relative(-1) end), -- Volume awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("ponymix increase 5") end), awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("ponymix decrease 5") end), - awful.key({ }, "XF86AudioMute", function () awful.util.spawn("ponymix toggle") end) + awful.key({ }, "XF86AudioMute", function () awful.util.spawn("ponymix toggle") end), + awful.key({ modkey }, "F10", function () awful.util.spawn("ponymix toggle") end), + awful.key({ modkey }, "F11", function () awful.util.spawn("ponymix decrease 5") end), + awful.key({ modkey }, "F12", function () awful.util.spawn("ponymix increase 5") end) ) -- Client keys {{{1 @@ -115,6 +121,7 @@ clientkeys = awful.util.table.join( -- Move client to screen awful.key({ modkey, "Shift" }, "#94", awful.client.movetoscreen ), awful.key({ modkey, "Shift" }, "#49", awful.client.movetoscreen ), + awful.key({ modkey, "Shift" }, "=", awful.client.movetoscreen ), -- kinesis -- ontop and below awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end), awful.key({ modkey, }, "b", function (c) c.below = not c.below end) @@ -129,11 +136,15 @@ for i = 1, 9 do globalkeys = awful.util.table.join(globalkeys, awful.key({ modkey }, "#" .. i + 9, function () - local screen = mouse.screen - local tag = awful.tag.gettags(screen)[i] - if tag then - awful.tag.viewonly(tag) - end + local screen = mouse.screen + local tag = awful.tag.gettags(screen)[i] + if tag then + if tag == awful.tag.selected(screen) then + awful.tag.history.restore(screen) + else + awful.tag.viewonly(tag) + end + end end), awful.key({ modkey, "Control" }, "#" .. i + 9, function () diff --git a/awesome/rc.lua b/awesome/rc.lua index 9d8a7d3..af38777 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -50,12 +50,12 @@ if beautiful.wallpaper then end -- Require files {{{1 +require("bindings") require("tags") require("menu") require("topbar") -require("bindings") require("rules") -require("conky") +-- require("conky") require("autostart") require("signals") diff --git a/awesome/rules.lua b/awesome/rules.lua index 2d07e9d..2bdd306 100644 --- a/awesome/rules.lua +++ b/awesome/rules.lua @@ -37,6 +37,8 @@ awful.rules.rules = { ontop = true, x = 1920 - 310, y = mywibox[mouse.screen].height, width = 100, height = 100 } }, + { rule = { class = "URxvt"}, + properties = { opacity = 0.8 } }, { rule = { class = "URxvt", instance = "mutt" }, properties = { tag = wwwtag, function (c) awful.client.setslave(c) end } }, diff --git a/awesome/signals.lua b/awesome/signals.lua index 748b09e..a918571 100644 --- a/awesome/signals.lua +++ b/awesome/signals.lua @@ -1,13 +1,5 @@ -- Signal function to execute when a new client appears. client.connect_signal("manage", function (c, startup) - -- Enable sloppy focus - c:connect_signal("mouse::enter", function(c) - if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier - and awful.client.focus.filter(c) then - client.focus = c - end - end) - if not startup then -- Set the windows at the slave, -- i.e. put it at the end of others instead of setting it master. @@ -18,6 +10,17 @@ client.connect_signal("manage", function (c, startup) awful.placement.no_overlap(c) awful.placement.no_offscreen(c) end + elseif not c.size_hints.user_position and not c.size_hints.program_position then + -- Prevent clients from being unreachable after screen count change + awful.placement.no_offscreen(c) + end +end) + +-- Enable sloppy focus +client.connect_signal("mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c end end) diff --git a/awesome/widgets/awesompd.lua b/awesome/widgets/awesompd.lua index 6ac8964..d697be1 100644 --- a/awesome/widgets/awesompd.lua +++ b/awesome/widgets/awesompd.lua @@ -43,6 +43,11 @@ musicwidget:register_buttons({ { "", awesompd.MOUSE_SCROLL_UP, musicwidget:command_volume_up() }, { "", awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_volume_down() }, { "", awesompd.MOUSE_RIGHT, musicwidget:command_show_menu() }, + { modkey, "p", musicwidget:command_playpause() }, + { modkey, ",", musicwidget:command_prev_track() }, + { modkey, ".", musicwidget:command_next_track() }, + { { modkey, "Shift" }, ",", musicwidget:command_previous_server() }, + { { modkey, "Shift" }, ".", musicwidget:command_next_server() }, { "", "XF86AudioPlay", musicwidget:command_playpause() }, { "", "XF86AudioPrev", musicwidget:command_prev_track() }, { "", "XF86AudioNext", musicwidget:command_next_track() }, diff --git a/compton.conf b/compton.conf index c4a1bd6..d77d215 100644 --- a/compton.conf +++ b/compton.conf @@ -28,7 +28,7 @@ blur-background-frame = true; #blur-background-fixed = false; blur-background-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ]; # transaprent urxvt -opacity-rule = ["80:class_g = 'URxvt'"]; +# opacity-rule = ["80:class_g = 'URxvt'"]; # Fading #fading = true; diff --git a/dircolors b/dircolors new file mode 100644 index 0000000..834eeca --- /dev/null +++ b/dircolors @@ -0,0 +1,289 @@ + +# Dark 256 color solarized theme for the color GNU ls utility. +# Used and tested with dircolors (GNU coreutils) 8.5 +# +# @author {@link http://sebastian.tramp.name Sebastian Tramp} +# @license http://sam.zoy.org/wtfpl/ Do What The Fuck You Want To Public License (WTFPL) +# +# More Information at +# https://github.com/seebi/dircolors-solarized + +# Term Section +TERM Eterm +TERM ansi +TERM color-xterm +TERM con132x25 +TERM con132x30 +TERM con132x43 +TERM con132x60 +TERM con80x25 +TERM con80x28 +TERM con80x30 +TERM con80x43 +TERM con80x50 +TERM con80x60 +TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM dvtm +TERM dvtm-256color +TERM eterm-color +TERM fbterm +TERM gnome +TERM gnome-256color +TERM jfbterm +TERM konsole +TERM konsole-256color +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mlterm +TERM putty +TERM putty-256color +TERM rxvt +TERM rxvt-256color +TERM rxvt-cygwin +TERM rxvt-cygwin-native +TERM rxvt-unicode +TERM rxvt-unicode256 +TERM rxvt-unicode-256color +TERM screen +TERM screen-16color +TERM screen-16color-bce +TERM screen-16color-s +TERM screen-16color-bce-s +TERM screen-256color +TERM screen-256color-bce +TERM screen-256color-s +TERM screen-256color-bce-s +TERM screen-bce +TERM screen-w +TERM screen.linux +TERM st +TERM st-meta +TERM st-256color +TERM st-meta-256color +TERM vt100 +TERM xterm +TERM xterm-16color +TERM xterm-256color +TERM xterm-88color +TERM xterm-color +TERM xterm-debian +TERM xterm-termite + +## Documentation +# +# standard colors +# +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +# +# +# 256 color support +# see here: http://www.mail-archive.com/bug-coreutils@gnu.org/msg11030.html) +# +# Text 256 color coding: +# 38;5;COLOR_NUMBER +# Background 256 color coding: +# 48;5;COLOR_NUMBER + +## Special files + +NORMAL 00;38;5;244 # no color code at all +FILE 00 # regular file: use no color at all +RESET 0 # reset to "normal" color +DIR 00;38;5;33 # directory 01;34 +LINK 00;38;5;37 # symbolic link. (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 00 # regular file with more than one link +FIFO 48;5;230;38;5;136;01 # pipe +SOCK 48;5;230;38;5;136;01 # socket +DOOR 48;5;230;38;5;136;01 # door +BLK 48;5;230;38;5;244;01 # block device driver +CHR 48;5;230;38;5;244;01 # character device driver +ORPHAN 48;5;235;38;5;160 # symlink to nonexistent file, or non-stat'able file +SETUID 48;5;160;38;5;230 # file that is setuid (u+s) +SETGID 48;5;136;38;5;230 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 48;5;64;38;5;230 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 48;5;235;38;5;33 # dir that is other-writable (o+w) and not sticky +STICKY 48;5;33;38;5;230 # dir with the sticky bit set (+t) and not other-writable +# This is for files with execute permission: +EXEC 00;38;5;64 + +## Archives or compressed (violet + bold for compression) +.tar 00;38;5;61 +.tgz 00;38;5;61 +.arj 00;38;5;61 +.taz 00;38;5;61 +.lzh 00;38;5;61 +.lzma 00;38;5;61 +.tlz 00;38;5;61 +.txz 00;38;5;61 +.zip 00;38;5;61 +.z 00;38;5;61 +.Z 00;38;5;61 +.dz 00;38;5;61 +.gz 00;38;5;61 +.lz 00;38;5;61 +.xz 00;38;5;61 +.bz2 00;38;5;61 +.bz 00;38;5;61 +.tbz 00;38;5;61 +.tbz2 00;38;5;61 +.tz 00;38;5;61 +.deb 00;38;5;61 +.rpm 00;38;5;61 +.jar 00;38;5;61 +.rar 00;38;5;61 +.ace 00;38;5;61 +.zoo 00;38;5;61 +.cpio 00;38;5;61 +.7z 00;38;5;61 +.rz 00;38;5;61 +.apk 00;38;5;61 +.gem 00;38;5;61 + +# Image formats (yellow) +.jpg 00;38;5;136 +.JPG 00;38;5;136 #stupid but needed +.jpeg 00;38;5;136 +.gif 00;38;5;136 +.bmp 00;38;5;136 +.pbm 00;38;5;136 +.pgm 00;38;5;136 +.ppm 00;38;5;136 +.tga 00;38;5;136 +.xbm 00;38;5;136 +.xpm 00;38;5;136 +.tif 00;38;5;136 +.tiff 00;38;5;136 +.png 00;38;5;136 +.PNG 00;38;5;136 +.svg 00;38;5;136 +.svgz 00;38;5;136 +.mng 00;38;5;136 +.pcx 00;38;5;136 +.dl 00;38;5;136 +.xcf 00;38;5;136 +.xwd 00;38;5;136 +.yuv 00;38;5;136 +.cgm 00;38;5;136 +.emf 00;38;5;136 +.eps 00;38;5;136 +.CR2 00;38;5;136 +.ico 00;38;5;136 + +# Files of special interest (base1) +.tex 00;38;5;245 +.rdf 00;38;5;245 +.owl 00;38;5;245 +.n3 00;38;5;245 +.ttl 00;38;5;245 +.nt 00;38;5;245 +.torrent 00;38;5;245 +.xml 00;38;5;245 +*Makefile 00;38;5;245 +*Rakefile 00;38;5;245 +*build.xml 00;38;5;245 +*rc 00;38;5;245 +*1 00;38;5;245 +.nfo 00;38;5;245 +*README 00;38;5;245 +*README.txt 00;38;5;245 +*readme.txt 00;38;5;245 +.md 00;38;5;245 +*README.markdown 00;38;5;245 +.ini 00;38;5;245 +.yml 00;38;5;245 +.cfg 00;38;5;245 +.conf 00;38;5;245 +.c 00;38;5;245 +.cpp 00;38;5;245 +.cc 00;38;5;245 +.sqlite 00;38;5;245 + +# "unimportant" files as logs and backups (base01) +.log 00;38;5;240 +.bak 00;38;5;240 +.aux 00;38;5;240 +.lof 00;38;5;240 +.lol 00;38;5;240 +.lot 00;38;5;240 +.out 00;38;5;240 +.toc 00;38;5;240 +.bbl 00;38;5;240 +.blg 00;38;5;240 +*~ 00;38;5;240 +*# 00;38;5;240 +.part 00;38;5;240 +.incomplete 00;38;5;240 +.swp 00;38;5;240 +.tmp 00;38;5;240 +.temp 00;38;5;240 +.o 00;38;5;240 +.pyc 00;38;5;240 +.class 00;38;5;240 +.cache 00;38;5;240 + +# Audio formats (orange) +.aac 00;38;5;166 +.au 00;38;5;166 +.flac 00;38;5;166 +.mid 00;38;5;166 +.midi 00;38;5;166 +.mka 00;38;5;166 +.mp3 00;38;5;166 +.mpc 00;38;5;166 +.ogg 00;38;5;166 +.ra 00;38;5;166 +.wav 00;38;5;166 +.m4a 00;38;5;166 +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 00;38;5;166 +.oga 00;38;5;166 +.spx 00;38;5;166 +.xspf 00;38;5;166 + +# Video formats (as audio + bold) +.mov 00;38;5;166 +.MOV 00;38;5;166 +.mpg 00;38;5;166 +.mpeg 00;38;5;166 +.m2v 00;38;5;166 +.mkv 00;38;5;166 +.ogm 00;38;5;166 +.mp4 00;38;5;166 +.m4v 00;38;5;166 +.mp4v 00;38;5;166 +.vob 00;38;5;166 +.qt 00;38;5;166 +.nuv 00;38;5;166 +.wmv 00;38;5;166 +.asf 00;38;5;166 +.rm 00;38;5;166 +.rmvb 00;38;5;166 +.flc 00;38;5;166 +.avi 00;38;5;166 +.fli 00;38;5;166 +.flv 00;38;5;166 +.gl 00;38;5;166 +.m2ts 00;38;5;166 +.divx 00;38;5;166 +.webm 00;38;5;166 +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 00;38;5;166 +.anx 00;38;5;166 +.ogv 00;38;5;166 +.ogx 00;38;5;166 + + diff --git a/dwb/default/bookmarks b/dwb/default/bookmarks index 8e59841..19ec207 100644 --- a/dwb/default/bookmarks +++ b/dwb/default/bookmarks @@ -13,7 +13,6 @@ https://mail.google.com Gmail https://myum.unimaas.nl/irj/portal MyUm https://plus.google.com Google+ https://tardis:60665/ ZNC - Web Frontend -https://wiebetaaltwat.nl/ Wiebetaaltwat.nl https://www.bnpparibasfortis.be/private/Start.asp BNP Paribas Fortis, la banque et l'assurance d'un monde qui change https://www.dropbox.com/ Dropbox https://www.facebook.com/ Facebook diff --git a/dwb/default/scripts.allow b/dwb/default/scripts.allow index 8f39e50..b45dd32 100644 --- a/dwb/default/scripts.allow +++ b/dwb/default/scripts.allow @@ -34,6 +34,7 @@ together.jolla.com translate.google.com twitter.com unix.stackexchange.com +upstream.rosalinux.ru wiki.ros.org www.amazon.co.uk www.amazon.com diff --git a/dwb/forms b/dwb/forms index 14baaba..fb86f01 100644 Binary files a/dwb/forms and b/dwb/forms differ diff --git a/dwb/userscripts/extension_loader.js b/dwb/userscripts/extension_loader.js index f00518d..47942bd 100644 --- a/dwb/userscripts/extension_loader.js +++ b/dwb/userscripts/extension_loader.js @@ -121,6 +121,7 @@ domains : { "tardis.uni.cx" : { "user-stylesheet-uri" : "" }, "thetvdb.com" : { "user-stylesheet-uri" : "" }, "usenet-crawler.com" : { "user-stylesheet-uri" : "" }, + "wikipedia.org" : { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/wikipedia.org.css" }, }, //Settings applied based on the hostname hosts : { diff --git a/dwb/userstyles/wikipedia.org.css b/dwb/userstyles/wikipedia.org.css new file mode 100644 index 0000000..249c9fc --- /dev/null +++ b/dwb/userstyles/wikipedia.org.css @@ -0,0 +1,194 @@ +/* Wikipedia Dark Theme v1.0.4 (12/22/2014) + * https://github.com/StylishThemes/Wikipedia-Dark + * http://userstyles.org/styles/ + * Modified from https://userstyles.org/styles/47161/dark-wikipedia-rounded + */ + + /* transparent background */ + div, span:not(.legend-color), .MainPageBG, .navbox-list, div#mw-head, .mw-wsmfinal-content, #bodyContent, + .referencetooltip > li + li, div.vectorTabs ul li, tr[style*="background:#F5FFFA"], + th[style*="background-color: #fff"] { + background-color: transparent !important; + } + + /*** Overall ***/ + * { + color: #9a9a9a !important; + } + + a, .CategoryTreeToggle { + color: /*[[base-color]]*/ #4183C4 !important; + } + + a:visited { + color: #ccc !important; + } + + a:hover, a:hover span { + color: #fff !important; + text-decoration: underline !important; + } + + /*** Red links (non-existant pages) ***/ + a.new { + color: #980000 !important; + } + + /*** Background ***/ + html, body { + background-color: #222 !important; + background-image: /*[[bg-choice]]*/ url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkAgMAAAANjH3HAAAACVBMVEUaGhohISElJSUh9lebAAAB20lEQVRIx4XWuZXDMAwE0C0SAQtggIIYoAAEU+aKOHhYojTrYP2+QfOW/5QIJOih/q8HwF/pb3EX+UPIveYcQGgEHiu9hI+ihEc5Jz5KBIlRRRaJ1JtoSAl5Hw96hLB1/up1tnIXOck5jZQy+3iU2hAOKSH1JvwxHsp+5TLF5MOl1/MQXsVs1miXc+KDbYydyMeUgpPQreZ7fWidbNhkXNJSeAhc6qHmHD8AYovunYyEACWEbyIhNeB9fRrH3hFi0bGPLuEW7xCNaohw1vAlS805nfsrTspclB/hVdoqusg53eH7FWot+wjYpOViX8KbFFKTwlnzvj65P9H/vD0/hibYBGhPwlPO8TmxRsaxsNnrUmUXpNhirlJMPr6Hqq9k5Xn/8iYQHYIuQsWFC6Z87IOxLxHphSY4SpuiU87xJnJr5axfeRd+lnMExXpEWPpuZ1v7qZdNBOjiHzDREHX5fs5Zz9p6X0vVKbKKchlSl5rv+3p//FJ/PYvoKryI8vs+2G9lzRmnEKkh+BU8yDk515jDj/HAswu7CCz6U/Mxb/PnC9N41ndpU4hUU7JGk/C9PmP/M2xZYdvBW2PObyf1IUiIzoHmHW9yTncliYs9A9tVNppdShfgQaTLMf+j3X723tLeHgAAAABJRU5ErkJggg==) !important; + background-clip: border-box !important; + background-origin: padding-box !important; + /*[[bg-options]]*/ + /*[[bg-options2]]*/ + } + + .mw-ui-button, .mw-ui-button * { + background-color: /*[[base-color]]*/ #4183C4 !important; + color: #fff !important; + } + + #mw-page-base, div.vectorTabs, div.vectorTabs * { + background-image: none !important; + } + + #bodyContent pre, #bodyContent code, span.plainlinks * { + background-color: #111 !important; + } + + table, input, button, select, + tr[style*="background: antiquewhite;"], #toc, td[style*="background-color"], td[style*="background:#F5FAFF"], + #mw-content-text div[style*="background: #"], .vevent td, .referencetooltip li, .suggestions, + .mw-ui-button[style*="background"], .mw-ui-button[style*="background"] * { + background-color: #222 !important; + } + + table[style*="background-color:#fff;"], .search-form fieldset, table.ambox, tr[style*="background-color: #fff;"], + .mw-ui-button[style*="background-color:#008B6D"], tr[style*="background-color: #f5faff;"] { + background-color: #282828 !important; + } + + table.wikitable > tr > th, table.wikitable > * > tr > th { + background-color: #333 !important; /* don't include !important flag */ + } + + td[style*="background: #ececec;"], th[style*="background:#eee"], th[style*="background-color: #eee"], + tr[style*="background-color: #f7f7f7;"], th[style*="background:#F2F2F2"], #filetoc, .toccolours, + th[style*="background:#F9F9F9"], table.plainlinks, th[style*="background-color: lightgrey"], + th[style*="background:#ddd"], .infobox th[style*="background"], .infobox td[style*="background"] { + background-color: #333 !important; + } + + hr { + background-color: #555 !important; + } + + /*** Background Color Styles ***/ + /* Red */ + td[style*="background: #FDD;"] { + background: #722 !important; + } + + /* Green */ + #mp-left h2, #mp-left h2 span, td[style*="background: #99FF99;"] { + background: #244024 !important; + } + + /* Blue */ + div[style*="background"] h2, div[style*="background"] h2 *, #mp-right h2, #mp-right h2 span, .navbox th, + .navbox-title, .navbox-title *, tr[style*="background-color:tan;"], + div[style*="background: #444444;"], div[style*="background: #444444;"] *, + ol.references li:target, sup.reference:target, span.citation:target, + ol.references li:target *, sup.reference:target *, span.citation:target *, + td[style*="background:#CEDFF2"], tr[bgcolor="#CEDFF2"], table[style*="background-color:#cef2e0"] * { + background-color: #182030 !important; + } + + .navbox-abovebelow, th.navbox-group, .navbox-subgroup .navbox-title, + .navbox-abovebelow *, th.navbox-group *, .navbox-subgroup .navbox-title * { + background-color: #212C43 !important; + } + + /* Purple */ + #mp-bottom h2, #mp-bottom h2 span { + background-color: #382B4A !important; + } + + /* Brown */ + #mp-center h2, #mp-center h2 span { + background-color: #383812 !important; + } + + /*** Border ***/ + div, span, table, tr:not([style*="border-bottom"]), th, td:not([style*="border-bottom"]), + h1, h2, h3, h4, h5, h6, ul, li, input, select { + border-color: #555 !important; + } + + td[style*="border-bottom"] { + border-right-color: #555 !important; + border-left-color: #555 !important; + border-top-color: #555 !important; + } + + #content, #toc { + -moz-border-radius: 10px !important; + -webkit-border-radius: 10px !important; + border-radius: 10px !important; + } + + div.vectorTabs li:not(.selected) { + border-bottom: #555 1px solid !important; + } + + /* arrow down */ + .referencetooltip > li + li, .referencetooltip > li + li::after { + border-top-color: #555 !important; + border-right-color: transparent !important; + border-left-color: transparent !important; + } + + /* Orange */ + #centralNotice > div { + border-color: #e08b26 !important; + } + + table.ambox-content, table.ambox-style { + border-left-color: #e08b26 !important; + } + + /* add border */ + div.vectorTabs li.selected { + border-bottom: #e08b26 1px solid !important; + } + + /*** Text ***/ + .wikitable th { + color: #fff !important; + } + + .CategoryTreeEmptyBullet { + color: #ccc !important; + } + + /*** Misc ***/ + #p-cactions li.selected a, #p-cactions li a, #p-cactions li a:hover { + padding: 0 1em 0.1em !important; + } + + ul, .portlet li { + list-style-image: none !important; + } + + table[style*="border:4px ridge"] { + border: none !important; + } + + /*** invert images ***/ + img[title="Wikipedia"], .bookshelf-container .bookend, img.mwe-math-fallback-image-inline, + #mw-wsmfinal-close, img[src*="Speaker_Icon"], .infobox img[src*=".svg"], img[src*=".png"]:active { + filter: url("data:image/svg+xml;utf8, #i"); + -webkit-filter: invert(100%) !important; + background-color: transparent !important; + } diff --git a/mpd/mpd.conf b/mpd/mpd.conf index fa0126b..7973ac7 100644 --- a/mpd/mpd.conf +++ b/mpd/mpd.conf @@ -1,7 +1,7 @@ # An example configuration file for MPD can be found at: # /usr/share/doc/mpd/ -bind_to_address "localhost" +bind_to_address "any" bind_to_address "/var/run/user/1000/mpd.socket" music_directory "~/music" playlist_directory "~/.local/share/mpd/playlists" diff --git a/mutt/muttrc b/mutt/muttrc index 0f6cc34..f9c841a 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -26,12 +26,13 @@ set duplicate_threads = yes set collapse_unread = no # lists -subscribe -group chakra ^chakra-.*@googlegroups.com -subscribe -group clementine clementine-player@googlegroups.com -subscribe -group ros @lists.ros.org$ -subscribe -group sailfish @lists.sailfishos.org -subscribe -group neovim ^neovim.*github.com -subscribe -group mutt mutt-users@mutt.org +subscribe -group chakra ^chakra-.*@googlegroups.com +subscribe -group clementine clementine-player@googlegroups.com +subscribe -group ros @lists.ros.org$ +subscribe -group sailfish @lists.sailfishos.org +subscribe -group neovim ^neovim.*github.com +subscribe -group mutt mutt-users@mutt.org +subscribe -group qutebrowser ^qutebrowser.* # performance tuning set read_inc = 1000 # nb of messages read before printing status diff --git a/ncmpcpp/bindings b/ncmpcpp/bindings index 14878a7..83ae3d5 100644 --- a/ncmpcpp/bindings +++ b/ncmpcpp/bindings @@ -73,3 +73,15 @@ def_key "&" def_key "*" show_visualizer + +def_key "c" + clear_main_playlist + +# def_key "c" +# dummy + +def_key "C" + crop_main_playlist + +# def_key "C" +# dummy diff --git a/vim/filetype.vim b/vim/filetype.vim index 17b1a26..c89635a 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -6,6 +6,7 @@ augroup filetypedetect augroup END augroup ft_ros + autocmd! BufNewFile,BufRead */ros/*.py setfiletype python.rospy autocmd! BufNewFile,BufRead */ros/*.cpp setfiletype cpp.roscpp autocmd! BufNewFile,BufRead */ros/*.h setfiletype cpp.roscpp autocmd! BufNewFile,BufRead *.launch setfiletype roslaunch diff --git a/vim/ftplugin/PKGBUILD.vim b/vim/ftplugin/PKGBUILD.vim index 68cd5da..4e7ad77 100644 --- a/vim/ftplugin/PKGBUILD.vim +++ b/vim/ftplugin/PKGBUILD.vim @@ -5,7 +5,7 @@ setlocal softtabstop=2 setlocal makeprg=makepkg\ -s setlocal errorformat=%f:\ line\ %l:\ %m -nnoremap u :UpdPkgSums +nnoremap u :UpdPkgSums:redraw! nnoremap r O# Maintainer: Samir Benmendil " vim: ft=vim diff --git a/vim/ftplugin/rospy.vim b/vim/ftplugin/rospy.vim new file mode 100644 index 0000000..0fb3231 --- /dev/null +++ b/vim/ftplugin/rospy.vim @@ -0,0 +1,3 @@ +let g:pymode_run = 0 +vnoremap r +nnoremap r :!% diff --git a/vim/ftplugin/vim.vim b/vim/ftplugin/vim.vim new file mode 100644 index 0000000..88ab686 --- /dev/null +++ b/vim/ftplugin/vim.vim @@ -0,0 +1,2 @@ +nnoremap K yiw:h " +vnoremap K y:h " diff --git a/vim/ultisnips/PKGBUILD.snippets b/vim/ultisnips/PKGBUILD.snippets index ef52592..b18ae81 100644 --- a/vim/ultisnips/PKGBUILD.snippets +++ b/vim/ultisnips/PKGBUILD.snippets @@ -1,23 +1,33 @@ +snippet pkgver "pkgver() function" b +pkgver() { + cd ${1:$pkgname-$pkgver} + ( set -o pipefail + git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ) +} +endsnippet + snippet prep "prepare() function" b prepare() { - cd ${1:$pkgname-$pkgver} - $0 + cd ${1:$pkgname-$pkgver} + $0 } endsnippet snippet build "build() function" b build() { - cd ${1:$pkgname-$pkgver} - ./configure \ - --prefix=/usr $2 - $0 + cd ${1:$pkgname-$pkgver} + ./configure \ + --prefix=/usr $2 + $0 } endsnippet snippet pack "package() function" b package() { - cd ${1:$pkgname-$pkgver} - make DESTDIR="$pkgdir" install - $0 + cd ${1:$pkgname-$pkgver} + make DESTDIR="$pkgdir" install + $0 } endsnippet diff --git a/vim/vimrc b/vim/vimrc index 81713c7..14ebec3 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -14,18 +14,20 @@ call vundle#rc('$XDG_DATA_HOME/vim') Plugin 'gmarik/vundle' +Plugin 'airblade/vim-gitgutter' Plugin 'bling/vim-airline' Plugin 'elzr/vim-json' -Plugin 'rking/ag.vim' Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex' +Plugin 'junegunn/vim-easy-align' Plugin 'kien/ctrlp.vim' Plugin 'kshenoy/vim-signature' Plugin 'majutsushi/tagbar' +Plugin 'rking/ag.vim' Plugin 'scrooloose/nerdtree' Plugin 'scrooloose/syntastic' +Plugin 'sirver/ultisnips' Plugin 'sjl/gundo.vim' Plugin 'tomtom/tcomment_vim' -Plugin 'tpope/vim-endwise' Plugin 'tpope/vim-fugitive' Plugin 'tpope/vim-repeat' Plugin 'tpope/vim-surround' @@ -41,12 +43,13 @@ Plugin 'derekwyatt/vim-fswitch' " Plugin 'jalcine/cmake.vim' " Plugin 'powerman/vim-plugin-viewdoc' -Plugin 'airblade/vim-gitgutter' +" endwise needs to be after delimitmate Plugin 'raimondi/delimitmate' -Plugin 'sirver/ultisnips' +Plugin 'tpope/vim-endwise' Plugin 'lokaltog/vim-easymotion' -Plugin 'junegunn/vim-easy-align' Plugin 'chrisbra/checkattach' +Plugin 'klen/python-mode' +Plugin 'nathanaelkane/vim-indent-guides' " remove entries first set runtimepath -=$HOME/.vim @@ -391,8 +394,9 @@ let g:airline_powerline_fonts = 1 " checkattach {{{2 let g:checkattach_filebrowser = 'ranger' -" Gundo {{{2 -nnoremap :GundoToggle +" delimitmate {{{2 +let delimitMate_expand_cr = 2 +let g:delimitMate_expand_space = 1 " fswitch {{{2 nnoremap ff :FSHere @@ -412,6 +416,16 @@ nnoremap gc :tab Gcommit -v nnoremap ga :Gwrite nnoremap gb :Gblame +" Gundo {{{2 +nnoremap :GundoToggle + +" indent-guides {{{2 +let g:indent_guides_default_mapping = 0 +let g:indent_guides_guide_size = 1 +nmap cog IndentGuidesToggle +nmap [og IndentGuidesEnable +nmap ]og IndentGuidesDisable + " NERDTree {{{2 " open/close NERDTree with \e nmap e :NERDTreeToggle @@ -421,6 +435,11 @@ let NERDTreeMapActivateNode='l' " close vim if only NERDTree is open autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif +" python-mode {{{2 + +let g:pymode_rope_completion = 0 +let g:pymode_folding = 1 + " synastic {{{2 let g:syntastic_enable_highlighting = 0 let g:syntastic_error_symbol='E' diff --git a/xbindkeysrc b/xbindkeys/chronos similarity index 86% rename from xbindkeysrc rename to xbindkeys/chronos index 81c5618..7369201 100644 --- a/xbindkeysrc +++ b/xbindkeys/chronos @@ -27,12 +27,6 @@ #keystate_capslock = enable #keystate_scrolllock= enable -"qdbus --literal org.kde.kglobalaccel /component/kwin invokeShortcut Expose" - b:10 - -"qdbus --literal org.kde.kglobalaccel /component/kwin invokeShortcut ShowDesktopGrid" - b:13 - "asus-kbd-backlight up" XF86KbdBrightnessUp diff --git a/xprofile b/xprofile index 09f8073..fef5b6d 100644 --- a/xprofile +++ b/xprofile @@ -5,6 +5,7 @@ xautolock -detectsleep \ -time 20 -locker "i3lock -nc 000000" \ -killtime 70 -killer "systemctl suspend" & xkbcomp -I$HOME/.config/xkb $HOME/.config/xkb/$(hostname).xkb $DISPLAY -xbindkeys +unclutter -idle 1 -root & +[[ -x "$XDG_CONFIG_HOME/xbindkeys/$(hostname)" ]] && xbindkeys --file $XDG_CONFIG_HOME/xbindkeys/$(hostname) xcape -e "Control_L=Escape;Control_R=Escape" urxvtd -q -f -o diff --git a/zsh/lib/theme-and-appearance.zsh b/zsh/lib/theme-and-appearance.zsh index e26c502..4900895 100644 --- a/zsh/lib/theme-and-appearance.zsh +++ b/zsh/lib/theme-and-appearance.zsh @@ -1,7 +1,6 @@ # ls colors autoload colors; colors; -export LSCOLORS="Gxfxcxdxbxegedabagacad" -#export LS_COLORS +eval $(dircolors $XDG_CONFIG_HOME/dircolors) # Enable ls colors ls='ls --color=auto' diff --git a/zsh/lib/title.zsh b/zsh/lib/title.zsh index 18fe7e2..c58da48 100644 --- a/zsh/lib/title.zsh +++ b/zsh/lib/title.zsh @@ -1,3 +1,7 @@ +if [[ "$TERM" == "linux" ]]; then + return +fi + function title { local tmp tmp=(${(f)*}) diff --git a/zshrc b/zshrc index a25e6fb..e6126f2 100644 --- a/zshrc +++ b/zshrc @@ -31,6 +31,10 @@ setopt notify setopt rcquotes # echo 'don''t'; prints don't setopt dvorak # correct_all uses dvorak +# disable flow control +setopt noflowcontrol +stty -ixon + # populate path typeset -U path # make path a unique array [[ -d ~/.local/bin ]] && path=(~/.local/bin $path)