From e4ccf6030e884bf85867ababcbc20b77e2a9b60f Mon Sep 17 00:00:00 2001 From: Ambrevar Date: Thu, 12 Jul 2012 19:08:34 +0100 Subject: [PATCH] URxvt: init config. Used by default. Awesome: uses URxvt. Many shortcuts for layout (move, resize, master/slave). Terminal: colors, shortcuts, properties (WIP). xinit: fix xrdb bug. --- .Xresources | 167 +++++++++++------- .arch-pkg-aur-zeus | 2 + .arch-pkg-explicit-zeus | 7 +- .arch-pkg-official-zeus | 7 +- .config/awesome/rc.lua | 122 ++++++++----- .config/awesome/themes/custom/theme.lua | 3 +- .config/luakit/binds.lua | 4 +- .config/ranger/options.py | 2 +- .emacs | 19 +- .../snippets/text-mode/cc-mode/c-mode/fprintf | 6 + .netinit | 6 +- .shell.d/alias_rc | 6 +- .shell.d/funs_rc | 23 +++ .shell.d/main_rc | 2 +- .xinitrc | 2 +- 15 files changed, 248 insertions(+), 130 deletions(-) create mode 100644 .emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/fprintf diff --git a/.Xresources b/.Xresources index a1a42435..49d1b299 100644 --- a/.Xresources +++ b/.Xresources @@ -1,88 +1,131 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! Xresources -!! 2011-10-25 +!! 2012-07-12 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! vim:nu:ai:si:et:ts=4:sw=4:ft=xdefaults: +!! TODO: what is charclass ? +!! TODO: prevent URxvt from intercepting ALT+Arrows and PageUp/Down. -! Commands : xfontsel -! Colors : LightYellow Black +!! Xft options +! Xft.hinting: true +! Xft.hintstyle: hintfull +! Xft.antialias: rgba +! Xft.rgba: rgb -!xterm*background: black -!xterm*faceName:terminus -!xterm*faceSize:8 -!xterm*font:-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-* +!!------------------------------------------------------------------------------ +!!URxvt +!!------------------------------------------------------------------------------ -! ------------------------------------------------- -! terminal colors -! ------------------------------------------------- +URxvt*saveLines: 1000 +URxvt*scrollBar: false -!tangoesque scheme +!! URL Support +URxvt.perl-ext-common : default,matcher +URxvt.matcher.button : 1 +URxvt.keysym.C-Delete : perl:matcher:last +URxvt.keysym.M-Delete : perl:matcher:list +URxvt.urlLauncher : luakit +URxvt.underlineURLs : true + +!! Font +! URxvt*letterSpace: -1 + +URxvt*font : xft:Monospace:pixelsize=14 +URxvt*boldFont : xft:Monospace:bold:pixelsize=14 +! URxvt.font : xft:Bitstream Vera Sans Mono:pixelsize=14 +! URxvt.font : -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 +! URxvt.font : -*-dina-medium-r-*-*-16-*-*-*-*-*-*-* +! URxvt.font : xft:DejaVu Sans Mono:pixelsize=12 +! URxvt.font : xft:Monospace 10:pixelsize=12 +! URxvt.font : xft:Monospace:pixelsize=12 +! URxvt.font : xft:monaco:size=10 +! URxvt*boldFont : xft:Monospace Bold:pixelsize=12 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! Styles +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +!! Colors list +!! color0 = black +!! color1 = red +!! color2 = green +!! color3 = yellow +!! color4 = blue +!! color5 = magenta +!! color6 = cyan +!! color7 = white +!! color8 = bright black +!! color9 = bright red +!! color10 = bright green +!! color11 = bright yellow +!! color12 = bright blue +!! color13 = bright magenta +!! color14 = bright cyan +!! color15 = bright white + +!! Gnome style +URxvt*background: black +URxvt*foreground: #CCCCCC +URxvt.color0 : #000000 +URxvt.color1 : #AA0000 +URxvt.color2 : #00AA00 +URxvt.color3 : #AA5500 +URxvt.color4 : #0000AA +URxvt.color5 : #AA00AA +URxvt.color6 : #00AAAA +URxvt.color7 : #AAAAAA +URxvt.color8 : #555555 +URxvt.color9 : #FF5555 +URxvt.color10 : #55FF55 +URxvt.color11 : #FFFF55 +URxvt.color12 : #5555FF +URxvt.color13 : #FF55FF +URxvt.color14 : #55FFFF +URxvt.color15 : #FFFFFF + +!! Dark style +! urxvt.color0: rgb:00/00/00 +! urxvt.color1: rgb:9e/18/28 +! urxvt.color2: rgb:5c/b2/47 +! urxvt.color3: rgb:96/8a/38 +! urxvt.color4: rgb:41/61/a0 +! urxvt.color5: rgb:9b/76/8e +! urxvt.color6: rgb:41/91/89 +! urxvt.color7: rgb:de/de/de +! urxvt.color8: rgb:66/66/66 +! urxvt.color9: rgb:cf/61/71 +! urxvt.color10: rgb:c5/f7/79 +! urxvt.color11: rgb:ff/f7/96 +! urxvt.color12: rgb:41/86/be +! urxvt.color13: rgb:cf/9e/be +! urxvt.color14: rgb:71/be/be +! urxvt.color15: rgb:dd/dd/dd + +!! Tangoesque style !*background: #111111 !*background: #000000 -! *foreground: #babdb6 -!Black (not tango) + DarkGrey +!*foreground: #babdb6 +!! Black (not tango) + DarkGrey ! *color0: #000000 ! *color8: #555753 -! DarkRed + Red +!! DarkRed + Red ! *color1: #ff6565 ! *color9: #ff8d8d -! DarkGreen + Green +!! DarkGreen + Green ! *color2: #93d44f ! *color10: #c8e7a8 -! DarkYellow + Yellow +!! DarkYellow + Yellow ! *color3: #eab93d ! *color11: #ffc123 -! DarkBlue + Blue +!! DarkBlue + Blue ! *color4: #204a87 ! *color12: #3465a4 -! DarkMangenta + Mangenta +!! DarkMangenta + Mangenta ! *color5: #ce5c00 ! *color13: #f57900 -!DarkCyan + Cyan (both not tango) +!! DarkCyan + Cyan (both not tango) ! *color6: #89b6e2 ! *color14: #46a4ff -! LightGrey + White +!! LightGrey + White ! *color7: #cccccc ! *color15: #ffffff -! -!================= -! Urxvt -!================= - -urxvt*background: black -urxvt*foreground: white -urxvt*saveLines: 10000 -URxvt.font: xft:DejaVu Sans Mono:pixelsize=12 -! URxvt.font: -*-dina-medium-r-*-*-16-*-*-*-*-*-*-* -! URxvt.font: xft:monaco:size=10 -urxvt*scrollBar:false - -URxvt.perl-ext: default,url-select,tabbed -! URxvt.perl-ext-common: -URxvt.keysym.M-u: perl:url-select:select_next -URxvt.urlLauncher: luakit -URxvt.underlineURLs: true - -! urxvt*font: -*-fixed-medium-r-*-*-18-*-*-*-*-*-iso8859-* -! urxvt*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48 -! urxvt.perl-ext-common: default,tabbed -! urxvt.tabbed.tabbar-fg: 2 -! urxvt.tabbed.tabbar-bg: 0 - -! urxvt.tabbed.tab-bg: 0 -! urxvt.tabbed.tab-fg: 3 - - -!================= -! Xterm -!================= - -!xterm*background: black -!xterm*saveLines: 10000 -!xterm*foreground: white -!xterm*font: -*-fixed-medium-r-*-*-18-*-*-*-*-*-iso8859-* -!xterm*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48 -! xterm*scrollBar:true -! xterm*Scrollbar.backgroundPixmap: gradient:horizontal?dimension=14&start=darkgreen&end=pink -! xterm*Scrollbar.foregroungPixmap: black diff --git a/.arch-pkg-aur-zeus b/.arch-pkg-aur-zeus index 7ae05004..f8250aa0 100644 --- a/.arch-pkg-aur-zeus +++ b/.arch-pkg-aur-zeus @@ -3,11 +3,13 @@ bashmount bustle dropbox dropbox-cli +emacs-mediawiki-bzr emacs-yasnippet gsharkdown movgrab package-query pacman-color +rxvt-unicode-patched trash-cli urlview yaourt diff --git a/.arch-pkg-explicit-zeus b/.arch-pkg-explicit-zeus index f7c529bc..adc9dde2 100644 --- a/.arch-pkg-explicit-zeus +++ b/.arch-pkg-explicit-zeus @@ -19,6 +19,8 @@ bustle bzip2 bzr calc +catdvi +ccrypt cmus consolekit coreutils @@ -38,9 +40,11 @@ dropbox dropbox-cli e2fsprogs emacs-lua-mode +emacs-mediawiki-bzr emacs-nox emacs-yasnippet fakeroot +fbv feh file filesystem @@ -132,7 +136,7 @@ python2-udiskie ranger reiserfsprogs rtorrent -rxvt-unicode +rxvt-unicode-patched scrot sdparm sed @@ -148,6 +152,7 @@ sysvinit tar task tcpdump +texi2html texinfo texlive-genericextra texlive-latexextra diff --git a/.arch-pkg-official-zeus b/.arch-pkg-official-zeus index 9101609c..0b8dbf65 100644 --- a/.arch-pkg-official-zeus +++ b/.arch-pkg-official-zeus @@ -31,6 +31,8 @@ ca-certificates cairo cairomm calc +catdvi +ccrypt cdparanoia cloog cmus @@ -78,6 +80,7 @@ faac faad2 fakeroot farstream +fbv feh ffmpeg fftw @@ -166,6 +169,7 @@ initscripts inkscape inputproto intel-dri +intltool iproute2 iptables iputils @@ -390,6 +394,7 @@ pcre perl perl-error perl-locale-gettext +perl-xml-parser pidgin pinentry pixman @@ -431,7 +436,6 @@ rsync rtmpdump rtorrent run-parts -rxvt-unicode schroedinger scrnsaverproto scrot @@ -458,6 +462,7 @@ t1lib tar task tcpdump +texi2html texinfo texlive-bin texlive-core diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 3e0fa613..9311bdf1 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -268,12 +268,13 @@ end -- Note that some laptop will not work when pressing Super+Fn. -- Therefore we only use Fn and Mod1+Fn. -------------------------------------------------------------------------------- -termcmd = "lxterminal -e " +-- termcmd = "lxterminal -e " +termcmd = "urxvt -e " globalkeys = awful.util.table.join( -- Terminal - awful.key({ modkey, }, "Return", function () awful.util.spawn("lxterminal") end), - awful.key({ }, "XF86Terminal", function () awful.util.spawn("lxterminal") end), + awful.key({ modkey, }, "Return", function () awful.util.spawn("urxvt") end), + awful.key({ }, "XF86Terminal", function () awful.util.spawn("urxvt") end), -- Calc awful.key({ modkey, }, "c", function () awful.util.spawn(termcmd .. "calc") end), @@ -285,7 +286,7 @@ globalkeys = awful.util.table.join( awful.key({ }, "XF86MyComputer", function () awful.util.spawn(termcmd .. "ranger") end), -- Screen lock - awful.key({ modkey, }, "l", function () awful.util.spawn("slock") end), + awful.key({ modkey, }, "s", function () awful.util.spawn("slock") end), awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("slock") end), awful.key({ }, "XF86Sleep", function () awful.util.spawn("slock") end), awful.key({ }, "XF86Standby", function () awful.util.spawn("slock") end), @@ -294,7 +295,7 @@ globalkeys = awful.util.table.join( awful.key({ modkey, }, "p", function () awful.util.spawn("zathura") end), -- Mail user agent - awful.key({ modkey, }, "t", function () awful.util.spawn(termcmd .. "mutt") end), + awful.key({ modkey, }, "m", function () awful.util.spawn(termcmd .. "mutt") end), awful.key({ }, "XF86Mail", function () awful.util.spawn(termcmd .. "mutt") end), -- Web browser @@ -313,29 +314,33 @@ globalkeys = awful.util.table.join( awful.key({ }, "XF86AudioPrev", function () awful.util.spawn("cmus-remote -r") end), -- Screenshot - awful.key({}, "Print", function () awful.util.spawn("scrot '%Y-%m-%d-%H%M%S_$wx$h.png' -e 'mkdir -p ~/temp && mv $f ~/temp/'") end), + awful.key({}, "Print", function () awful.util.spawn("scrot 'screen-%Y-%m-%d-%H%M%S.png' -e 'mkdir -p ~/temp && mv $f ~/temp/'") end), -- Sound Volume - awful.key({ modkey, }, "KP_Subtract", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end), - awful.key({ modkey, }, "KP_Add", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end), - awful.key({ modkey, }, "KP_Enter", function () awful.util.spawn("amixer set Master toggle >/dev/null") end), - awful.key({ modkey, "Mod1" }, "KP_Subtract", function () awful.util.spawn("amixer set PCM 5%- >/dev/null") end), - awful.key({ modkey, "Mod1" }, "KP_Add", function () awful.util.spawn("amixer set PCM 5%+ >/dev/null") end), + awful.key({ modkey, }, "KP_Subtract", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end), + awful.key({ modkey, }, "KP_Add", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end), + awful.key({ modkey, }, "KP_Enter", function () awful.util.spawn("amixer set Master toggle >/dev/null") end), + awful.key({ modkey, "Mod1" }, "KP_Subtract", function () awful.util.spawn("amixer set PCM 5%- >/dev/null") end), + awful.key({ modkey, "Mod1" }, "KP_Add", function () awful.util.spawn("amixer set PCM 5%+ >/dev/null") end), - awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end), - awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end), - awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer set Master toggle >/dev/null") end), - awful.key({ "Mod1" }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set PCM 5%+ >/dev/null") end), - awful.key({ "Mod1" }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set PCM 5%- >/dev/null") end), + awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end), + awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end), + awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer set Master toggle >/dev/null") end), + awful.key({ "Mod1" }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set PCM 5%+ >/dev/null") end), + awful.key({ "Mod1" }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set PCM 5%- >/dev/null") end), + + -- Touchpad + awful.key({ }, "XF86TouchpadToggle", function () awful.util.spawn("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end), + -- awful.key({ }, "XF86Tool", function () awful.util.spawn("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end), -- Mouse control -- Bind ''Meta4+Ctrl+m'' to move the mouse to the coordinates set above. -- This is useful if you needed the mouse for something and now want it out of the way. awful.key({ modkey, "Control" }, "m", function() moveMouseAway(safeCoords.x, safeCoords.y) end), - awful.key({ modkey, "Control" }, "h", function() moveMouse(-5, 0) end), - awful.key({ modkey, "Control" }, "j", function() moveMouse(0, 5) end), - awful.key({ modkey, "Control" }, "k", function() moveMouse(0, -5) end), - awful.key({ modkey, "Control" }, "l", function() moveMouse(5, 0) end), + -- awful.key({ modkey, "Control" }, "h", function() moveMouse(-5, 0) end), + -- awful.key({ modkey, "Control" }, "j", function() moveMouse(0, 5) end), + -- awful.key({ modkey, "Control" }, "k", function() moveMouse(0, -5) end), + -- awful.key({ modkey, "Control" }, "l", function() moveMouse(5, 0) end), -------------------------------------------------------------------------------- -- Awesome specific @@ -346,46 +351,56 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Shift" }, "q", awesome.quit), -- Tags - awful.key({ modkey, }, "Prior", awful.tag.viewprev ), - awful.key({ modkey, }, "Next", awful.tag.viewnext ), - awful.key({ modkey, }, "Escape", awful.tag.history.restore), + awful.key({ modkey }, "Prior", awful.tag.viewprev ), + awful.key({ modkey }, "Next", awful.tag.viewnext ), + awful.key({ modkey }, "Escape", awful.tag.history.restore), - -- Layout manipulation - awful.key({ modkey, "Mod1" }, "Right", function () awful.client.swap.byidx( 1) end), - awful.key({ modkey, "Mod1" }, "Left", function () awful.client.swap.byidx( -1) end), - -- awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end), - -- awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end), - awful.key({ modkey, }, "u", awful.client.urgent.jumpto), - awful.key({ modkey, }, "Tab", - function () - awful.client.focus.history.previous() - if client.focus then - client.focus:raise() - end - end), + -- Layout select and switch + awful.key({ modkey }, "Up", function () awful.client.swap.byidx( 1) end), + awful.key({ modkey }, "Down", function () awful.client.swap.byidx( -1) end), + -- awful.key({ modkey, }, "u", awful.client.urgent.jumpto), + awful.key({ modkey }, "Tab", + function () + awful.client.focus.history.previous() + if client.focus then + client.focus:raise() + end + end), - awful.key({ modkey, }, "Right", + awful.key({ modkey }, "Right", function () awful.client.focus.byidx( 1) if client.focus then client.focus:raise() end end), - awful.key({ modkey, }, "Left", + awful.key({ modkey }, "Left", function () awful.client.focus.byidx(-1) if client.focus then client.focus:raise() end end), - awful.key({ modkey,"Shift" }, "Right", function () awful.tag.incmwfact( 0.05) end), - awful.key({ modkey,"Shift" }, "Left", function () awful.tag.incmwfact(-0.05) end), - -- awful.key({ modkey, "Shift" }, "Right", function () awful.tag.incnmaster( 1) end), - -- awful.key({ modkey, "Shift" }, "Left", function () awful.tag.incnmaster(-1) end), - -- awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end), - -- awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end), + -- Layout resize + awful.key({ modkey, "Mod1" }, "Up", function () awful.tag.incmwfact( 0.05) end), + awful.key({ modkey, "Mod1" }, "Down", function () awful.tag.incmwfact(-0.05) end), + awful.key({ modkey, "Mod1" }, "Left", function () awful.client.incwfact(-0.05) end), + awful.key({ modkey, "Mod1" }, "Right", function () awful.client.incwfact( 0.05) end), + + -- Floating clients move and resize + awful.key({ modkey , "Mod1"}, "j", function () awful.client.moveresize( 20, 20, -40, -40) end), + awful.key({ modkey , "Mod1"}, "k", function () awful.client.moveresize(-20, -20, 40, 40) end), + awful.key({ modkey }, "j", function () awful.client.moveresize( 0, 20, 0, 0) end), + awful.key({ modkey }, "k", function () awful.client.moveresize( 0, -20, 0, 0) end), + awful.key({ modkey }, "h", function () awful.client.moveresize(-20, 0, 0, 0) end), + awful.key({ modkey }, "l", function () awful.client.moveresize( 20, 0, 0, 0) end), + + -- Layout organization + awful.key({ modkey, "Control" }, "Up", function () awful.tag.incnmaster( 1) end), + awful.key({ modkey, "Control" }, "Down", function () awful.tag.incnmaster(-1) end), + awful.key({ modkey, "Control" }, "Left", function () awful.tag.incncol( 1) end), + awful.key({ modkey, "Control" }, "Right", function () awful.tag.incncol(-1) end), awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end), awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), - awful.key({ modkey, "Control" }, "n", awful.client.restore), -- Prompt awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end), @@ -416,8 +431,9 @@ clientkeys = awful.util.table.join( -- -- minimized, since minimized clients can't have the focus. -- c.minimized = true -- end), + -- awful.key({ modkey, "Control" }, "n", awful.client.restore), - awful.key({ modkey, }, "m", + awful.key({ modkey, "Shift" }, "m", function (c) c.maximized_horizontal = not c.maximized_horizontal c.maximized_vertical = not c.maximized_vertical @@ -482,24 +498,32 @@ awful.rules.rules = { focus = true, keys = clientkeys, buttons = clientbuttons } }, + { rule = { class = "MPlayer" }, properties = { floating = true } }, + { rule = { class = "mplayer2" }, + properties = { floating = true } }, + { rule = { class = "pinentry" }, properties = { floating = true } }, + { rule = { class = "Gimp" }, properties = { floating = true } }, - { rule = { class = "Thunderbird" }, - properties = { tag = tags[1][7] } }, + -- Flash workaround. Does not work? { rule = { instance = "plugin-container" }, properties = { floating = true } }, { rule = { instance = "exe" }, properties = { floating = true } }, - -- TODO: does not work. + -- TODO: Only works for terminal with WM_COMMAND property? + -- Does not work with LXTerminal. { rule = { name = "cmus"}, properties = { tag = tags[1][6] } }, + { rule = { name = "mutt"}, + properties = { tag = tags[1][7] } }, + } -- }}} diff --git a/.config/awesome/themes/custom/theme.lua b/.config/awesome/themes/custom/theme.lua index 5acb60ab..82cb9a25 100644 --- a/.config/awesome/themes/custom/theme.lua +++ b/.config/awesome/themes/custom/theme.lua @@ -18,7 +18,8 @@ theme.fg_minimize = "#ffffff" theme.border_width = "2" theme.border_normal = "#222222" -theme.border_focus = "#535d6c" +-- theme.border_focus = "#535d6c" +theme.border_focus = "#BFBFBF" theme.border_marked = "#91231c" -- There are other variable sets diff --git a/.config/luakit/binds.lua b/.config/luakit/binds.lua index 1ceaf5c9..b1d044ce 100644 --- a/.config/luakit/binds.lua +++ b/.config/luakit/binds.lua @@ -120,8 +120,8 @@ add_binds("normal", { -- key({}, "$", function (w) w:scroll{ x = "100%" } end), -- key({"Control"}, "e", function (w) w:scroll{ y = more } end), -- key({"Control"}, "y", function (w) w:scroll{ y = less } end), - -- key({"Control"}, "d", function (w) w:scroll{ y = "+0.5p" } end), - -- key({"Control"}, "u", function (w) w:scroll{ y = "-0.5p" } end), + key({}, "J", function (w) w:scroll{ y = "+0.5p" } end), + key({}, "K", function (w) w:scroll{ y = "-0.5p" } end), -- key({"Control"}, "f", function (w) w:scroll{ y = "+1.0p" } end), -- key({"Control"}, "b", function (w) w:scroll{ y = "-1.0p" } end), key({}, "space", function (w) w:scroll{ y = "+0.5p" } end), diff --git a/.config/ranger/options.py b/.config/ranger/options.py index 6fc9769e..a5e8c2cb 100644 --- a/.config/ranger/options.py +++ b/.config/ranger/options.py @@ -19,7 +19,7 @@ # Which colorscheme to use? These colorschemes are available by default: # default, default88, jungle, snow # Snow is monochrome and default88 uses 88 colors. -colorscheme = 'default88' +# colorscheme = 'jungle' # Display the directory name in tabs? dirname_in_tabs = True diff --git a/.emacs b/.emacs index 62b6d169..c639c19f 100644 --- a/.emacs +++ b/.emacs @@ -90,7 +90,10 @@ ;; If there is more than one, they won't work right. '(lazy-highlight ((t (:background "blue")))) '(link ((t (:foreground "cyan" :underline t)))) - '(minibuffer-prompt ((t (:foreground "cyan"))))) + '(minibuffer-prompt ((t (:foreground "cyan")))) + '(shadow ((t (:foreground "green"))))) + +(set-face-foreground 'font-lock-comment-face "Red" ) ;;============================================================================== ;; Completion @@ -454,7 +457,15 @@ ;;============================================================================== ;; MediaWiki ;;============================================================================== +(require 'mediawiki) +(custom-set-variables + '(mediawiki-site-alist + ( quote + ( + ("Wikipedia" "http://en.wikipedia.org/w/" "Ambrevar" "" "Main Page") + ("Wikibooks" "http://en.wikibooks.org/w/" "Ambrevar" "" "LaTeX") + ("ArchLinux" "https://wiki.archlinux.org/" "Ambrevar" "" "Mutt") + )))) -;; (setq mediawiki-site-alist -;; (append '("ArchWiki" "https://wiki.archlinux.org/" "username" "password" "Main Page") -;; mediawiki-site-alist)) +;;============================================================================== +;;============================================================================== diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/fprintf b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/fprintf new file mode 100644 index 00000000..7ec513f6 --- /dev/null +++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/fprintf @@ -0,0 +1,6 @@ +# -*- mode: snippet -*- +# name : fprintf +# contributor : joaotavora, ambrevar +# -- +fprintf ($1, "${2:%s}\\n"${2:$(if (string-match "%" text) "," "\);") +}$3${2:$(if (string-match "%" text) "\);" "")} \ No newline at end of file diff --git a/.netinit b/.netinit index 36d2d09f..98a49b74 100755 --- a/.netinit +++ b/.netinit @@ -32,12 +32,12 @@ if [ $# -eq 0 ]; then while [ "$(iwconfig ${NET_INTERFACE} | grep 'off/any')" != "" ] && [ $i -lt $TIMEOUT_LIMIT ] ; do i=$(($i+1)) done - - ## Get IP. - dhcpcd $NET_INTERFACE fi if [ "$1" == "ucd" ]; then iwconfig ${NET_INTERFACE} essid "WaveLAN Network" fi +## Get IP. +dhcpcd ${NET_INTERFACE} + diff --git a/.shell.d/alias_rc b/.shell.d/alias_rc index a1b7aaf7..0b25c886 100644 --- a/.shell.d/alias_rc +++ b/.shell.d/alias_rc @@ -51,9 +51,6 @@ if [ -e "/usr/bin/emacs" ]; then alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; /usr/bin/emacs --daemon" fi -## Check colors supported by the current terminal. -alias printcolors='(x=`tput op` y=`printf %76s`;for i in {0..256};do o=00$i;echo -e ${o:${#o}-3:3} `tput setaf $i;tput setab $i`${y// /=}$x;done)' - # List desktop applications alias applist='grep -r "^Name=" /usr/share/applications/* | cut -d'=' -f2| sort' @@ -146,10 +143,11 @@ if [ "$PACMAN_FRONTEND" = "pacman-color" ]; then alias pr='sudo pacman-color -Rs' alias pss='pacman-color -Ss' alias pu='sudo pacman-color -Syu' + alias pql='pacman -Ql' ## Change 'name' and 'size' variables according your locale. # alias pql='pacman-color -Qi | awk '"'"'/^Nom/ {pkg=$3} /Taille/ {print $4$5,pkg}'"'"' | sort -n' - alias pql='pacman-color -Qi | awk '"'"'/^Name/ {pkg=$3} /Size/ {print $4$5,pkg}'"'"' | sort -n' + alias pacman-list='pacman-color -Qi | awk '"'"'/^Name/ {pkg=$3} /Size/ {print $4$5,pkg}'"'"' | sort -n' fi ##============================================================================== diff --git a/.shell.d/funs_rc b/.shell.d/funs_rc index 9d10402f..7db2fa07 100644 --- a/.shell.d/funs_rc +++ b/.shell.d/funs_rc @@ -187,6 +187,29 @@ blind-append() } +## Term properties +termcolors(){ + x=$(tput op) + y=$(printf %76s) + for i in {0..256}; do + o=00$i + echo -e "${o:${#o}-3:3} $(tput setaf $i;tput setab $i)${y// /=}$x" + done +} + +termprop() +{ + infocmp -1 | sed -nu 's/^[ \000\t]*//;s/[ \000\t]*$//;/[^ \t\000]\{1,\}/!d;/acsc/d;s/=.*,//p'| column -c80 +} + +termsupport() +{ + for T in `find "/usr/share/terminfo" -type f -printf '%f\n'`;do + echo "$T `tput -T $T colors`" + done | sort -nk2 +} + + ## Start X and lock current terminal (press ENTER when back in terminal to prompt for password) if [ -e "/usr/bin/vlock" ]; then sx(){ diff --git a/.shell.d/main_rc b/.shell.d/main_rc index bdbd6c49..38ad3f24 100644 --- a/.shell.d/main_rc +++ b/.shell.d/main_rc @@ -12,7 +12,7 @@ umask 027 export PATH=.:$PATH ## Terminal -# export TERM=xterm-256color +export TERM=xterm ## Make 'less' more friendly for non-text input files, see lesspipe(1). [ -x /usr/bin/lesspipe ] && eval "$(lesspipe)" diff --git a/.xinitrc b/.xinitrc index d78d3a1f..bc4820b8 100644 --- a/.xinitrc +++ b/.xinitrc @@ -5,7 +5,7 @@ ################################################################################ ## Config (for rxvt) -[ -f "~/.Xresources" ] && xrdb -merge "~/.Xresources" +[ -f "${HOME}/.Xresources" ] && xrdb -merge "${HOME}/.Xresources" ## Useful tools [ "$(which numlockx)" != "" ] && numlockx on