Various changes made, many in providing a more continuous LAF.
.Xdefaults: * added a key/val pair to set emacs font to terminus 12 point * did some rearranging.. .zshrc: (same as .bashrc) .bashrc: * added a alias to transmission-remote as it is now my primary torrent client * added ~/.cabal/bin to #PATH .conkerorrc: * set default homepage to duckduckgo .emacs: * set emacs font to terminus 12 point in the pursuit of a consistent UI * disabled pretty lambdas; neeeds to be re-enabled seeing as the issue noted in emacs24 was unrelated and solved by setting the font (both in ~/.emacs and ~/.Xdefaults. Though pretty lambdas can only be used for lisp-like languages. * added clojure-mode-hook to the list of mode-hooks called 'code-modes' * noticed paredit's binding C-j interfered with eval-print-last-sexp in the scratch buffer. To rectify this added a global binding. Need to make this a local binding *TODO* * set eshell-visual-commands to a list of commands for eshell to execute in a ansi term * created a eshell/ff function for looking up files using eshell's build in globbing. Issue is that it does not take into consideration relative paths *TODO* .screenrc: changed default binding prefix C-a to C-t .xmobarrc: added modules Weather, Uptime and Swap .xmonad/xmonad.hs: * added the WindowBringer module * made dmenu fit more naturally into the UI theme * added toggle dullscreen support (Mod+Control+Space) Signed-off-by: Collin Doering <rekahsoft@gmail.com>
This commit is contained in:
parent
aac41c0395
commit
0b231dbbcc
37
.Xdefaults
37
.Xdefaults
|
@ -1,21 +1,22 @@
|
||||||
URxvt.buffered: true
|
URxvt.buffered: true
|
||||||
URxvt.foreground: white
|
URxvt.foreground: white
|
||||||
URxvt.cursorColor: green
|
URxvt.cursorColor: green
|
||||||
URxvt.underlineColor: yellow
|
URxvt.underlineColor: yellow
|
||||||
URxvt.font: xft:Bitstream Vera Sans Mono:pixelsize=12:antialias=false
|
URxvt.font: xft:Bitstream Vera Sans Mono:pixelsize=12:antialias=false
|
||||||
URxvt.boldFont: xft:Bitstream Vera Sans Mono:bold:pixelsize=13:antialias=false
|
URxvt.boldFont: xft:Bitstream Vera Sans Mono:bold:pixelsize=13:antialias=false
|
||||||
URxvt.perl-ext-common: default,tabbedex,url-select,keyboard-select,matcher
|
URxvt.perl-ext-common: default,tabbedex,url-select,keyboard-select,matcher
|
||||||
URxvt.keysym.M-u: perl:url-select:select_next
|
URxvt.keysym.M-u: perl:url-select:select_next
|
||||||
URxvt.urlLauncher: /usr/bin/conkeror
|
URxvt.urlLauncher: /usr/bin/conkeror
|
||||||
URxvt.underlineURLs: true
|
URxvt.underlineURLs: true
|
||||||
URxvt.matcher.button: 1
|
URxvt.matcher.button: 1
|
||||||
URxvt.scrollstyle: plain
|
URxvt.scrollstyle: plain
|
||||||
|
|
||||||
URxvt.keysym.M-Escape: perl:keyboard-select:activate
|
URxvt.keysym.M-Escape: perl:keyboard-select:activate
|
||||||
URxvt.keysym.M-s: perl:keyboard-select:search
|
URxvt.keysym.M-s: perl:keyboard-select:search
|
||||||
|
|
||||||
URxvt.depth: 32
|
URxvt.depth: 32
|
||||||
URxvt.background: rgba:0000/0000/0000/cccc
|
URxvt.background: rgba:0000/0000/0000/cccc
|
||||||
URxvt.tabbed.tabbar-bg: -1
|
URxvt.tabbed.tabbar-bg: -1
|
||||||
urxvt.urgentOnBell: true
|
urxvt.urgentOnBell: true
|
||||||
vncviewer.passwordDialog: true
|
vncviewer.passwordDialog: true
|
||||||
|
Emacs.font: Terminus-12
|
||||||
|
|
3
.bashrc
3
.bashrc
|
@ -11,6 +11,7 @@ alias ncmpc='ncmpc -c'
|
||||||
alias knk='knock rekahsoft-mini 7713:tcp 1377:udp && sleep 3s && '
|
alias knk='knock rekahsoft-mini 7713:tcp 1377:udp && sleep 3s && '
|
||||||
alias knkc='knk ssh rekahsoft-mini '
|
alias knkc='knk ssh rekahsoft-mini '
|
||||||
alias skreen='screen -c /dev/null'
|
alias skreen='screen -c /dev/null'
|
||||||
|
alias tranr='transmission-remote'
|
||||||
|
|
||||||
export GREP_COLOR="1;33"
|
export GREP_COLOR="1;33"
|
||||||
alias grep='grep --color=auto'
|
alias grep='grep --color=auto'
|
||||||
|
@ -28,7 +29,7 @@ stty stop undef
|
||||||
# * mathematica / tools
|
# * mathematica / tools
|
||||||
# * nxclient / associated tools
|
# * nxclient / associated tools
|
||||||
# * maven tools
|
# * maven tools
|
||||||
export PATH=${PATH}:/usr/local/bin:/opt/maven/bin:/opt/NX/bin
|
export PATH=${PATH}:/usr/local/bin:/opt/maven/bin:/opt/NX/bin:/home/collin/.cabal/bin
|
||||||
|
|
||||||
# start keychain
|
# start keychain
|
||||||
eval `keychain --eval --timeout 10 --quiet --agents ssh id_rsa`
|
eval `keychain --eval --timeout 10 --quiet --agents ssh id_rsa`
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
// REKAHSOFT-MINI
|
// REKAHSOFT-MINI
|
||||||
|
|
||||||
// the default page for new buffers.
|
// the default page for new buffers.
|
||||||
homepage = "http://www.google.ca";
|
homepage = "http://www.duckduckgo.com";
|
||||||
|
|
||||||
// load urls from the command line in new buffers instead
|
// load urls from the command line in new buffers instead
|
||||||
// of new windows.
|
// of new windows.
|
||||||
|
|
46
.emacs
46
.emacs
|
@ -25,13 +25,20 @@
|
||||||
(interactive)
|
(interactive)
|
||||||
(other-window -1)))
|
(other-window -1)))
|
||||||
|
|
||||||
;; Thanks to lauren michelle for this one
|
;; Thanks to lauren michelle for this one *BROKEN*
|
||||||
(defun pretty-lambdas ()
|
;; Seemingly broken in emacs24 (or at least when i noticed the issue). Throws
|
||||||
(font-lock-add-keywords
|
;; off font size of function names because font-lock-add-keywords is responsible
|
||||||
nil `(("(\\(lambda\\>\\)"
|
;; for fontifying function/variable definitions. Consistency of text size is not
|
||||||
(0 (progn (compose-region (match-beginning 1) (match-end 1)
|
;; affected when emacs is run in a terminal, only the GTK GUI front end.
|
||||||
,(make-char 'greek-iso8859-7 107))
|
;; Also really only should be applied to lisp-like
|
||||||
nil))))))
|
;; languages (because it parses for char '(' and endBy ')' and thus \x -> ...
|
||||||
|
;; or a lambda expression from any language must be wrapped in parens
|
||||||
|
;; (defun pretty-lambdas ()
|
||||||
|
;; (font-lock-add-keywords
|
||||||
|
;; nil `(("(\\(lambda\\>\\)"
|
||||||
|
;; (0 (progn (compose-region (match-beginning 1) (match-end 1)
|
||||||
|
;; ,(make-char 'greek-iso8859-7 107))
|
||||||
|
;; nil))))))
|
||||||
|
|
||||||
;; adds the given function mode to each element of the given-hooks
|
;; adds the given function mode to each element of the given-hooks
|
||||||
(defun activate-mode-with-hooks (mode given-hooks)
|
(defun activate-mode-with-hooks (mode given-hooks)
|
||||||
|
@ -40,8 +47,8 @@
|
||||||
mode)
|
mode)
|
||||||
(setq given-hooks (cdr given-hooks))))
|
(setq given-hooks (cdr given-hooks))))
|
||||||
|
|
||||||
;; Make lambda appear as the greek character
|
;; Make lambda appear as the greek character *BROKEN* -- read above
|
||||||
(activate-mode-with-hooks 'pretty-lambdas '(scheme-mode-hook lisp-mode-hook lisp-interaction-mode geiser-repl-mode python-mode emacs-lisp-mode))
|
;;(activate-mode-with-hooks 'pretty-lambdas '(scheme-mode-hook lisp-mode-hook lisp-interaction-mode geiser-repl-mode python-mode emacs-lisp-mode))
|
||||||
|
|
||||||
;; linum mode for pretty line numbering
|
;; linum mode for pretty line numbering
|
||||||
(require 'linum)
|
(require 'linum)
|
||||||
|
@ -57,7 +64,7 @@
|
||||||
'face 'linum)))
|
'face 'linum)))
|
||||||
|
|
||||||
;; code-modes is a list of mode hooks (for programming langs only)
|
;; code-modes is a list of mode hooks (for programming langs only)
|
||||||
(defvar code-modes '(scheme-mode-hook emacs-lisp-mode-hook c-mode-hook c++-mode-hook python-mode-hook lua-mode-hook haskell-mode-hook php-mode-hook perl-mode-hook lisp-mode-hook ruby-mode-hook sh-mode-hook))
|
(defvar code-modes '(scheme-mode-hook emacs-lisp-mode-hook c-mode-hook c++-mode-hook python-mode-hook lua-mode-hook haskell-mode-hook php-mode-hook perl-mode-hook lisp-mode-hook clojure-mode-hook ruby-mode-hook sh-mode-hook))
|
||||||
|
|
||||||
;; activate linum-mode in all buffers used for programming
|
;; activate linum-mode in all buffers used for programming
|
||||||
(activate-mode-with-hooks (lambda () (linum-mode 1)) code-modes)
|
(activate-mode-with-hooks (lambda () (linum-mode 1)) code-modes)
|
||||||
|
@ -87,6 +94,9 @@
|
||||||
;; Use the built-in themeing in emacs24
|
;; Use the built-in themeing in emacs24
|
||||||
(load-theme 'manoj-dark)
|
(load-theme 'manoj-dark)
|
||||||
|
|
||||||
|
;; Set the default font (12 pixels tall)
|
||||||
|
(set-default-font "Terminus-12")
|
||||||
|
|
||||||
;; Set default tramp method to ssh (for security purposes)
|
;; Set default tramp method to ssh (for security purposes)
|
||||||
(setq tramp-default-method "ssh")
|
(setq tramp-default-method "ssh")
|
||||||
|
|
||||||
|
@ -252,6 +262,12 @@
|
||||||
(require 'paredit)
|
(require 'paredit)
|
||||||
(defvar paredit-hooks '(lisp-mode-hook lisp-interaction-mode-hook emacs-lisp-mode scheme-mode-hook c-mode-hook c++-mode-hook python-mode-hook))
|
(defvar paredit-hooks '(lisp-mode-hook lisp-interaction-mode-hook emacs-lisp-mode scheme-mode-hook c-mode-hook c++-mode-hook python-mode-hook))
|
||||||
|
|
||||||
|
;; Paredit binds to C-j globally and thus disables the binding to
|
||||||
|
;; eval-print-last-sexp in *scratch*; this is more of a temporary
|
||||||
|
;; fix because it creates a global binding and thus can be run in
|
||||||
|
;; not only any emacs-lisp-mode buffer but any buffer
|
||||||
|
(global-set-key "\C-xj" 'eval-print-last-sexp)
|
||||||
|
|
||||||
;; Apply paredit-mode to modes listed in paredit-hooks
|
;; Apply paredit-mode to modes listed in paredit-hooks
|
||||||
(activate-mode-with-hooks (lambda () (paredit-mode 1)) paredit-hooks)
|
(activate-mode-with-hooks (lambda () (paredit-mode 1)) paredit-hooks)
|
||||||
|
|
||||||
|
@ -418,6 +434,16 @@
|
||||||
;; *BROKEN*
|
;; *BROKEN*
|
||||||
;;(setq eshell-scroll-to-bottom-on-output t)
|
;;(setq eshell-scroll-to-bottom-on-output t)
|
||||||
|
|
||||||
|
;; Commands that require a little more then a dumb-term
|
||||||
|
(setq eshell-visual-commands '("vi" "screen" "top" "less" "more" "lynx" "ncftp" "vim" "ncmpcpp" "irssi" "mc" "alsamixer" "/usr/bin/sudo"))
|
||||||
|
|
||||||
|
(defun eshell/ff (fs)
|
||||||
|
"Find many files using eshell's built in regexps"
|
||||||
|
(interactive)
|
||||||
|
(if (listp fs)
|
||||||
|
(mapc #'find-file fs)
|
||||||
|
(find-file fs)))
|
||||||
|
|
||||||
(defun eshell/clear ()
|
(defun eshell/clear ()
|
||||||
"04Dec2001 - sailor, to clear the eshell buffer."
|
"04Dec2001 - sailor, to clear the eshell buffer."
|
||||||
(interactive)
|
(interactive)
|
||||||
|
|
|
@ -6,6 +6,9 @@ screen -t alsamixer 3 alsamixer
|
||||||
screen -t mc 4 mc
|
screen -t mc 4 mc
|
||||||
screen -t nvlc 5 nvlc
|
screen -t nvlc 5 nvlc
|
||||||
|
|
||||||
|
# Set default prefix from C-a to C-t
|
||||||
|
escape ^Tt
|
||||||
|
|
||||||
# Switch to window 1 (irssi)
|
# Switch to window 1 (irssi)
|
||||||
#screen -p irssi
|
#screen -p irssi
|
||||||
|
|
||||||
|
|
|
@ -22,15 +22,18 @@ Config { font = "-*-terminus-*-*-*-*-35-*-*-*-*-*-*-u"
|
||||||
, fgColor = "#00FFFF"
|
, fgColor = "#00FFFF"
|
||||||
, position = TopW L 96
|
, position = TopW L 96
|
||||||
, lowerOnStart = True
|
, lowerOnStart = True
|
||||||
, commands = [ Run Network "eth0" ["-L","0","-H","32","-l", "green", "--normal","orange","--high","red"] 40
|
, commands = [ Run Network "eth0" ["-L","0","-H","32","-l","green","--normal","orange","--high","red"] 40
|
||||||
-- , Run Com "/home/collin/.bin/vol.sh" [] "vol" 15
|
-- , Run Com "/home/collin/.bin/vol.sh" [] "vol" 15
|
||||||
, Run MultiCpu ["-t","Cpu <total> | cpu0: <total0> | cpu1: <total1> | cpu2: <total2> | cpu3: <total3>","-L","3","-H","50","--high","#f0c040"] 10
|
, Run MultiCpu ["-t","Cpu <total> | cpu0: <total0> | cpu1: <total1> | cpu2: <total2> | cpu3: <total3>","-L","3","-H","50","--high","#f0c040"] 10
|
||||||
, Run Memory ["-t","Mem: <usedratio>%", "-l", "green", "--normal","orange","--high","red"] 40
|
, Run Memory ["-t","Mem: <usedratio>%","-l","green","--normal","orange","--high","red"] 40
|
||||||
|
, Run Swap ["-t","Swap: <usedratio>%","-l","green","--normal","orange","--high","red"] 60
|
||||||
, Run Date "%a %b %_d %l:%M %p" "date" 60
|
, Run Date "%a %b %_d %l:%M %p" "date" 60
|
||||||
|
, Run Uptime ["-t","Up: <days>d <hours>h <minutes>m","-l","green","--normal","orange","--high","red"] 60
|
||||||
|
, Run Weather "CYKF" ["-t","Waterloo: <tempC>C"] 36000
|
||||||
, Run CpuFreq ["-t","Freq: <cpu0> | <cpu1> GHz","-L","0","-H","2","-l","green","-n","orange","-h","red"] 50
|
, Run CpuFreq ["-t","Freq: <cpu0> | <cpu1> GHz","-L","0","-H","2","-l","green","-n","orange","-h","red"] 50
|
||||||
, Run StdinReader
|
, Run StdinReader
|
||||||
]
|
]
|
||||||
, sepChar = "%"
|
, sepChar = "%"
|
||||||
, alignSep = "}{"
|
, alignSep = "}{"
|
||||||
, template = " %StdinReader% }{ %multicpu% <fc=#0033FF>|</fc> %memory% <fc=#0033FF>|</fc> %eth0% <fc=#0033FF>|</fc> %date% <fc=#0033FF>|</fc> "
|
, template = " %StdinReader% }{ %multicpu% %memory% <fc=#0033FF>|</fc> %swap% <fc=#0033FF>|</fc> %eth0% <fc=#0033FF>|</fc> %uptime% <fc=#0033FF>|</fc> %CYKF% <fc=#0033FF>|</fc> %date% <fc=#0033FF>|</fc> "
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,10 +24,11 @@
|
||||||
|
|
||||||
import XMonad
|
import XMonad
|
||||||
import XMonad.Actions.UpdatePointer
|
import XMonad.Actions.UpdatePointer
|
||||||
|
import XMonad.Actions.WindowBringer
|
||||||
import Data.Monoid
|
import Data.Monoid
|
||||||
import System.Exit
|
import System.Exit
|
||||||
import XMonad.Util.Run(spawnPipe)
|
import XMonad.Util.Run(spawnPipe)
|
||||||
import XMonad.Layout.NoBorders(smartBorders)
|
import XMonad.Layout.NoBorders(noBorders,smartBorders)
|
||||||
import XMonad.Layout.ResizableTile
|
import XMonad.Layout.ResizableTile
|
||||||
import XMonad.Layout.Grid
|
import XMonad.Layout.Grid
|
||||||
import XMonad.Layout.ToggleLayouts
|
import XMonad.Layout.ToggleLayouts
|
||||||
|
@ -56,7 +57,7 @@ myFocusFollowsMouse = False
|
||||||
|
|
||||||
-- Width of the window border in pixels.
|
-- Width of the window border in pixels.
|
||||||
--
|
--
|
||||||
myBorderWidth = 2
|
myBorderWidth = 3
|
||||||
|
|
||||||
-- modMask lets you specify which modkey you want to use. The default
|
-- modMask lets you specify which modkey you want to use. The default
|
||||||
-- is mod1Mask ("left alt"). You may also consider using mod3Mask
|
-- is mod1Mask ("left alt"). You may also consider using mod3Mask
|
||||||
|
@ -113,8 +114,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
|
||||||
[ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf)
|
[ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf)
|
||||||
|
|
||||||
-- launch dmenu
|
-- launch dmenu
|
||||||
--, ((modm, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"")
|
, ((modm, xK_p ), spawn "dmenu_run -i -nb '#040404' -nf '#00FFFF' -sf '#ffa0ff' -sb '#000000'")
|
||||||
, ((modm, xK_p ), spawn "dmenu_run")
|
|
||||||
|
|
||||||
-- close focused window
|
-- close focused window
|
||||||
, ((modm .|. shiftMask, xK_c ), kill)
|
, ((modm .|. shiftMask, xK_c ), kill)
|
||||||
|
@ -250,6 +250,12 @@ myGenericKeys =
|
||||||
-- Launch transmission scratchpad (formally deluge)
|
-- Launch transmission scratchpad (formally deluge)
|
||||||
, ((modm .|. controlMask, xK_4), namedScratchpadAction scratchpads "transmission")
|
, ((modm .|. controlMask, xK_4), namedScratchpadAction scratchpads "transmission")
|
||||||
|
|
||||||
|
-- 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
|
-- Enable movement and resizing of floating windows
|
||||||
, ((modm, xK_d), withFocused (keysMoveWindow (10,0))) -- move floating window right
|
, ((modm, xK_d), withFocused (keysMoveWindow (10,0))) -- move floating window right
|
||||||
, ((modm, xK_a), withFocused (keysMoveWindow (-10,0))) -- move floating window left
|
, ((modm, xK_a), withFocused (keysMoveWindow (-10,0))) -- move floating window left
|
||||||
|
@ -302,9 +308,9 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $
|
||||||
-- The available layouts. Note that each layout is separated by |||,
|
-- The available layouts. Note that each layout is separated by |||,
|
||||||
-- which denotes layout choice.
|
-- which denotes layout choice.
|
||||||
--
|
--
|
||||||
-- Add "toggleLayouts Full rztiled" to the layouts below (for
|
myLayout = smartBorders . avoidStruts $
|
||||||
-- Mod-Control-Space command)
|
toggleLayouts (noBorders Full) $
|
||||||
myLayout = avoidStruts $ rztiled ||| Mirror rztiled ||| Grid ||| Full
|
rztiled ||| Mirror rztiled ||| Grid
|
||||||
where
|
where
|
||||||
-- default tiling algorithm partitions the screen into two panes
|
-- default tiling algorithm partitions the screen into two panes
|
||||||
tiled = Tall nmaster delta ratio
|
tiled = Tall nmaster delta ratio
|
||||||
|
@ -480,7 +486,7 @@ defaults sxmproc = defaultConfig {
|
||||||
mouseBindings = myMouseBindings,
|
mouseBindings = myMouseBindings,
|
||||||
|
|
||||||
-- hooks, layouts
|
-- hooks, layouts
|
||||||
layoutHook = smartBorders (myLayout),
|
layoutHook = myLayout,
|
||||||
manageHook = myManageHook,
|
manageHook = myManageHook,
|
||||||
handleEventHook = myEventHook,
|
handleEventHook = myEventHook,
|
||||||
logHook = myLogHook sxmproc >> updatePointer (Relative 0.5 0.5),
|
logHook = myLogHook sxmproc >> updatePointer (Relative 0.5 0.5),
|
||||||
|
|
3
.zshrc
3
.zshrc
|
@ -26,6 +26,7 @@ alias knk='knock rekahsoft-mini 7713:tcp 1377:udp && sleep 3s && '
|
||||||
alias knkc='knk ssh rekahsoft-mini '
|
alias knkc='knk ssh rekahsoft-mini '
|
||||||
alias kgit='knk git'
|
alias kgit='knk git'
|
||||||
alias skreen='screen -c /dev/null'
|
alias skreen='screen -c /dev/null'
|
||||||
|
alias tranr='transmission-remote'
|
||||||
|
|
||||||
export GREP_COLOR="1;33"
|
export GREP_COLOR="1;33"
|
||||||
alias grep='grep --color=auto'
|
alias grep='grep --color=auto'
|
||||||
|
@ -43,7 +44,7 @@ stty stop undef
|
||||||
# * mathematica / tools
|
# * mathematica / tools
|
||||||
# * nxclient / associated tools
|
# * nxclient / associated tools
|
||||||
# * maven tools
|
# * maven tools
|
||||||
export PATH=${PATH}:/usr/local/bin:/opt/maven/bin:/opt/NX/bin
|
export PATH=${PATH}:/usr/local/bin:/opt/maven/bin:/opt/NX/bin:/home/collin/.cabal/bin
|
||||||
|
|
||||||
# start keychain
|
# start keychain
|
||||||
eval `keychain --eval --timeout 10 --quiet --agents ssh id_rsa`
|
eval `keychain --eval --timeout 10 --quiet --agents ssh id_rsa`
|
||||||
|
|
Reference in New Issue