From bbb41c023cd649f7bc0a769c6e18dc6dd761e0f6 Mon Sep 17 00:00:00 2001 From: "Collin J. Doering" Date: Wed, 5 Mar 2014 22:41:10 -0500 Subject: [PATCH] Various minor changes * renamed .Xdefaults to .Xresources * replaced screen with tmux * added a darken function to .conkerorrc * added some new eshell alias' * added some new templates for emacs * cleaned up .xinitrc * .xmonad/ * added circle layout * added convince key binding Mod-grave which is the same thing as Mod-ESC * made emacs-scratch open in tmux session Signed-off-by: Collin J. Doering --- .Xdefaults | 32 --------- .Xresources | 76 ++++++++++++++++++++++ .config/dunst/dunstrc | 33 +++++++--- .config/mc/hotlist | 2 +- .config/mc/ini | 4 +- .config/systemd/user/dunst.service | 2 +- .config/systemd/user/emacs.service | 2 +- .config/systemd/user/xcompmgr.service | 1 + .conkerorrc | 17 ++++- .emacs.d/templates/css-template.css | 23 +++++++ .emacs.d/templates/haml-template.haml | 19 ++++++ .emacs.d/templates/html-template.html | 9 +++ .emacs.d/templates/java-script-template.js | 23 +++++++ .emacs.d/templates/java-template.java | 22 +++++++ .emacs.d/templates/sass-template.css | 0 .emacs.d/templates/sass-template.sass | 19 ++++++ .emacs.d/templates/scala-template.scala | 23 +++++++ .emacs.d/templates/scss-template.scss | 19 ++++++ .eshell/alias | 9 +-- .ncmpcpp/config | 2 +- .screenrc | 2 +- .tmux.conf | 15 +++++ .xinitrc | 26 +++----- .xmonad/xmonad.hs | 34 +++++----- 24 files changed, 327 insertions(+), 87 deletions(-) delete mode 100644 .Xdefaults create mode 100644 .Xresources create mode 100644 .emacs.d/templates/css-template.css create mode 100644 .emacs.d/templates/haml-template.haml create mode 100644 .emacs.d/templates/html-template.html create mode 100644 .emacs.d/templates/java-script-template.js create mode 100644 .emacs.d/templates/java-template.java create mode 100644 .emacs.d/templates/sass-template.css create mode 100644 .emacs.d/templates/sass-template.sass create mode 100644 .emacs.d/templates/scala-template.scala create mode 100644 .emacs.d/templates/scss-template.scss create mode 100644 .tmux.conf diff --git a/.Xdefaults b/.Xdefaults deleted file mode 100644 index 3ab46fd..0000000 --- a/.Xdefaults +++ /dev/null @@ -1,32 +0,0 @@ -! General URxvt visual options -URxvt.buffered: true -URxvt.foreground: white -URxvt.cursorColor: green -URxvt.underlineColor: yellow -URxvt.font: xft:Bitstream Vera Sans Mono:pixelsize=12:antialias=false -URxvt.boldFont: xft:Bitstream Vera Sans Mono:bold:pixelsize=13:antialias=false -URxvt.scrollstyle: plain -URxvt.depth: 32 -URxvt.background: rgba:0000/0000/0000/cccc -urxvt.urgentOnBell: true -URxvt.underlineURLs: true - -! Perl-exts to use -URxvt.perl-ext-common: default,clipboard,tabbedex,url-picker,keyboard-select,matcher - -! Setup matcher perl-ext -URxvt.keysym.M-u: perl:url-picker -URxvt.urlLauncher: /usr/bin/conkeror -URxvt.matcher.button: 1 - -URxvt.keysym.M-Escape: perl:keyboard-select:activate -URxvt.keysym.M-s: perl:keyboard-select:search - -! Setup tabbedex perl-ext -URxvt.tabbed.tabbar-bg: -1 - -! Force vncviewer to show a password dialog -vncviewer.passwordDialog: true - -! Set default emacs font -Emacs.font: Terminus-12 diff --git a/.Xresources b/.Xresources new file mode 100644 index 0000000..a4c829d --- /dev/null +++ b/.Xresources @@ -0,0 +1,76 @@ +! File: .Xresources +! Author: Collin J. Doering +! Date: Jan 18, 2014 + +! Smyck color scheme (http://color.smyck.org/) +! Black +URxvt.color0: #000000 +! Red +URxvt.color1: #C75646 +! Green +URxvt.color2: #8EB33B +! Yellow +URxvt.color3: #D0B03C +! Blue +URxvt.color4: #72B3CC +! Purple +URxvt.color5: #C8A0D1 +! Cyan +URxvt.color6: #218693 +! White +URxvt.color7: #B0B0B0 +! Grey +URxvt.color8: #5D5D5D +! Light Red +URxvt.color9: #E09690 +! Light Green +URxvt.color10: #CDEE69 +! Light Yellow +URxvt.color11: #FFE377 +! Light Blue +URxvt.color12: #9CD9F0 +! Light Purple +URxvt.color13: #FBB1F9 +! Light Cyan +URxvt.color14: #77DFD8 +! Light white +URxvt.color15: #F8F8F8 + +! General URxvt visual options +URxvt.buffered: true +URxvt.cursorColor: green +URxvt.underlineColor: yellow +URxvt.font: xft:Terminus:pixelsize=15:antialias=false +URxvt.boldFont: xft:Terminus:bold:pixelsize=16:antialias=false +URxvt.scrollstyle: plain +URxvt.depth: 32 +URxvt.foreground: white +URxvt.background: [85]black +! URxvt.background: rgba:0000/0000/0000/0000 +URxvt.urgentOnBell: true +URxvt.underlineURLs: true + +! Perl-exts to use +URxvt.perl-ext-common: default,clipboard,tabbedex,url-picker,keyboard-select,matcher + +! Setup matcher perl-ext +URxvt.keysym.M-u: perl:url-picker +URxvt.urlLauncher: /usr/bin/conkeror +URxvt.matcher.button: 1 + +URxvt.keysym.M-Escape: perl:keyboard-select:activate +URxvt.keysym.M-s: perl:keyboard-select:search + +! Setup tabbedex perl-ext +URxvt.tabbed.tabbar-bg: -1 + +! Force vncviewer to show a password dialog +vncviewer.passwordDialog: true + +! Set default emacs font +Emacs*font: Terminus-12 +Emacs.toolBar: off +Emacs.menuBar: off +Emacs.scrollBar: off +Emacs*foreground: WhiteSmoke +Emacs*background: black diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index f27b4d9..9fcd105 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -1,6 +1,16 @@ [global] font = Terminus-12 + # allow a small subset of html markup: + # bold + # italic + # strikethrough + # underline + # + # for a complete reference see http://developer.gnome.org/pango/stable/PangoMarkupFormat.html + # If markup is not allowed, those tags will be stripped out of the message. + allow_markup = yes + # The format of the message. Possible variables are: # %a appname # %s summary @@ -8,7 +18,8 @@ # %i iconname (including its path) # %I iconname (without its path) # %p progress value if set ([ 0%] to [100%]) or nothing - format = "%s\n%b" + # Markup is allowed + format = "%s\n%b" # Sort messages by urgency sort = yes @@ -84,7 +95,7 @@ # Draw a line of 'separatpr_height' pixel height between two notifications. # Set to 0 to disable - separator_height = 2; + separator_height = 2 # padding between text and separator padding = 8 @@ -137,18 +148,24 @@ [urgency_low] # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the '#' and following would be interpreted as a comment. - background = "#222222" - foreground = "#888888" + #background = "#222222" + #foreground = "#888888" + background = "#073642" + foreground = "#93a1a1" timeout = 10 [urgency_normal] - background = "#285577" - foreground = "#ffffff" + #background = "#285577" + #foreground = "#ffffff" + background = "#002b36" + foreground = "#839496" timeout = 10 [urgency_critical] - background = "#900000" - foreground = "#ffffff" + #background = "#900000" + #foreground = "#ffffff" + background = "#dc322f" + foreground = "#002b36" timeout = 0 diff --git a/.config/mc/hotlist b/.config/mc/hotlist index 0a8f54b..d3935e1 100644 --- a/.config/mc/hotlist +++ b/.config/mc/hotlist @@ -6,7 +6,7 @@ ENTRY "/home/collin/.code" URL "/home/collin/.code" ENTRY "/home/collin/.scratch" URL "/home/collin/.scratch" GROUP "Network" ENTRY "/sh://omicron/home/collin" URL "/sh://omicron/home/collin" - ENTRY "/sftp://rekah742@ftp.rekahsoft.ca:22/home/rekah742" URL "/sftp://rekah742@ftp.rekahsoft.ca:22/home/rekah742" + ENTRY "/sftp://rekah742@64.34.157.170:22/home/rekah742" URL "/sftp://rekah742@64.34.157.170:22/home/rekah742" GROUP "Local Network" ENTRY "sh:alpha/~" URL "/home/collin/#sh:alpha/~" ENTRY "/ftp://rekah742@ftp.rekahsoft.ca/" URL "/ftp://rekah742@ftp.rekahsoft.ca/" diff --git a/.config/mc/ini b/.config/mc/ini index 3f1c320..5077d9a 100644 --- a/.config/mc/ini +++ b/.config/mc/ini @@ -115,9 +115,9 @@ free_space=1 horizontal_split=0 vertical_equal=1 -left_panel_size=81 +left_panel_size=58 horizontal_equal=1 -top_panel_size=20 +top_panel_size=27 [Misc] timeformat_recent=%b %e %H:%M diff --git a/.config/systemd/user/dunst.service b/.config/systemd/user/dunst.service index 12612f2..53261d6 100644 --- a/.config/systemd/user/dunst.service +++ b/.config/systemd/user/dunst.service @@ -2,8 +2,8 @@ Description = A customizable and lightweight notification-daemon [Service] +Type = simple ExecStart = /usr/bin/dunst -Restart = always [Install] WantedBy = default.target diff --git a/.config/systemd/user/emacs.service b/.config/systemd/user/emacs.service index d43540e..db430ef 100644 --- a/.config/systemd/user/emacs.service +++ b/.config/systemd/user/emacs.service @@ -5,7 +5,7 @@ Description = Emacs: the extensible, self-documenting text editor Type = forking ExecStart = /usr/bin/emacs --daemon ExecStop = /usr/bin/emacsclient --eval "(progn (setq kill-emacs-hook 'nil) (kill-emacs))" -Environment = PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/usr/bin/vendor_perl:/usr/bin/core_perl:/usr/lib/smlnj/bin:/opt/maven/bin:/opt/NX/bin:/home/collin/.cabal/bin:/home/collin/.bin +Environment = PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/usr/bin/vendor_perl:/usr/bin/core_perl:/usr/lib/smlnj/bin:/opt/maven/bin:/opt/NX/bin:/home/collin/.cabal/bin:/home/collin/.bin:/home/collin/.gem/ruby/2.0.0/bin Restart = always [Install] diff --git a/.config/systemd/user/xcompmgr.service b/.config/systemd/user/xcompmgr.service index 750865a..b95bed1 100644 --- a/.config/systemd/user/xcompmgr.service +++ b/.config/systemd/user/xcompmgr.service @@ -3,6 +3,7 @@ Description = Simple X compositing manager [Service] ExecStart = /usr/bin/xcompmgr +Environment=DISPLAY=:0 Restart = always [Install] diff --git a/.conkerorrc b/.conkerorrc index ca74e2b..2da45f7 100644 --- a/.conkerorrc +++ b/.conkerorrc @@ -17,7 +17,7 @@ download_buffer_automatic_open_target = OPEN_NEW_BUFFER_BACKGROUND; // save a keystroke when selecting a dom node by number. hints_auto_exit_delay = 500; -hints_ambiguous_auto_exit_delay = 500; +hints_ambiguous_auto_exit_delay = 3000; // display properties of the current selected node during // the hints interaction. @@ -210,3 +210,18 @@ interactive("firebug", "open firebug lite", firebug); // Disable whitelist (Causes extensions from unknown/unsigned sites to silently fail if not enabled!) //session_pref("xpinstall.whitelist.required", false); + +//TODO: consider something like below to darken pages +function darken_page (I) { + var styles='* { background: black !important; color: grey !important; }'+ + ':link, :link * { color: #4986dd !important; }'+ + ':visited, :visited * { color: #d75047 !important; }'; + var document = I.buffer.document; + var newSS=document.createElement('link'); + newSS.rel='stylesheet'; + newSS.href='data:text/css,'+escape(styles); + document.getElementsByTagName("head")[0].appendChild(newSS); +} + +interactive("darken-page", "Darken the page in an attempt to save your eyes.", + darken_page); diff --git a/.emacs.d/templates/css-template.css b/.emacs.d/templates/css-template.css new file mode 100644 index 0000000..b544a40 --- /dev/null +++ b/.emacs.d/templates/css-template.css @@ -0,0 +1,23 @@ +/** + * (C) Copyright Collin Doering @!@YEAR@!@ + * + * 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. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +/** + * File: @!@FILE@!@ + * Author: Collin J. Doering + * Date: @!@DATE@!@ + */ + diff --git a/.emacs.d/templates/haml-template.haml b/.emacs.d/templates/haml-template.haml new file mode 100644 index 0000000..ba240fc --- /dev/null +++ b/.emacs.d/templates/haml-template.haml @@ -0,0 +1,19 @@ +// (C) Copyright Collin Doering @!@YEAR@!@ +// +// 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. +// +// 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. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// File: @!@FILE@!@ +// Author: Collin J. Doering +// Date: @!@DATE@!@ + diff --git a/.emacs.d/templates/html-template.html b/.emacs.d/templates/html-template.html new file mode 100644 index 0000000..3f68731 --- /dev/null +++ b/.emacs.d/templates/html-template.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.emacs.d/templates/java-script-template.js b/.emacs.d/templates/java-script-template.js new file mode 100644 index 0000000..b544a40 --- /dev/null +++ b/.emacs.d/templates/java-script-template.js @@ -0,0 +1,23 @@ +/** + * (C) Copyright Collin Doering @!@YEAR@!@ + * + * 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. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +/** + * File: @!@FILE@!@ + * Author: Collin J. Doering + * Date: @!@DATE@!@ + */ + diff --git a/.emacs.d/templates/java-template.java b/.emacs.d/templates/java-template.java new file mode 100644 index 0000000..f555d69 --- /dev/null +++ b/.emacs.d/templates/java-template.java @@ -0,0 +1,22 @@ +/** + * (C) Copyright Collin Doering @!@YEAR@!@ + * + * 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. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +/** + * File: @!@FILE@!@ + * Author: Collin J. Doering + * Date: @!@DATE@!@ + */ diff --git a/.emacs.d/templates/sass-template.css b/.emacs.d/templates/sass-template.css new file mode 100644 index 0000000..e69de29 diff --git a/.emacs.d/templates/sass-template.sass b/.emacs.d/templates/sass-template.sass new file mode 100644 index 0000000..ba240fc --- /dev/null +++ b/.emacs.d/templates/sass-template.sass @@ -0,0 +1,19 @@ +// (C) Copyright Collin Doering @!@YEAR@!@ +// +// 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. +// +// 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. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// File: @!@FILE@!@ +// Author: Collin J. Doering +// Date: @!@DATE@!@ + diff --git a/.emacs.d/templates/scala-template.scala b/.emacs.d/templates/scala-template.scala new file mode 100644 index 0000000..b544a40 --- /dev/null +++ b/.emacs.d/templates/scala-template.scala @@ -0,0 +1,23 @@ +/** + * (C) Copyright Collin Doering @!@YEAR@!@ + * + * 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. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +/** + * File: @!@FILE@!@ + * Author: Collin J. Doering + * Date: @!@DATE@!@ + */ + diff --git a/.emacs.d/templates/scss-template.scss b/.emacs.d/templates/scss-template.scss new file mode 100644 index 0000000..ba240fc --- /dev/null +++ b/.emacs.d/templates/scss-template.scss @@ -0,0 +1,19 @@ +// (C) Copyright Collin Doering @!@YEAR@!@ +// +// 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. +// +// 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. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// File: @!@FILE@!@ +// Author: Collin J. Doering +// Date: @!@DATE@!@ + diff --git a/.eshell/alias b/.eshell/alias index 8212ebc..3698e78 100644 --- a/.eshell/alias +++ b/.eshell/alias @@ -1,5 +1,6 @@ -alias ffo find-file-other-window $1 -alias d dired $1 -alias ssudo /usr/bin/sudo -alias mss magit-status . +alias modspeed sudo tc qdisc $2 dev $1 root netem delay 300ms alias ms magit-status $1 +alias mss magit-status . +alias ssudo /usr/bin/sudo +alias d dired $1 +alias ffo find-file-other-window $1 diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 3735711..94dac96 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -15,7 +15,7 @@ mpd_music_dir = "/media/dm/Music" # #mpd_connection_timeout = "5" -execute_on_song_change = "notify-send -t 3000 -i \"/usr/share/icons/gnome/scalable/mimetypes/audio-x-generic-symbolic.svg\" \"$(ncmpcpp --now-playing '{%t\n%b - %a}|{%f}')\"" +execute_on_song_change = "notify-send -t 3000 \"$(ncmpcpp --now-playing '{%t\n%b - %a}|{%f}')\"" playlist_display_mode = "columns" browser_display_mode = "columns" search_engine_display_mode = "columns" diff --git a/.screenrc b/.screenrc index 2a0b425..1764a10 100644 --- a/.screenrc +++ b/.screenrc @@ -1,6 +1,6 @@ # Open several named screens at startup and run different commands in each screen -t zsh 0 zsh -screen -t weechat 1 weechat-curses +#screen -t weechat 1 weechat-curses #screen -t ncmpcpp 2 ncmpcpp #screen -t alsamixer 3 alsamixer diff --git a/.tmux.conf b/.tmux.conf new file mode 100644 index 0000000..1013ff7 --- /dev/null +++ b/.tmux.conf @@ -0,0 +1,15 @@ +# File: .tmux.conf +# Author: Collin J. Doering +# Date: Jan 18, 2014 + +# Set prefix key to C-t instead of default C-b +unbind C-b +set -g prefix C-t + +# Toggle last window like screen +bind-key C-t last-window + +# session initialization +new -s default -n zsh zsh +neww -n weechat weechat-curses +selectw -t 1 diff --git a/.xinitrc b/.xinitrc index a025719..54c934f 100755 --- a/.xinitrc +++ b/.xinitrc @@ -23,31 +23,21 @@ xsetroot -cursor_name left_ptr # Initialize a local desktop session (run generic helper applications) function init_local_session() { - # Start a user instance of systemd, which in turns starts: - # * xcompmgr - # * xscreensaver - # * unclutter - # * xbindkeys - # * urxvtd - # * emacsd - # * trayer *disabled* .. - # * udiskie - #systemd --user & #DEPRECIATED..logind calls systemd --user automatically - # Set a desktop background nitrogen --restore & - # Setup system tray *DISABLED* :: whats the point of a systray if no apps use it? - #trayer --monitor 1 --edge top --align right --expand true --width 4 --height 2 --transparent true --tint 0x000000 & - + # Load Xresources + xrdb -merge ~/.Xresources + # Create variable GENERAL_SCREEN which is the pid of a screen called "general" GENERAL_SCREEN=`screen -ls | grep general | cut -f1 -d'.' | sed 's/\W//g'` # Check to see if a general screen is already running - if [ "x$GENERAL_SCREEN" == "x" ]; then - screen -dmS general & - fi - + # DEPRECIATED in favor of tmux which is started by systemd + #if [ "x$GENERAL_SCREEN" == "x" ]; then + # screen -dmS general & + #fi + # Set the default wm to xmonad DEFAULT_WM=xmonad } diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 889a718..9ac4966 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -30,7 +30,6 @@ import qualified Data.Map as M import XMonad import XMonad.Actions.UpdatePointer -import XMonad.Actions.WindowBringer import XMonad.Actions.GridSelect import XMonad.Actions.FloatKeys @@ -46,6 +45,7 @@ import XMonad.Layout.SubLayouts import XMonad.Layout.WindowNavigation import XMonad.Layout.BoringWindows import XMonad.Layout.Tabbed +import XMonad.Layout.Circle import XMonad.Hooks.ManageDocks import XMonad.Hooks.DynamicLog @@ -226,6 +226,9 @@ myGenericKeys = -- Enable switching of windows with gridselect , ((modm, xK_g), goToSelected defaultGSConfig) + + -- Enable switching of workspaces using gridselect + , ((modm .|. shiftMask, xK_g), gridselectWorkspace defaultGSConfig W.view) -- Launch a backup terminal , ((modm .|. controlMask, xK_Return), spawn "xterm") @@ -248,9 +251,12 @@ myGenericKeys = -- Launch vlc , ((modm .|. controlMask, xK_v), spawn "vlc") - -- Launch a screen scratchpad terminal + -- Launch a emacs scratchpad (key binding for HHKB) , ((modm .|. controlMask, xK_Escape), namedScratchpadAction scratchpads "emacs-scratch") + -- Launch a emacs scratchpad (key binding for normal layout) + , ((modm .|. controlMask, xK_grave), namedScratchpadAction scratchpads "emacs-scratch") + -- Launch a screen scratchpad terminal , ((modm .|. controlMask, xK_1), namedScratchpadAction scratchpads "screen-terminal") @@ -262,12 +268,6 @@ myGenericKeys = -- Launch ncmpcpp scratchpad , ((modm .|. controlMask, xK_4), namedScratchpadAction scratchpads "ncmpcpp-scratch") - - -- Select window from dmenu and go to the workspace its on - , ((modm .|. shiftMask, xK_g), gotoMenuArgs ["-i","-nb", "#040404","-nf","#00FFFF","-sf","#ffa0ff","-sb","#000000"]) - - -- Select window from dmenu and drag it to the current workspace - , ((modm .|. shiftMask, xK_b), bringMenu) -- Enable movement and resizing of floating windows , ((modm, xK_d), withFocused (keysMoveWindow (10,0))) -- move floating window right @@ -293,10 +293,10 @@ myGenericKeys = -- , ((modm .|. controlMask, xK_comma), onGroup W.focusDown') -- Expand a mirror pane - , ((modm .|. shiftMask, xK_l), sendMessage MirrorExpand) + , ((modm .|. shiftMask, xK_l), sendMessage MirrorShrink) -- Shrink a mirror pane - , ((modm .|. shiftMask, xK_h), sendMessage MirrorShrink)] + , ((modm .|. shiftMask, xK_h), sendMessage MirrorExpand)] where modm = mod4Mask ------------------------------------------------------------------------ @@ -340,7 +340,7 @@ myLayout = smartBorders . avoidStruts $ -- for sublayouts but not currently used..see myGenericBindings above -- windowNavigation $ subTabbed $ boringWindows $ -- to get tabbed layout add simpleTabbed - rztiled ||| Mirror rztiled ||| Grid + rztiled ||| Mirror rztiled ||| Grid ||| Circle where -- default tiling algorithm partitions the screen into two panes tiled = Tall nmaster delta ratio @@ -397,11 +397,11 @@ myManageHook = composeAll , title =? "Xnest" --> doCenterFloat , resource =? "pavucontrol" --> doMaxFloat , resource =? "qemu-system-x86_64" --> doFullFloat - , resource =? "Halo.exe" --> doCenterFloat + -- , resource =? "Halo.exe" --> doCenterFloat -- , resource =? "UnrealTournament.exe" --> doCenterFloat -- , resource =? "hl2_linux" --> doFullFloat , isFullscreen --> (doF W.focusDown <+> doFullFloat) - , resourceIsOneOf ["emacs","gvim"] --> ask >>= (liftX . flip setOpacity (13/16)) >> idHook + , resourceIsOneOf ["emacs","gvim"] --> ask >>= (liftX . flip setOpacity (15/16)) >> idHook , resource =? "desktop_window" --> doIgnore ] <+> namedScratchpadManageHook scratchpads <+> manageDocks -- NamedScratchPad Hook @@ -417,11 +417,11 @@ scratchpads = [ NS "emacs-scratch" spawnEmacsScratch findEmacsScratch manageEmac findMcScratch = resource =? "mc-scratch" findNcmpcppScratch = resource =? "ncmpcpp-scratch" - spawnEmacsScratch = myTerminal ++ " -name emacs-scratch +tr -pe -tabbedex -e emacsclient -nw" - spawnMaintenanceTerminal = myTerminal ++ " -name scratchpad" + spawnEmacsScratch = myTerminal ++ " -name emacs-scratch -pe -tabbedex -e tmux new-session -s emacs-scratch \"emacsclient -nw\"" + spawnMaintenanceTerminal = myTerminal ++ " -name scratchpad -bg black" spawnScreenTerminal = myTerminal ++ " -name screen-scratch -bg black" - spawnMcScratch = myTerminal ++ " -name mc-scratch +tr -pe -tabbedex -e mc" - spawnNcmpcppScratch = myTerminal ++ " -name ncmpcpp-scratch +tr -pe -tabbedex -e ncmpcpp" + spawnMcScratch = myTerminal ++ " -name mc-scratch -pe -tabbedex -e mc" + spawnNcmpcppScratch = myTerminal ++ " -name ncmpcpp-scratch -pe -tabbedex -e ncmpcpp" manageEmacsScratch = customFloating $ W.RationalRect 0.10 0.10 0.80 0.80 manageMaintenanceTerminal = customFloating $ W.RationalRect 0 0.66 1 0.34