Permalink
Browse files

Pending minor adjustments.

  • Loading branch information...
1 parent f33783f commit 77b4cddb253df4319b28877c18492189cf8804bd @sbellef committed Oct 14, 2011
Showing with 105 additions and 12 deletions.
  1. +30 −2 _zshrc
  2. +17 −0 emacs/cfg/general-config.el
  3. +19 −2 emacs/cfg/ui-config.el
  4. +39 −8 pkglist
View
32 _zshrc
@@ -34,9 +34,33 @@ zstyle ':completion:*:manuals.(^1*)' insert-sections true
zstyle ':completion:*' menu select
zstyle ':completion:*' verbose yes
+# Prompt with VCS info
+
+autoload -Uz vcs_info
+
+zstyle ':vcs_info:*' stagedstr '%F{28}♦'
+zstyle ':vcs_info:*' unstagedstr '%F{11}♦'
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:*' enable git svn
+precmd () {
+ if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
+ zstyle ':vcs_info:*' formats ' [%F{green}%b%c%u%F{blue}]'
+ } else {
+ zstyle ':vcs_info:*' formats ' [%F{green}%b%c%u%F{red}♦%F{blue}]'
+ }
+
+ vcs_info
+}
+
+setopt prompt_subst # Enables additional prompt extentions
+autoload -U colors && colors # Enables colours
+
+export PROMPT='%F{green}%m:%~:%h> %F{white}'
+export RPROMPT='%F{white}%F{blue}${vcs_info_msg_0_}'
# Prompt
-export PS1="%m:%~:%h> "
+#export PS1="%m:%~:%h> "
# TODO Need to look into how to add my git branch and 'dirtyness' in
# the prompt. See https://github.com/jcorbin/zsh-git. I want something
@@ -58,9 +82,13 @@ alias la='ls -alF'
alias vi='vim'
alias e='emacsclient -t'
alias top='htop'
-alias pacman='pacman-color'
alias pd='pushd'
+# pacman related
+alias pacman='pacman-color'
+alias syu='sudo pacman -Syu'
+alias scc='sudo pacman -Scc'
+
# git aliases (copied from Mr.Oneliner http://www.catonmat.net/blog/git-aliases)
alias gp='git push'
alias gb='git branch'
@@ -103,6 +103,23 @@
;; ==========================================================
+;; File/directory name insertion
+;; ==========================================================
+
+;; Originally from http://stackoverflow.com/questions/5129476/emacs-in-place-filename-path-insertion
+
+(defun insert-file-name (file)
+ (interactive "F")
+ (insert file))
+
+(defun insert-dir-name (dir)
+ (interactive "D")
+ (insert dir))
+
+(global-set-key (kbd "C-c i f") 'insert-file-name)
+(global-set-key (kbd "C-c i d") 'insert-dir-name)
+
+;; ==========================================================
;; VisualBookmarks (experimenting...)
;; ==========================================================
View
@@ -12,6 +12,9 @@
(global-hl-line-mode t)
(show-paren-mode t)
+; [experimental] per
+; http://www.masteringemacs.org/articles/2011/10/02/improving-performance-emacs-display-engine/
+(setq redisplay-dont-pause t)
;; ==========================================================
;; Color theme
@@ -51,8 +54,6 @@
(add-my-pkg-to-loadpath "smex")
(require 'smex)
(smex-initialize)
-
-; Bind some keys:
(global-set-key (kbd "M-x") 'smex)
(global-set-key (kbd "M-X") 'smex-major-mode-commands)
@@ -70,3 +71,19 @@
(autoload 'idomenu "idomenu" nil t)
(global-set-key (kbd "C-'") 'idomenu)
+;; ==========================================================
+;; Full screen (experimental)
+;; (per http://www.emacswiki.org/emacs/FullScreen)
+;; ==========================================================
+
+;; Is this really better than using my windows manager's full screen mode?
+
+(defun toggle-fullscreen (&optional f)
+ (interactive)
+ (let ((current-value (frame-parameter nil 'fullscreen)))
+ (set-frame-parameter nil 'fullscreen
+ (if (equal 'fullboth current-value)
+ (if (boundp 'old-fullscreen) old-fullscreen nil)
+ (progn (setq old-fullscreen current-value)
+ 'fullboth)))))
+(global-set-key [f11] 'toggle-fullscreen)
View
47 pkglist
@@ -6,12 +6,13 @@ acl
acpitool
alsa-oss
alsa-utils
+anki
archlinux-themes-slim
-aria2
artwiz-fonts
asciidoc
aspell-en
aspell-fr
+astyle
attr
audacity
aurvote
@@ -25,10 +26,15 @@ binutils
bison
bzip2
chromium
+clang
+clang-analyzer
+coffee-script
coreutils
cpio
cracklib
cryptsetup
+ctags
+darktable
dash
db
dbus-core
@@ -48,6 +54,7 @@ easytag
ed
emacs
erlang
+fakeroot
feh
file
filesystem
@@ -56,9 +63,11 @@ firefox
flashplugin-square
flex
fop
+freemind
gawk
gcc
gcc-libs
+gdb
gdbm
gen-init-cpio
gettext
@@ -67,7 +76,8 @@ gimp-ufraw
git
gksu
glibc
-gnome-power-manager
+google-talkplugin
+gphoto2
graphviz
grep
groff
@@ -76,20 +86,26 @@ gstreamer0.10-bad
gstreamer0.10-ffmpeg
gstreamer0.10-good
gstreamer0.10-good-plugins
+gvfs-gphoto2
gzip
hal
hdparm
heirloom-mailx
htop
hugin
+ibus
+ibus-anthy
+ibus-el
+ibus-m17n
+ibus-qt
+icedtea-web
ifplugd
inetutils
initscripts
iputils
jfsutils
-jre
kbd
-kernel26
+kdeedu-ktouch
kipi-plugins
less
libarchive
@@ -112,11 +128,14 @@ libreoffice-extension-report-builder
libreoffice-extension-typo
libreoffice-extension-watch-window
libreoffice-extension-wiki-publisher
+libreoffice-impress
libreoffice-sdk
+libreoffice-writer
libsynaptics
libtool
libusb
licenses
+linux
linux-api-headers
linux-firmware
logrotate
@@ -142,6 +161,7 @@ net-tools
nmap
notification-daemon
ntfs-3g
+openjdk6
openntpd
openssh
opera
@@ -157,6 +177,7 @@ pciutils
pcmciautils
pcre
perl
+photivo-hg
pidgin
pkg-config
popt
@@ -168,18 +189,20 @@ procps
psmisc
python-notify
python-pygments
+rawstudio
+rawtherapee
readline
recordmydesktop
reiserfsprogs
rp-pppoe
+ruby
rxvt-unicode
-scim
-scim-anthy
scrot
sdparm
sed
shadow
skype
+skype-call-recorder
slim
slim-themes
slock
@@ -208,9 +231,7 @@ texlive-plainextra
texlive-pstricks
texlive-publishers
texlive-science
-tig
tk
-trayer
ttf-bitstream-vera
ttf-dejavu
ttf-inconsolata
@@ -221,6 +242,7 @@ unrar
unzip
usbutils
util-linux
+valgrind
vi
vim
virtualbox
@@ -259,8 +281,17 @@ yaws
zip
zlib
zsh
+coffee-script
dropbox
+esound
flashplugin-square
+gen-init-cpio
+google-talkplugin
+hal
+hal-info
+ibus-el
otf-ipafont
otf-takao
+photivo-hg
+tcp_wrappers
ttf-ms-fonts

0 comments on commit 77b4cdd

Please sign in to comment.