Browse files

remove powerline arrows

  • Loading branch information...
1 parent 110324d commit 63c584fa14eed3ed15ef781cd4e3a0f5c3055afe @myfreeweb committed Mar 14, 2013
Showing with 57 additions and 52 deletions.
  1. +6 −0 .gitmodules
  2. +1 −5 README.md
  3. +9 −19 config.fish
  4. +27 −9 emacs
  5. +1 −0 emacs.d/nrepl
  6. +1 −0 emacs.d/paredit
  7. +0 −8 irbrc.rb
  8. +7 −3 lein/profiles.clj
  9. +3 −3 tmux.conf
  10. +1 −0 vim/autocmd.vim
  11. +1 −5 vim/vimrc
View
6 .gitmodules
@@ -64,3 +64,9 @@
[submodule "emacs.d/powerline"]
path = emacs.d/powerline
url = git://github.com/jonathanchu/emacs-powerline.git
+[submodule "emacs.d/nrepl"]
+ path = emacs.d/nrepl
+ url = git://github.com/kingtim/nrepl.el.git
+[submodule "emacs.d/paredit"]
+ path = emacs.d/paredit
+ url = git://github.com/emacsmirror/paredit.git
View
6 README.md
@@ -1,7 +1,5 @@
# myfreeweb/dotfiles
-![Screenshot](http://mfwb.us/e9NJ+)
-
## Installation
git submodule update --init --recursive
./install.sh
@@ -13,9 +11,7 @@ But are you really going to use all my dotfiles? No. You're not me. You should s
## The good parts
- git&hg alias system, one letter == one thing, like vi commands, but the object comes before the verb, which makes more sense for version control
-- extremely awesome `irb` (ruby), `python`, `lein` (clojure)
-- [powerline](https://github.com/Lokaltog/vim-powerline) in vim and a similar thing for tmux, stolen from [sjl/dotfiles](https://github.com/sjl/dotfiles/), but with keyboard layout instead of music and mail. cool if you're bilingual. customize `bin/keylayout` for your language if it's not russian.
-- powerline style also in fish and irb
+- awesome `irb` (ruby), `python`, `lein` (clojure)
- [Tarsnap](http://www.tarsnap.com/)-based backup script `bin/backup` and backup deletion script `bin/rmbackups`
- `bin/pinboard_html` writes my recent [Pinboard](http://pinboard.in) bookmarks to ~/.bookmarks.html, I add it to LaunchBar, I can search it
- solid, robust, UNIX-way mail configuration: mutt + offlineimap + msmtp + notmuch + urlview + `bin/addressbook` work together. like a boss!
View
28 config.fish
@@ -31,6 +31,7 @@ set PATH "/usr/local/share/npm/bin" $PATH
# Java
set -gx JAVA_HOME (/usr/libexec/java_home)
set PATH "$JAVA_HOME/bin" $PATH
+set -gx JRUBY_OPTS "-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify"
# Postgres
set PATH "/Applications/Postgres.app/Contents/MacOS/bin" $PATH
@@ -83,12 +84,6 @@ end
. $DOTFILES/ruby.fish
# Prompt {{{
-function p_arrow
- set_color $lastc --background=$argv[1]
- printf ''
- set_color white --background=$argv[1]
-end
-
function fish_prompt
set last_status $status
command fasd --proc (fasd --sanitize $1)
@@ -99,33 +94,28 @@ function fish_prompt
set -g lastc green
if git rev-parse --show-toplevel >/dev/null 2>&1
- p_arrow blue
+ set_color white --background=blue
printf ''
printf '%s ' (git branch --contains HEAD ^/dev/null | grep '*' | tr -s ' ' | cut -d ' ' -f2)
- set -g lastc blue
end
if [ -n "$VIRTUAL_ENV" ]
- p_arrow yellow
+ set_color white --background=yellow
printf ' %s ' (basename "$VIRTUAL_ENV")
- set -g lastc yellow
end
- if test -s $HOME/.rbenv/version
- p_arrow purple
- printf ' %s ' (cat $HOME/.rbenv/version)
- set -g lastc purple
- end
+# if test -s $HOME/.rbenv/version
+# set_color white --background=purple
+# printf ' %s ' (cat $HOME/.rbenv/version)
+# end
if test $last_status -ne 0
- p_arrow red
+ set_color white --background=red
printf ' %d ' $last_status
- set -g lastc red
end
- p_arrow normal
set_color normal
- printf ' '
+ printf '$ '
end
# }}}
View
36 emacs
@@ -15,10 +15,19 @@
;;; General settings
(fset 'yes-or-no-p 'y-or-n-p)
-(server-start t)
(cua-mode t)
(ido-mode t)
+(setq ido-create-new-buffer 'always
+ ido-enable-flex-matching t
+ ido-everywhere t
+ ido-ignore-buffers (append '(".*Completion" "*magit-process*" "*Pymacs*" "*Messages*") ido-ignore-buffers)
+ ido-ignore-extensions t
+ ido-confirm-unique-completion t
+ ido-max-directory-size 100500
+ ido-use-filename-at-point 'guess
+ ido-use-virtual-buffers t)
(show-paren-mode t)
+(global-hl-line-mode t)
(savehist-mode t)
(recentf-mode t)
(delete-selection-mode t)
@@ -28,6 +37,11 @@
(tooltip-mode -1))
(when (functionp 'tool-bar-mode)
(tool-bar-mode -1))
+(require 'uniquify)
+(setq uniquify-buffer-name-style 'forward
+ uniquify-separator "/"
+ uniquify-after-kill-buffer-p t
+ uniquify-ignore-buffers-re "^\\*")
(if (featurep window-system)
(modify-frame-parameters nil '((wait-for-wm . nil)))
(menu-bar-mode -1))
@@ -43,14 +57,6 @@
next-line-add-newlines t
tooltip-use-echo-area t
vc-handled-backends '()
- ido-create-new-buffer 'always
- ido-enable-flex-matching t
- ido-everywhere t
- ido-ignore-buffers (append '(".*Completion" "*magit-process*" "*Pymacs*" "*Messages*") ido-ignore-buffers)
- ido-ignore-extensions t
- ido-confirm-unique-completion t
- ido-max-directory-size 100500
- ido-use-filename-at-point 'guess
kill-buffer-query-functions (remq 'process-kill-buffer-query-function
kill-buffer-query-functions)
redisplay-dont-pause t)
@@ -115,6 +121,18 @@
(require 'color-theme-solarized)
(color-theme-initialize)
(color-theme-solarized-light)
+(setq color-theme-is-global t)
(addpath "clojure")
(require 'clojure-mode)
+
+(addpath "nrepl")
+(require 'nrepl)
+(add-hook 'nrepl-interaction-mode-hook 'nrepl-turn-on-eldoc-mode)
+(add-hook 'nrepl-mode-hook 'subword-mode)
+(setq nrepl-hide-special-buffers t)
+
+(addpath "paredit")
+(require 'paredit)
+(add-hook 'clojure-mode-hook 'paredit-mode)
+(add-hook 'nrepl-mode-hook 'paredit-mode)
1 emacs.d/nrepl
@@ -0,0 +1 @@
+Subproject commit d1f1e268ac4652f788871e5e872a3cda37654be5
1 emacs.d/paredit
@@ -0,0 +1 @@
+Subproject commit 8c5b5207bb30302504463372749b515c639d8f6a
View
8 irbrc.rb
@@ -45,14 +45,6 @@ def color(bg, fg)
IRB.conf[:USE_READLINE] = true
IRB.conf[:AUTO_INDENT] = true
-IRB.conf[:PROMPT][:CUSTOM] = {
- :PROMPT_N => "#{color :blue, :white}... #{color :default, :blue}\u2b80#{color :default, :default} ",
- :PROMPT_I => "#{color :blue, :white}irb #{color :default, :blue}\u2b80#{color :default, :default} ",
- :PROMPT_S => nil,
- :PROMPT_C => "#{color :blue, :white}... #{color :default, :blue}\u2b80#{color :default, :default} ",
- :RETURN => "#{color :default, :green}\u2b82#{color :green, :white} %s #{color :default, :default}\n"
-}
-IRB.conf[:PROMPT_MODE] = :CUSTOM
def IRB.reload
load __FILE__
View
10 lein/profiles.clj
@@ -1,10 +1,14 @@
-{:user {:dependencies [[clj-stacktrace "0.2.5"]]
+{:user {:dependencies [[clj-stacktrace "0.2.5"]
+ [slamhound "1.3.1"]]
:plugins [[lein-light "0.0.16"]
[lein-swank "1.4.5"]
[lein-pprint "1.1.1"]
[lein-clojars "0.9.1"]
- [lein-ring "0.7.5"]
- [lein-sub "0.2.4"]]}
+ [lein-localrepo "0.4.1"]
+ [lein-sub "0.2.4"]
+ [lein-kibit "0.0.8"]
+ [lein-immutant "0.17.1"]]
+ :aliases {"slamhound" ["run" "-m" "slam.hound"]}}
:injections [(let [orig (ns-resolve (doto 'clojure.stacktrace require)
'print-cause-trace)
new (ns-resolve (doto 'clj-stacktrace.repl require)
View
6 tmux.conf
@@ -56,10 +56,10 @@ set -g status-left ""
set -g status-fg white
set -g status-bg black
set -g status-interval 1
-set -g status-left "#[fg=black,bg=yellow,bold] #S #[fg=yellow,bg=cyan,nobold]⮀#[fg=white,bold] #(keylayout) #[bg=black,fg=cyan,nobold]⮀"
-set -g status-right "#[fg=white] %R %d %b #[fg=white,bg=black]⮂#[bg=white] #(~/Code/dotfiles/bin/battery/battery tmux) #[fg=black,bold] #h "
+set -g status-left "#[fg=black,bg=yellow,bold] #S #[bg=cyan,fg=white,bold] #(keylayout) "
+set -g status-right "#[fg=white] %R %d %b #(~/Code/dotfiles/bin/battery/battery tmux) #[bold] #h "
set -g window-status-format "#[fg=white,bg=black,nobold] #I #W "
-set -g window-status-current-format "#[fg=green,bg=black,nobold]⮂#[fg=black,bg=green,noreverse,bold] #I #[nobold]⮁#[bold] #W #[fg=green,bg=black,nobold]⮀"
+set -g window-status-current-format " #I #W"
# Stuff
set -g set-titles 1
View
1 vim/autocmd.vim
@@ -9,6 +9,7 @@ au BufRead,BufNewFile *.{md,markdown,mdown,mkd,mkdn,ronn} setf markdown
au BufRead,BufNewFile {SConstruct,SConscript,*.py} setf python.django
au BufRead,BufNewFile *.{nu,nujson},Nukefile setf nu
au BufRead,BufNewFile *.json setf javascript
+au BufRead,BufNewFile *.emblem setf slim
au BufRead,BufNewFile *.conf setf config
au BufRead,BufNewFile *.ledger setf ledger | comp ledger
au BufRead,BufNewFile *gitconfig setf gitconfig
View
6 vim/vimrc
@@ -91,13 +91,9 @@ source ~/.vim/autocmd.vim
let vimclojure#SplitPos='bottom'
let g:vimclojure#DynamicHighlighting=1
let g:SuperTabDefaultCompletionType='context'
-let g:Powerline_symbols='fancy'
let delimitMate_excluded_ft='clojure'
let g:flake8_ignore='E128'
-set background=light
-if $SOLARIZED == "dark"
- set background=dark
-endif
+set background=dark
colorscheme solarized
if filereadable(expand("~/.vimrc.local"))

0 comments on commit 63c584f

Please sign in to comment.