From 9acc53226e7e58cc1323154a8bb7a5aa0d0e43b1 Mon Sep 17 00:00:00 2001 From: Mike Crittenden Date: Thu, 22 Sep 2011 10:19:16 -0400 Subject: [PATCH] organizing config files into subdirs and adding some new ones --- .bashrc | 126 ----------------------------- .ackrc => ack/.ackrc | 0 arch/rc.conf | 119 +++++++++++++++++++++++++++ bash/.bashrc | 9 +++ scrotwm/scrotwm.conf | 147 ++++++++++++++++++++++++++++++++++ .vimrc => vim/.vimrc | 2 +- xmonad.desktop | 8 -- xmonad.session | 7 -- .xmobarrc => xmonad/.xmobarrc | 0 xmonad.hs => xmonad/xmonad.hs | 13 ++- xorg/.Xresources | 35 ++++++++ xorg/.xinitrc | 4 + xorg/.xmodmaprc | 3 + .zshrc => zsh/.zshrc | 4 +- 14 files changed, 326 insertions(+), 151 deletions(-) delete mode 100644 .bashrc rename .ackrc => ack/.ackrc (100%) create mode 100644 arch/rc.conf create mode 100644 bash/.bashrc create mode 100644 scrotwm/scrotwm.conf rename .vimrc => vim/.vimrc (98%) delete mode 100644 xmonad.desktop delete mode 100644 xmonad.session rename .xmobarrc => xmonad/.xmobarrc (100%) rename xmonad.hs => xmonad/xmonad.hs (50%) create mode 100644 xorg/.Xresources create mode 100644 xorg/.xinitrc create mode 100644 xorg/.xmodmaprc rename .zshrc => zsh/.zshrc (94%) diff --git a/.bashrc b/.bashrc deleted file mode 100644 index 128fce2..0000000 --- a/.bashrc +++ /dev/null @@ -1,126 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -export EDITOR=vim - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines in the history. See bash(1) for more options -# ... or force ignoredups and ignorespace -HISTCONTROL=ignoredups:ignorespace - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - -# some more ls aliases -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' - -alias gitpom='git push origin master' -alias gitcom='git commit -m' - -alias gp='git push' -alias gc='git commit -m' -alias gs='git status' -alias gb='git branch' -alias ga='git add' -alias gpl='git pull' -alias gcp='git cherry-pick -n' - -alias ack='ack-grep --literal --smart-case' -alias sch='scheme-r5rs' - -alias sshd='ssh mcrittenden@iade106lmp01.blackmesh.com -p 9567' -alias sshp='ssh iade106@iade106lwb01.blackmesh.com -p 9567' -alias dd='cd /home/mcrittenden/Dropbox/Code/dropdo-django/dropdo' -alias pm='python manage.py' -alias pmr='python manage.py runserver' -# Add an "alert" alias for long running commands. Use like so: -# sleep 10; alert -alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' - -alias fileslap='/home/mcrittenden/Dropbox/Code/fileslap-cli/fileslap' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if [ -f /etc/bash_completion ] && ! shopt -oq posix; then - . /etc/bash_completion -fi diff --git a/.ackrc b/ack/.ackrc similarity index 100% rename from .ackrc rename to ack/.ackrc diff --git a/arch/rc.conf b/arch/rc.conf new file mode 100644 index 0000000..6f8ca10 --- /dev/null +++ b/arch/rc.conf @@ -0,0 +1,119 @@ +# +# /etc/rc.conf - Main Configuration for Arch Linux +# + +# ----------------------------------------------------------------------- +# LOCALIZATION +# ----------------------------------------------------------------------- +# +# LOCALE: available languages can be listed with the 'locale -a' command +# DAEMON_LOCALE: If set to 'yes', use $LOCALE as the locale during daemon +# startup and during the boot process. If set to 'no', the C locale is used. +# HARDWARECLOCK: set to "", "UTC" or "localtime", any other value will result +# in the hardware clock being left untouched (useful for virtualization) +# Note: Using "localtime" is discouraged, using "" makes hwclock fall back +# to the value in /var/lib/hwclock/adjfile +# TIMEZONE: timezones are found in /usr/share/zoneinfo +# Note: if unset, the value in /etc/localtime is used unchanged +# KEYMAP: keymaps are found in /usr/share/kbd/keymaps +# CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US) +# CONSOLEMAP: found in /usr/share/kbd/consoletrans +# USECOLOR: use ANSI color sequences in startup messages +# +LOCALE="en_US.UTF-8" +DAEMON_LOCALE="no" +HARDWARECLOCK="UTC" +TIMEZONE="America/New_York" +KEYMAP="us" +CONSOLEFONT= +CONSOLEMAP= +USECOLOR="yes" + +# ----------------------------------------------------------------------- +# HARDWARE +# ----------------------------------------------------------------------- +# +# MODULES: Modules to load at boot-up. Blacklisting is no longer supported. +# Replace every !module by an entry as on the following line in a file in +# /etc/modprobe.d: +# blacklist module +# See "man modprobe.conf" for details. +# +MODULES=(snd_usb_audio snd_usb_lib) + +# Udev settle timeout (default to 30) +UDEV_TIMEOUT=30 + +# Scan for FakeRAID (dmraid) Volumes at startup +USEDMRAID="no" + +# Scan for BTRFS volumes at startup +USEBTRFS="no" + +# Scan for LVM volume groups at startup, required if you use LVM +USELVM="no" + +# ----------------------------------------------------------------------- +# NETWORKING +# ----------------------------------------------------------------------- +# +# HOSTNAME: Hostname of machine. Should also be put in /etc/hosts +# +HOSTNAME="freshpad" + +# Use 'ip addr' or 'ls /sys/class/net/' to see all available interfaces. +# +# Wired network setup +# - interface: name of device (required) +# - address: IP address (leave blank for DHCP) +# - netmask: subnet mask (ignored for DHCP) (optional, defaults to 255.255.255.0) +# - broadcast: broadcast address (ignored for DHCP) (optional) +# - gateway: default route (ignored for DHCP) +# +# Static IP example +# interface=eth0 +# address=192.168.0.2 +# netmask=255.255.255.0 +# broadcast=192.168.0.255 +# gateway=192.168.0.1 +# +# DHCP example +# interface=eth0 +# address= +# netmask= +# gateway= + +interface=eth0 +address= +netmask= +broadcast= +gateway= + +# Setting this to "yes" will skip network shutdown. +# This is required if your root device is on NFS. +NETWORK_PERSIST="no" + +# Enable these netcfg profiles at boot-up. These are useful if you happen to +# need more advanced network features than the simple network service +# supports, such as multiple network configurations (ie, laptop users) +# - set to 'menu' to present a menu during boot-up (dialog package required) +# - prefix an entry with a ! to disable it +# +# Network profiles are found in /etc/network.d +# +# This requires the netcfg package +# +#NETWORKS=(main) + +# ----------------------------------------------------------------------- +# DAEMONS +# ----------------------------------------------------------------------- +# +# Daemons to start at boot-up (in this order) +# - prefix a daemon with a ! to disable it +# - prefix a daemon with a @ to start it up in the background +# +# If something other takes care of your hardware clock (ntpd, dual-boot...) +# you should disable 'hwclock' here. +# +DAEMONS=(hwclock syslog-ng netfs crond httpd mysqld dbus networkmanager) diff --git a/bash/.bashrc b/bash/.bashrc new file mode 100644 index 0000000..a355b0c --- /dev/null +++ b/bash/.bashrc @@ -0,0 +1,9 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +alias ls='ls --color=auto' +PS1='[\u@\h \W]\$ ' diff --git a/scrotwm/scrotwm.conf b/scrotwm/scrotwm.conf new file mode 100644 index 0000000..97121ed --- /dev/null +++ b/scrotwm/scrotwm.conf @@ -0,0 +1,147 @@ +# $scrotwm: scrotwm.conf,v 1.38 2011/08/08 22:41:51 marco Exp $ + +# PLEASE READ THE MAN PAGE BEFORE EDITING THIS FILE! +# http://opensource.conformal.com/cgi-bin/man-cgi?scrotwm + +# colors for focussed and unfocussed window borders +# NOTE: all colors in this file are in hex! see XQueryColor for examples +color_focus = red +color_unfocus = rgb:88/88/88 + +# bar settings +bar_enabled = 1 +bar_border_width = 1 +bar_border[1] = rgb:00/80/80 +bar_color[1] = black +bar_font_color[1] = rgb:a0/a0/a0 +bar_font = -*-profont-*-*-*-*-12-*-*-*-*-*-*-* +#bar_action = baraction.sh +#bar_delay = 1 +#bar_at_bottom = 1 +stack_enabled = 1 +clock_enabled = 1 +#clock_format = %a %b %d %R %Z %Y +title_name_enabled = 0 +title_class_enabled = 0 +window_name_enabled = 0 +#verbose_layout = 1 +#focus_mode = default +#disable_border = 1 +#border_width = 1 +#urgent_enabled = 1 + +# spawn app +# program[term] = xterm +# program[screenshot_all] = screenshot.sh full +# program[screenshot_wind] = screenshot.sh window +# program[lock] = xlock +# program[initscr] = initscreen.sh +program[menu] = dmenu_run -fn $bar_font -nb $bar_color -nf $bar_font_color -sb $bar_border -sf $bar_color +spawn_term = xterm + +# dialog box size ratio .3 >= r < 1 +dialog_ratio = 0.6 + +# Split a non-Xrandr dual head setup into one region per monitor +# (non-standard driver-based multihead is not seen by scrotwm) +# region = screen[1]:1280x1024+0+0 +# region = screen[1]:1280x1024+1280+0 + +# Launch applications in a workspace of choice +autorun = ws[1]:chromium +autorun = ws[1]:pidgin +autorun = ws[2]:xterm +autorun = ws[2]:xterm +autorun = ws[2]:xterm +autorun = ws[2]:xterm + +# workspace layout +# layout = ws[1]:4:0:0:0:vertical +# layout = ws[2]:0:0:0:0:horizontal +# layout = ws[3]:0:0:0:0:fullscreen + +# mod key, (windows key is Mod4) (apple key on OSX is Mod2) +modkey = Mod1 + +# key bindings +# unbind with: bind[] = +#bind[cycle_layout] = MOD+space +#bind[stack_reset] = MOD+Shift+space +#bind[master_shrink] = MOD+h +#bind[master_grow] = MOD+l +#bind[master_add] = MOD+comma +#bind[master_del] = MOD+period +#bind[stack_inc] = MOD+Shift+comma +#bind[stack_dec] = MOD+Shift+period +#bind[swap_main] = MOD+Return +#bind[focus_next] = MOD+j +#bind[focus_prev] = MOD+k +#bind[swap_next] = MOD+Shift+j +#bind[swap_prev] = MOD+Shift+k +#bind[spawn_term] = MOD+Shift+Return +#bind[menu] = MOD+p +#bind[quit] = MOD+Shift+q +#bind[restart] = MOD+q +#bind[focus_main] = MOD+m +#bind[ws_1] = MOD+1 +#bind[ws_2] = MOD+2 +#bind[ws_3] = MOD+3 +#bind[ws_4] = MOD+4 +#bind[ws_5] = MOD+5 +#bind[ws_6] = MOD+6 +#bind[ws_7] = MOD+7 +#bind[ws_8] = MOD+8 +#bind[ws_9] = MOD+9 +#bind[ws_10] = MOD+0 +#bind[ws_next] = MOD+Right +#bind[ws_prev] = MOD+Left +#bind[screen_next] = MOD+Shift+Right +#bind[screen_prev] = MOD+Shift+Left +#bind[mvws_1] = MOD+Shift+1 +#bind[mvws_2] = MOD+Shift+2 +#bind[mvws_3] = MOD+Shift+3 +#bind[mvws_4] = MOD+Shift+4 +#bind[mvws_5] = MOD+Shift+5 +#bind[mvws_6] = MOD+Shift+6 +#bind[mvws_7] = MOD+Shift+7 +#bind[mvws_8] = MOD+Shift+8 +#bind[mvws_9] = MOD+Shift+9 +#bind[mvws_10] = MOD+Shift+0 +#bind[bar_toggle] = MOD+b +#bind[focus_next] = MOD+Tab +#bind[focus_prev] = MOD+Shift+Tab +#bind[wind_kill] = MOD+Shift+x +#bind[wind_del] = MOD+x +#bind[screenshot_all] = MOD+s +#bind[screenshot_wind] = MOD+Shift+s +#bind[float_toggle] = MOD+t +#bind[version] = MOD+Shift+v +#bind[lock] = MOD+Shift+Delete +#bind[initscr] = MOD+Shift+i +#bind[iconify] = MOD+w +#bind[uniconify] = MOD+Shift+w +#bind[raise_toggle] = MOD+Shift+r +#bind[button2] = MOD+v + +# quirks +# remove with: quirk[class:name] = NONE +#quirk[MPlayer:xv] = FLOAT + FULLSCREEN + FOCUSPREV +#quirk[OpenOffice.org 2.4:VCLSalFrame] = FLOAT +#quirk[OpenOffice.org 3.0:VCLSalFrame] = FLOAT +#quirk[OpenOffice.org 3.1:VCLSalFrame] = FLOAT +#quirk[Firefox-bin:firefox-bin] = TRANSSZ +#quirk[Firefox:Dialog] = FLOAT +quirk[Gimp:gimp] = FLOAT + ANYWHERE +quirk[trayer:panel] = FLOAT + ANYWHERE +quirk[stalonetray:stalonetray] = FLOAT + ANYWHERE +#quirk[XTerm:xterm] = XTERM_FONTADJ +#quirk[xine:Xine Window] = FLOAT + ANYWHERE +#quirk[Xitk:Xitk Combo] = FLOAT + ANYWHERE +#quirk[xine:xine Panel] = FLOAT + ANYWHERE +#quirk[Xitk:Xine Window] = FLOAT + ANYWHERE +#quirk[xine:xine Video Fullscreen Window] = FULLSCREEN + FLOAT +#quirk[pcb:pcb] = FLOAT + +# EXAMPLE: define firefox program and bind to key +# program[firefox] = firefox http://scrotwm.org/ +# bind[firefox] = MOD+f diff --git a/.vimrc b/vim/.vimrc similarity index 98% rename from .vimrc rename to vim/.vimrc index 1da212b..f850535 100644 --- a/.vimrc +++ b/vim/.vimrc @@ -42,7 +42,7 @@ set tabstop=2 " Number of spaces to use for tabs. set shiftwidth=2 " Number of spaces to autoindent. set softtabstop=2 " Number of spaces for a tab. set autoindent " Set autoindenting on. -" set smartindent " Automatically insert another level of indent when needed. +set smartindent " Automatically insert another level of indent when needed. " Set tab width to 4 spaces for python files autocmd FileType python setlocal expandtab shiftwidth=4 softtabstop=4 diff --git a/xmonad.desktop b/xmonad.desktop deleted file mode 100644 index e1cd69e..0000000 --- a/xmonad.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=XMonad/Gnome -Comment=Lightweight tiling window manager -Exec=gnome-session --session=xmonad -Icon=xmonad.png -Type=XSession -X-Ubuntu-Gettext-Domain=gnome-session-2.0 diff --git a/xmonad.session b/xmonad.session deleted file mode 100644 index b67643a..0000000 --- a/xmonad.session +++ /dev/null @@ -1,7 +0,0 @@ -[GNOME Session] -Name=Xmonad -Required=windowmanager;panel;filemanager; -Required-windowmanager=xmonad -Required-panel=gnome-panel -Required-filemanager=nautilus -DefaultApps=gnome-settings-daemon; diff --git a/.xmobarrc b/xmonad/.xmobarrc similarity index 100% rename from .xmobarrc rename to xmonad/.xmobarrc diff --git a/xmonad.hs b/xmonad/xmonad.hs similarity index 50% rename from xmonad.hs rename to xmonad/xmonad.hs index 66f00e4..489627f 100644 --- a/xmonad.hs +++ b/xmonad/xmonad.hs @@ -1,17 +1,16 @@ import XMonad -import XMonad.Config.Gnome import XMonad.Hooks.DynamicLog import XMonad.Hooks.ManageDocks import XMonad.Util.Run(spawnPipe) import System.IO - + main = do xmproc <- spawnPipe "/usr/bin/xmobar /home/mcrittenden/.xmobarrc" - xmonad $ gnomeConfig { - manageHook = manageDocks <+> manageHook defaultConfig, - layoutHook = avoidStruts $ layoutHook defaultConfig, - logHook = dynamicLogWithPP xmobarPP { - ppOutput = hPutStrLn xmproc, + xmonad $ defaultConfig { + manageHook = manageDocks <+> manageHook defaultConfig, + layoutHook = avoidStruts $ layoutHook defaultConfig, + logHook = dynamicLogWithPP xmobarPP { + ppOutput = hPutStrLn xmproc, ppTitle = xmobarColor "green" "" . shorten 50 } } diff --git a/xorg/.Xresources b/xorg/.Xresources new file mode 100644 index 0000000..90961eb --- /dev/null +++ b/xorg/.Xresources @@ -0,0 +1,35 @@ +! Molokai theme +xterm*background: #101010 +xterm*foreground: #d0d0d0 +xterm*cursorColor: #d0d0d0 +xterm*color0: #101010 +xterm*color1: #960050 +xterm*color2: #66aa11 +xterm*color3: #c47f2c +xterm*color4: #30309b +xterm*color5: #7e40a5 +xterm*color6: #3579a8 +xterm*color7: #9999aa +xterm*color8: #303030 +xterm*color9: #ff0090 +xterm*color10: #80ff00 +xterm*color11: #ffba68 +xterm*color12: #5f5fee +xterm*color13: #bb88dd +xterm*color14: #4eb4fa +xterm*color15: #d0d0d0 + +xterm*faceName: DejaVu Sans Mono:pixelsize=13 + +xterm*dynamicColors:true +xterm*utf8:2 +xterm*eightBitInput:true +xterm*saveLines:512 +xterm*scrollTtyKeypress:true +xterm*scrollTtyOutput:false +xterm*scrollBar:true +xterm*rightScrollBar:true +xterm*jumpScroll:true +xterm*multiScroll:true +xterm*toolBar:false + diff --git a/xorg/.xinitrc b/xorg/.xinitrc new file mode 100644 index 0000000..e59b5b8 --- /dev/null +++ b/xorg/.xinitrc @@ -0,0 +1,4 @@ +xmodmap ~/.xmodmaprc +xsetroot -cursor_name left_ptr +xrdb -merge ~/.Xresources +xmonad diff --git a/xorg/.xmodmaprc b/xorg/.xmodmaprc new file mode 100644 index 0000000..dc12776 --- /dev/null +++ b/xorg/.xmodmaprc @@ -0,0 +1,3 @@ +remove Lock = Caps_Lock +keysym Caps_Lock = Control_L +add Control = Control_L diff --git a/.zshrc b/zsh/.zshrc similarity index 94% rename from .zshrc rename to zsh/.zshrc index 0b89079..f38d44b 100644 --- a/.zshrc +++ b/zsh/.zshrc @@ -25,7 +25,7 @@ ZSH_THEME="flarp" # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git vi-mode django command-not-found pip) +plugins=(git vi-mode django pip) source $ZSH/oh-my-zsh.sh @@ -41,7 +41,7 @@ alias gpl='git pull' alias gcp='git cherry-pick' alias gl="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative" alias gcpn='git cherry-pick -n' -alias ack='ack-grep --literal --smart-case' +alias ack='ack --literal --smart-case' alias sch='scheme-r5rs' alias sshd='ssh mcrittenden@iade106lmp01.blackmesh.com -p 9567' alias sshp='ssh iade106@iade106lwb01.blackmesh.com -p 9567'