mirror of
https://github.com/NaomiAmethyst/dots.git
synced 2025-08-05 16:48:38 +00:00
Merge branch 'master' of gitosis@majnematic.com:davesdots
This commit is contained in:
commit
b183e990b1
5 changed files with 11 additions and 7 deletions
|
@ -28,6 +28,10 @@ case `uname -s` in
|
||||||
alias grep='grep -d skip --color=auto'
|
alias grep='grep -d skip --color=auto'
|
||||||
;;
|
;;
|
||||||
FreeBSD|Darwin|DragonFly)
|
FreeBSD|Darwin|DragonFly)
|
||||||
|
if ( command -v top >/dev/null 2>&1 ) ; then
|
||||||
|
alias top="top -o cpu"
|
||||||
|
fi
|
||||||
|
|
||||||
if ( command -v gls >/dev/null 2>&1 ) ; then
|
if ( command -v gls >/dev/null 2>&1 ) ; then
|
||||||
alias ls="gls -h --color=auto"
|
alias ls="gls -h --color=auto"
|
||||||
elif ( ls --version 2>/dev/null | grep GNU >/dev/null 2>&1 ) ; then
|
elif ( ls --version 2>/dev/null | grep GNU >/dev/null 2>&1 ) ; then
|
||||||
|
|
1
vimrc
1
vimrc
|
@ -245,7 +245,6 @@ map Y y$
|
||||||
vmap K k
|
vmap K k
|
||||||
|
|
||||||
" :W and :Q are annoying
|
" :W and :Q are annoying
|
||||||
command! -nargs=0 -bang X x<bang>
|
|
||||||
command! -nargs=0 -bang Q q<bang>
|
command! -nargs=0 -bang Q q<bang>
|
||||||
command! -nargs=0 -bang W w<bang>
|
command! -nargs=0 -bang W w<bang>
|
||||||
command! -nargs=0 -bang WQ wq<bang>
|
command! -nargs=0 -bang WQ wq<bang>
|
||||||
|
|
|
@ -11,6 +11,7 @@ import XMonad.Util.EZConfig(additionalKeysP)
|
||||||
|
|
||||||
import XMonad.Prompt
|
import XMonad.Prompt
|
||||||
import XMonad.Prompt.Shell(shellPrompt)
|
import XMonad.Prompt.Shell(shellPrompt)
|
||||||
|
import XMonad.Prompt.Window
|
||||||
|
|
||||||
import System.IO(hPutStrLn)
|
import System.IO(hPutStrLn)
|
||||||
|
|
||||||
|
@ -41,6 +42,8 @@ main = do
|
||||||
}
|
}
|
||||||
`additionalKeysP`
|
`additionalKeysP`
|
||||||
[ ("M-p", shellPrompt defaultXPConfig { position = Top })
|
[ ("M-p", shellPrompt defaultXPConfig { position = Top })
|
||||||
|
, ("M-S-a", windowPromptGoto defaultXPConfig { position = Top })
|
||||||
|
, ("M-a", windowPromptBring defaultXPConfig { position = Top })
|
||||||
, ("M-b", sendMessage ToggleStruts)
|
, ("M-b", sendMessage ToggleStruts)
|
||||||
, ("M-S-l", spawn "~/bin/lock")
|
, ("M-S-l", spawn "~/bin/lock")
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
# prompt
|
# prompt
|
||||||
if [ -z "${SSH_TTY}" ] ; then
|
if [ -z "${SSH_TTY}" ] ; then
|
||||||
PROMPT=$'%{\e[00;00m%}%{\e[01;32m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
|
PROMPT=$'%{\e[00;00m%}%{\e[01;32m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
|
||||||
RPROMPT=$'%{\e[00;00m%}%1(j.%{\e[00;36m%}[%j].)%{\e[01;33m%}[%t]%{\e[00;00m%}'
|
|
||||||
else
|
else
|
||||||
PROMPT=$'%{\e[00;00m%}%{\e[01;36m%}%n %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
|
PROMPT=$'%{\e[00;00m%}%{\e[01;36m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
|
||||||
RPROMPT=$'%{\e[00;00m%}%{\e[01;33m%}%m %{\e[01;32m%}%~%{\e[00;00m%}'
|
|
||||||
fi
|
fi
|
||||||
|
RPROMPT=$'%{\e[00;00m%}%{\e[00;00m%}%1(j.%{\e[00;36m%}[%j].)%(?..%{\e[00;31m%}[%?])%{\e[01;33m%}%{\e[01;33m%}[%t]%{\e[00;00m%}'
|
||||||
|
|
|
@ -3,7 +3,7 @@ precmd()
|
||||||
{
|
{
|
||||||
local termtitle
|
local termtitle
|
||||||
|
|
||||||
termtitle=`print -P "%n@%m"`
|
termtitle=`print -P "%n@%m[%l]"`
|
||||||
title zsh "$termtitle"
|
title zsh "$termtitle"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ preexec()
|
||||||
local termtitle
|
local termtitle
|
||||||
|
|
||||||
# Prepend this string to the title.
|
# Prepend this string to the title.
|
||||||
termtitle=`print -P "%n@%m:"`
|
termtitle=`print -P "%n@%m[%l]:"`
|
||||||
|
|
||||||
case $cmd[1] in
|
case $cmd[1] in
|
||||||
fg)
|
fg)
|
||||||
|
|
Loading…
Add table
Reference in a new issue