commit 42f4e8c0642cad9bb4d071993ead7812ce15aa75
parent 5cf3f2c7c807bff939f741edd8b24e372e1e48df
Author: Ed van Bruggen <edvb54@gmail.com>
Date: Sat, 29 Aug 2015 19:43:58 -0700
Merge branch 'master' of https://github.com/edvb54/dotfiles
Conflicts:
nvimrc
Diffstat:
7 files changed, 72 insertions(+), 19 deletions(-)
diff --git a/bashrc b/bashrc
@@ -71,6 +71,7 @@ export EDITOR='vim'
# export EDITOR='emacs'
export gh='https://github.com'
+export ghed='https://github.com/edvb54'
# allow for color support in terminal
if [ "$TERM" == "xterm" ]; then
diff --git a/config.h/dmenu.config.h b/config.h/dmenu.config.h
@@ -0,0 +1,19 @@
+/* See LICENSE file for copyright and license details. */
+/* vim: expandtab
+ */
+/* Default settings; can be overrided by command line. */
+
+static Bool topbar = True; /* -b option; if False, dmenu appears at bottom */
+/* -fn option overrides fonts[0]; default X11 font or font set */
+static const char *fonts[] = {
+ "monospace:size=10"
+};
+static const char *prompt = NULL; /* -p option; prompt to the elft of input field */
+static const char *normbgcolor = "#073642"; /* -nb option; normal background */
+static const char *normfgcolor = "#EEE8D5"; /* -nf option; normal foreground */
+static const char *selbgcolor = "#B58900"; /* -sb option; selected background */
+static const char *selfgcolor = "#EEE8D5"; /* -sf option; selected foreground */
+static const char *outbgcolor = "#00ffff";
+static const char *outfgcolor = "#000000";
+/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
+static unsigned int lines = 0;
diff --git a/config.h/st.config.h b/config.h/st.config.h
@@ -7,8 +7,18 @@
*/
static char font[] = "Monospace:pixelsize=15:antialias=false:autohint=false";
static int borderpx = 2;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: utmp option
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
static char shell[] = "/bin/sh";
static char *utmp = NULL;
+static char stty_args[] = "stty raw -echo -iexten echonl";
/* identification sequence returned in DA and DECID */
static char vtiden[] = "\033[?6c";
@@ -29,7 +39,7 @@ static unsigned int doubleclicktimeout = 300;
static unsigned int tripleclicktimeout = 600;
/* alt screens */
-static bool allowaltscreen = true;
+static int allowaltscreen = 1;
/* frames per second st should at maximum draw to the screen */
static unsigned int xfps = 120;
@@ -39,7 +49,12 @@ static unsigned int actionfps = 30;
* blinking timeout (set to 0 to disable blinking) for the terminal blinking
* attribute.
*/
-static unsigned int blinktimeout = 0;
+static unsigned int blinktimeout = 800;
+
+/*
+ * thickness of underline and bar cursors
+ */
+static unsigned int cursorthickness = 2;
/*
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
@@ -84,10 +99,17 @@ static const char *colorname[] = {
* Default colors (colorname index)
* foreground, background, cursor
*/
+static unsigned int defaultfg = 7;
+static unsigned int defaultbg = 0;
+static unsigned int defaultcs = 256;
+
-static unsigned int defaultfg = 12;
-static unsigned int defaultbg = 8;
-static unsigned int defaultcs = 14;
+/*
+ * Default colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
/*
* Colors used, when the specific fg == defaultfg. So in reverse mode this
@@ -113,11 +135,13 @@ static Shortcut shortcuts[] = {
{ ControlMask, XK_Print, toggleprinter, {.i = 0} },
{ ShiftMask, XK_Print, printscreen, {.i = 0} },
{ XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
- { MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} },
- { MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} },
- { MODKEY|ShiftMask, XK_Home, xzoomreset, {.i = 0} },
+ { MODKEY|ShiftMask, XK_Prior, xzoom, {.f = +1} },
+ { MODKEY|ShiftMask, XK_Next, xzoom, {.f = -1} },
+ { MODKEY|ShiftMask, XK_Home, xzoomreset, {.f = 0} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
{ MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
+ { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} },
+ { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} },
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
};
@@ -202,7 +226,7 @@ static Key key[] = {
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0, 0},
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
- { XK_KP_Delete, XK_ANY_MOD, "\177", +1, 0, 0},
+ { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
@@ -257,7 +281,8 @@ static Key key[] = {
{ XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
- { XK_Delete, XK_ANY_MOD, "\177", +1, 0, 0},
+ { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
+ { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
diff --git a/config/openbox/autostart b/config/openbox/autostart
@@ -66,7 +66,7 @@ xscreensaver -no-splash &
## Set keyboard settings - 250 ms delay and 25 cps (characters per second) repeat rate.
## Adjust the values according to your preferances.
xset r rate 250 25 &
-xset mouse 2/1 0
+xset mouse 20 30
## Turn on/off system beep
xset b off &
diff --git a/config/openbox/menu.xml b/config/openbox/menu.xml
@@ -115,7 +115,7 @@
</item>
</menu>
<menu id="network" label="Network">
- <menu execute="cb-x-www-browser-pipemenu" id="wwwbrowsers" label="WWW Browsers"/>
+ <menu execute="cbpp-x-www-browser-pipemenu" id="wwwbrowsers" label="WWW Browsers"/>
<item label="gFTP Client">
<action name="Execute">
<command>
@@ -144,11 +144,11 @@
</command>
</action>
</item>
- <menu execute="cb-remote-desktop-pipemenu" id="remotedesktop" label="Remote Desktop"/>
- <menu execute="cb-sshconfig-pipemenu" id="sshconfig" label="SSH"/>
+ <menu execute="cbpp-remote-desktop-pipemenu" id="remotedesktop" label="Remote Desktop"/>
+ <menu execute="cbpp-sshconfig-pipemenu" id="sshconfig" label="SSH"/>
</menu>
<menu id="office" label="Office">
- <menu id="libreoffice" label="LibreOffice" execute="cb-libreoffice-pipemenu" />
+ <menu id="libreoffice" label="LibreOffice" execute="cbpp-libreoffice-pipemenu" />
<item label="Calculator">
<action name="Execute">
<command>
@@ -165,7 +165,7 @@
</item>
</menu>
<menu id="system" label="System">
- <menu execute="cb-printing-pipemenu" id="PrintingPipeMenu" label="Printers"/>
+ <menu execute="cbpp-printing-pipemenu" id="PrintingPipeMenu" label="Printers"/>
<item label="GParted">
<action name="Execute">
<command>
@@ -190,7 +190,7 @@
</menu>
<separator/>
<menu id="settings" label="Settings">
- <menu execute="cb-compositor" id="CompositingPipeMenu" label="Compositor"/>
+ <menu execute="cbpp-compositor" id="CompositingPipeMenu" label="Compositor"/>
<menu id="conkyconfig" label="Conky">
<item label="Edit .conkyrc">
<action name="Execute">
@@ -404,7 +404,7 @@
</action>
</item>
</menu>
- <!--<menu id="help" label="Help" execute="cb-help-pipemenu" />-->
+ <!--<menu id="help" label="Help" execute="cbpp-help-pipemenu" />-->
<separator/>
<item label="Lock Screen">
<action name="Execute">
diff --git a/nvimrc b/nvimrc
@@ -65,3 +65,11 @@ nnoremap ZA :wqall<CR>
" C changes until end of line and D deletes until end of line, so why not Y?
noremap Y y$
+" easily change buffers
+nnoremap <C-H> :bprev<CR>
+nnoremap <C-L> :bnext<CR>
+
+" improve up and down shortcuts
+nnoremap <C-J> <C-D>
+nnoremap <C-K> <C-U>
+
diff --git a/vimrc b/vimrc
@@ -149,7 +149,7 @@ set wildmode=list,longest,full
" make line numbers go 1,2,3,4...
set number
" make the line your cursor is on 0
-set relativenumber
+" set relativenumber
" extra chars like the end of line one and when text raps to next line
set list
