mirror of
https://github.com/NaomiAmethyst/dots.git
synced 2025-04-13 09:30:06 +00:00
Merge remote branch 'origin/master'
This commit is contained in:
David Majnemer
commit
a4e917bc75
10 changed files with 67 additions and 10 deletions
|
|
@ -34,6 +34,8 @@ XTerm*color13: #AD7FA8
|
|||
XTerm*color14: #34E2E2
|
||||
XTerm*color15: #EEEEEC
|
||||
|
||||
XTerm*toolBar: false
|
||||
|
||||
/* UXTerm */
|
||||
UXTerm*faceSize: 9
|
||||
UXTerm*faceName: Monospace
|
||||
|
|
@ -64,6 +66,8 @@ UXTerm*color13: #AD7FA8
|
|||
UXTerm*color14: #34E2E2
|
||||
UXTerm*color15: #EEEEEC
|
||||
|
||||
UXTerm*toolBar: false
|
||||
|
||||
/* URxvt */
|
||||
URxvt*font: xft:Monospace-9
|
||||
|
||||
|
|
|
|||
1
ackrc
Normal file
1
ackrc
Normal file
|
|
@ -0,0 +1 @@
|
|||
--type-add=asm=.S
|
||||
9
gdbinit
Normal file
9
gdbinit
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
set confirm off
|
||||
set history save on
|
||||
set verbose off
|
||||
|
||||
set output-radix 0x10
|
||||
set input-radix 0x10
|
||||
|
||||
set height 0
|
||||
set width 0
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
#!/usr/bin/perl -w
|
||||
#! /usr/bin/env perl
|
||||
# moderately tested script to untrack files that are listed in .gitignore
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use Getopt::Long;
|
||||
|
||||
my $dry_run = 0;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
cat = show
|
||||
list = show
|
||||
ls = show
|
||||
|
||||
untrack-ignored = !git-untracked-ignored
|
||||
[color]
|
||||
diff = auto
|
||||
status = auto
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ unless(eval {symlink('', ''); 1;}) {
|
|||
|
||||
my %links = (
|
||||
screenrc => '.screenrc',
|
||||
ackrc => '.ackrc',
|
||||
toprc => '.toprc',
|
||||
dir_colors => '.dir_colors',
|
||||
lessfilter => '.lessfilter',
|
||||
|
|
@ -80,6 +81,8 @@ my %links = (
|
|||
'git-untrack-ignored' => 'bin/git-untracked-ignored',
|
||||
|
||||
latex => '.latex',
|
||||
|
||||
gdbinit => '.gdbinit',
|
||||
);
|
||||
|
||||
my $i = 0; # Keep track of how many links we added
|
||||
|
|
|
|||
27
xmonad.hs
27
xmonad.hs
|
|
@ -1,9 +1,13 @@
|
|||
import XMonad
|
||||
import qualified XMonad.StackSet as W
|
||||
|
||||
import XMonad.Actions.CycleWS
|
||||
|
||||
import XMonad.Layout.Grid
|
||||
import XMonad.Layout.Tabbed
|
||||
import XMonad.Layout.NoBorders(smartBorders)
|
||||
|
||||
import XMonad.Hooks.UrgencyHook
|
||||
import XMonad.Hooks.DynamicLog
|
||||
import XMonad.Hooks.ManageDocks
|
||||
|
||||
|
|
@ -17,7 +21,12 @@ import XMonad.Prompt.Window
|
|||
|
||||
import System.IO(hPutStrLn)
|
||||
|
||||
myLayoutHook = tiled ||| Mirror tiled ||| Grid ||| Full
|
||||
-- Things that should always float
|
||||
myFloatHook = composeAll [
|
||||
className =? "qemu" --> doFloat
|
||||
]
|
||||
|
||||
myLayoutHook = tiled ||| Mirror tiled ||| Grid ||| simpleTabbed
|
||||
where
|
||||
-- default tiling algorithm partitions the screen into two panes
|
||||
tiled = Tall nmaster delta ratio
|
||||
|
|
@ -34,10 +43,11 @@ myLayoutHook = tiled ||| Mirror tiled ||| Grid ||| Full
|
|||
main = do
|
||||
xmproc <- spawnPipe "xmobar"
|
||||
xmonad $ defaultConfig
|
||||
{ manageHook = manageDocks <+> manageHook defaultConfig <+> scratchpadManageHook (W.RationalRect 0.25 0.25 0.5 0.5)
|
||||
, layoutHook = avoidStruts $ smartBorders $ myLayoutHook
|
||||
{ manageHook = manageDocks <+> myFloatHook <+> manageHook defaultConfig <+> scratchpadManageHook (W.RationalRect 0.25 0.25 0.5 0.5)
|
||||
, layoutHook = avoidStruts $ smartBorders $ myLayoutHook
|
||||
, logHook = dynamicLogWithPP $ xmobarPP
|
||||
{ ppOutput = hPutStrLn xmproc
|
||||
, ppUrgent = xmobarColor "#cc0000" "" . wrap "**" "**"
|
||||
, ppTitle = xmobarColor "#8AE234" ""
|
||||
}
|
||||
}
|
||||
|
|
@ -47,5 +57,16 @@ main = do
|
|||
, ("M-a", windowPromptBring defaultXPConfig { position = Top })
|
||||
, ("M-x", sendMessage ToggleStruts)
|
||||
, ("M-S-l", spawn "~/bin/lock")
|
||||
, ("M-<Left>", moveTo Prev HiddenNonEmptyWS)
|
||||
, ("M-S-<Left>", shiftToPrev)
|
||||
, ("M-<Right>", moveTo Next HiddenNonEmptyWS)
|
||||
, ("M-S-<Right>", shiftToNext)
|
||||
, ("M-<Up>", windows W.focusUp)
|
||||
, ("M-S-<Up>", windows W.swapUp)
|
||||
, ("M-<Down>", windows W.focusDown)
|
||||
, ("M-S-<Down>", windows W.swapDown)
|
||||
, ("M-`", toggleWS)
|
||||
, ("M-s", moveTo Next EmptyWS)
|
||||
, ("M-S-s", shiftTo Next EmptyWS)
|
||||
, ("M-g", scratchpadSpawnAction defaultConfig)
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
WORDCHARS=''
|
||||
|
||||
# disable core dumps
|
||||
limit coredumpsize 0
|
||||
if ( limit coredumpsize >/dev/null 2>&1) ; then
|
||||
limit coredumpsize 0
|
||||
fi
|
||||
|
||||
# clear on exit
|
||||
trap clear 0
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ bindkey ' ' magic-space
|
|||
bindkey -M emacs '\ee' edit-command-line
|
||||
|
||||
case $TERM in
|
||||
screen|xterm*|putty*)
|
||||
screen*|xterm*|putty*)
|
||||
bindkey '\e[H' beginning-of-line
|
||||
bindkey '\e[F' end-of-line
|
||||
bindkey '\eOH' beginning-of-line
|
||||
|
|
@ -30,6 +30,7 @@ case $TERM in
|
|||
bindkey '\e[c' emacs-forward-word
|
||||
bindkey '\e[d' emacs-backward-word
|
||||
bindkey '\M-B\M-^H' backward-kill-word
|
||||
bindkey '\M-C\M-?' backward-kill-word
|
||||
;;
|
||||
mlterm|kterm)
|
||||
bindkey '\e[H' beginning-of-line
|
||||
|
|
@ -72,6 +73,9 @@ case $TERM in
|
|||
cygwin*)
|
||||
bindkey '\e[1~' beginning-of-line
|
||||
bindkey '\e[4~' end-of-line
|
||||
bindkey '\e[1;5C' emacs-forward-word
|
||||
bindkey '\e[1;5D' emacs-backward-word
|
||||
bindkey '\e[3~' delete-char
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
|
|||
18
zsh/prompt
18
zsh/prompt
|
|
@ -1,11 +1,21 @@
|
|||
# prompt
|
||||
if [ "${TERM}" != "dumb" ] ; then
|
||||
RESETCOLOR=$'%{\e[00;00m%}'
|
||||
if [ -z "${SSH_TTY}" ] ; then
|
||||
PROMPT=$'%{\e[00;00m%}%{\e[01;32m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
|
||||
HOSTCOLOR=$'%{\e[01;32m%}'
|
||||
else
|
||||
PROMPT=$'%{\e[00;00m%}%{\e[01;36m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
|
||||
HOSTCOLOR=$'%{\e[01;36m%}'
|
||||
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%}'
|
||||
PATHCOLOR=$'%{\e[01;34m%}'
|
||||
ERRORCOLOR=$'%{\e[00;31m%}'
|
||||
BOLDERRORCOLOR=$'%{\e[01;31m%}'
|
||||
CLOCKCOLOR=$'%{\e[01;33m%}'
|
||||
JOBCOLOR=$'%{\e[00;36m%}'
|
||||
RPROMPT=${RESETCOLOR}$'%1(j.'${JOBCOLOR}$'[%j].)%(?..'${ERRORCOLOR}$'[%?])'${CLOCKCOLOR}$'[%t]'${RESETCOLOR}
|
||||
else
|
||||
PROMPT=$'%n@%m %~ %(?..)%(!.#.$)'
|
||||
RESETCOLOR=''
|
||||
HOSTCOLOR=''
|
||||
PATHCOLOR=''
|
||||
BOLDERRORCOLOR=''
|
||||
fi
|
||||
PROMPT=${RESETCOLOR}${HOSTCOLOR}$'%n@%m '${PATHCOLOR}$'%45<...<%~ %(?..'${BOLDERRORCOLOR}$')%(!.#.$) '${RESETCOLOR}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue