diff --git a/conky/conkyrc-cli b/conky/conkyrc-cli index b786d59..ce74b9c 100644 --- a/conky/conkyrc-cli +++ b/conky/conkyrc-cli @@ -6,7 +6,7 @@ total_run_times 0 use_spacer none TEXT -$if_mpd_playingê $mpd_smart $endif ­ ${execi 600 /home/jack/bin/getvol} ${if_up wlan0}£ ${wireless_essid wlan0} ${wireless_link_qual_perc wlan0}% $endifò $battery_percent% É ${time %A %d %B %R} +$if_mpd_playingê $mpd_smart$endif ­ ${execi 600 /home/jack/bin/getvol} ${if_up wlan0}£ ${wireless_essid wlan0} ${wireless_link_qual_perc wlan0}% $endifò $battery_percent% É ${time %A %d %B %R} #${time %A%e %B %H:%M%P} # ${if_up wlan0}Û ${upspeed wlan0} Ú ${downspeed wlan0} diff --git a/dzen2/dzconky b/dzen2/dzconky new file mode 100755 index 0000000..531b758 --- /dev/null +++ b/dzen2/dzconky @@ -0,0 +1,6 @@ + #!/bin/sh + + FG='#657b83' + BG='#002b36' + FONT='-*-termsyn.icons-medium-r-*-*-12-*-*-*-*-*-*-*' + conky | dzen2 -e - -h '14' -w '1024' -ta r -fg $FG -bg $BG -fn $FONT & diff --git a/monsterwm/config.h b/monsterwm/config.h index 8c4d096..fa4cd75 100644 --- a/monsterwm/config.h +++ b/monsterwm/config.h @@ -4,16 +4,16 @@ #define CONFIG_H /** buttons **/ -#define MOD1 Mod4Mask /* Windows key */ -#define MOD4 Mod1Mask /* Alt key */ +#define MOD1 Mod1Mask /* Alt key */ +#define MOD4 Mod4Mask /* Windows key */ #define CONTROL ControlMask /* Control key */ #define SHIFT ShiftMask /* Shift key */ /** generic settings **/ #define MASTER_SIZE 0.52 -#define SHOW_PANEL False /* show panel by default on exec */ +#define SHOW_PANEL True /* show panel by default on exec */ #define TOP_PANEL True /* False mean panel is on bottom */ -#define PANEL_HEIGHT 18 /* 0 for no space for panel, thus no panel */ +#define PANEL_HEIGHT 14 /* 0 for no space for panel, thus no panel */ #define DEFAULT_MODE TILE /* TILE MONOCLE BSTACK GRID */ #define ATTACH_ASIDE True /* False means new window is master */ #define FOLLOW_MOUSE True /* Focus the window the mouse just entered */ @@ -39,41 +39,43 @@ static const AppRule rules[] = { \ /** commands **/ static const char *termcmd[] = { "xterm", NULL }; -static const char *menucmd[] = { "dmenu_run", NULL }; +static const char *menucmd[] = { "dmenu_run", "-nb", "#002b36", "-nf", "#657b83", "-sb", "#002b36", "-sf", "#AAAAAA", NULL }; +static const char *clipcmd[] = { "mydmenuclip", NULL }; #define DESKTOPCHANGE(K,N) \ - { MOD1, K, change_desktop, {.i = N}}, \ - { MOD1|ShiftMask, K, client_to_desktop, {.i = N}}, + { MOD4, K, change_desktop, {.i = N}}, \ + { MOD4|ShiftMask, K, client_to_desktop, {.i = N}}, /** Shortcuts **/ static key keys[] = { /* modifier key function argument */ - { MOD1, XK_b, togglepanel, {NULL}}, + { MOD4, XK_b, togglepanel, {NULL}}, { MOD1, XK_BackSpace, focusurgent, {NULL}}, - { MOD1|SHIFT, XK_c, killclient, {NULL}}, - { MOD1, XK_j, next_win, {NULL}}, - { MOD1, XK_k, prev_win, {NULL}}, - { MOD1, XK_h, resize_master, {.i = -10}}, /* decrease size in px */ - { MOD1, XK_l, resize_master, {.i = +10}}, /* increase size in px */ - { MOD1, XK_o, resize_stack, {.i = -10}}, /* shrink size in px */ - { MOD1, XK_p, resize_stack, {.i = +10}}, /* grow size in px */ + { MOD4|SHIFT, XK_c, killclient, {NULL}}, + { MOD4, XK_j, next_win, {NULL}}, + { MOD4, XK_k, prev_win, {NULL}}, + { MOD4, XK_h, resize_master, {.i = -10}}, /* decrease size in px */ + { MOD4, XK_l, resize_master, {.i = +10}}, /* increase size in px */ + { MOD4, XK_o, resize_stack, {.i = -10}}, /* shrink size in px */ + { MOD1, XK_v, resize_stack, {.i = +10}}, /* grow size in px */ { MOD1|CONTROL, XK_h, rotate, {.i = -1}}, { MOD1|CONTROL, XK_l, rotate, {.i = +1}}, { MOD1|SHIFT, XK_h, rotate_filled, {.i = -1}}, { MOD1|SHIFT, XK_l, rotate_filled, {.i = +1}}, { MOD1, XK_Tab, last_desktop, {NULL}}, - { MOD1, XK_Return, swap_master, {NULL}}, - { MOD1|SHIFT, XK_j, move_down, {NULL}}, - { MOD1|SHIFT, XK_k, move_up, {NULL}}, - { MOD1|SHIFT, XK_t, switch_mode, {.i = TILE}}, - { MOD1|SHIFT, XK_m, switch_mode, {.i = MONOCLE}}, - { MOD1|SHIFT, XK_b, switch_mode, {.i = BSTACK}}, - { MOD1|SHIFT, XK_g, switch_mode, {.i = GRID}}, - { MOD1|SHIFT, XK_f, switch_mode, {.i = FLOAT}}, + { MOD4, XK_Return, swap_master, {NULL}}, + { MOD4|SHIFT, XK_j, move_down, {NULL}}, + { MOD4|SHIFT, XK_k, move_up, {NULL}}, + { MOD4|SHIFT, XK_t, switch_mode, {.i = TILE}}, + { MOD4|SHIFT, XK_m, switch_mode, {.i = MONOCLE}}, + { MOD4|SHIFT, XK_b, switch_mode, {.i = BSTACK}}, + { MOD4|SHIFT, XK_g, switch_mode, {.i = GRID}}, + { MOD4|SHIFT, XK_f, switch_mode, {.i = FLOAT}}, { MOD1|CONTROL, XK_r, quit, {.i = 0}}, /* quit with exit value 0 */ { MOD1|CONTROL, XK_q, quit, {.i = 1}}, /* quit with exit value 1 */ - { MOD1|SHIFT, XK_Return, spawn, {.com = termcmd}}, - { MOD4, XK_v, spawn, {.com = menucmd}}, + { MOD4|SHIFT, XK_Return, spawn, {.com = termcmd}}, + { MOD4, XK_p, spawn, {.com = menucmd}}, + { MOD4|SHIFT, XK_v, spawn, {.com = clipcmd}}, { MOD4, XK_Down, moveresize, {.v = (int []){ 0, 25, 0, 0 }}}, /* move up */ { MOD4, XK_Up, moveresize, {.v = (int []){ 0, -25, 0, 0 }}}, /* move down */ { MOD4, XK_Right, moveresize, {.v = (int []){ 25, 0, 0, 0 }}}, /* move right */ @@ -82,10 +84,10 @@ static key keys[] = { { MOD4|SHIFT, XK_Up, moveresize, {.v = (int []){ 0, 0, 0, -25 }}}, /* height shrink */ { MOD4|SHIFT, XK_Right, moveresize, {.v = (int []){ 0, 0, 25, 0 }}}, /* width grow */ { MOD4|SHIFT, XK_Left, moveresize, {.v = (int []){ 0, 0, -25, 0 }}}, /* width shrink */ - DESKTOPCHANGE( XK_F1, 0) - DESKTOPCHANGE( XK_F2, 1) - DESKTOPCHANGE( XK_F3, 2) - DESKTOPCHANGE( XK_F4, 3) + DESKTOPCHANGE( XK_1, 0) + DESKTOPCHANGE( XK_2, 1) + DESKTOPCHANGE( XK_3, 2) + DESKTOPCHANGE( XK_4, 3) }; static Button buttons[] = {