diff --git a/Makefile b/Makefile index 0e90fd6..4461bd6 100644 --- a/Makefile +++ b/Makefile @@ -5,32 +5,31 @@ STOWOPTS=-target $(HOME) -d $(PWD) DOTGITCONFIG=~/.gitconfig DOTPROFILE=~/.profile -.PHONY: mosh common emacs git ruby haskell perl tmux vim zsh list home osx linux ws nix +.PHONY: mosh common emacs git ruby haskell perl tmux vim zsh list osx linux ws nix -home: $(DOTGITCONFIG) $(DOTPROFILE) - $(DOTDEE) $(DOTPROFILE) +all: common -ws: common emacs nix mosh git ruby haskell perl tmux vim zsh home +common: $(DOTPROFILE) -all: home +ws: emacs nix mosh git ruby haskell perl tmux vim zsh common $(DOTGITCONFIG): + $(STOW) $(STOWOPTS) git touch $(DOTGITCONFIG) $(DOTDEE) $(DOTGITCONFIG) clean: $(STOW) $(STOWOPTS) -D mosh common emacs git ruby haskell perl tmux vim zsh osx + -rm $(DOTGITCONFIG) $(DOTPROFILE) + -rm -fr $(DOTCONFIG).d $(DOTPROFILE).d + -find $(PWD) -type f -name ".checksum" -exec rm {} \; $(DOTPROFILE): + $(STOW) $(STOWOPTS) common touch $(DOTPROFILE) $(DOTDEE) $(DOTPROFILE) -common: - $(STOW) $(STOWOPTS) common - -# Specific stows, nothing special -git: - $(STOW) $(STOWOPTS) git +git: $(DOTGITCONFIG) emacs: $(STOW) $(STOWOPTS) emacs # $@? diff --git a/common/.profile.d/20-functions.sh b/common/.profile.d/20-functions.sh index 0bc70ff..ccc74a0 100644 --- a/common/.profile.d/20-functions.sh +++ b/common/.profile.d/20-functions.sh @@ -86,7 +86,7 @@ login_shell() cconv() { curl -L --silent\ - "https://www.google.com/finance/converter?a=$1&from=$2&to=$3" - | grep converter_result\ + "https://www.google.com/finance/converter?a=$1&from=$2&to=$3" \ + | grep converter_result \ | perl -pe 's|[<]\w+ \w+[=]\w+[>]||g;' -e 's|[<][/]span[>]||' } diff --git a/emacs/.emacs.d/emacs.org b/emacs/.emacs.d/emacs.org index f2f58be..3329b0b 100644 --- a/emacs/.emacs.d/emacs.org +++ b/emacs/.emacs.d/emacs.org @@ -573,12 +573,6 @@ Make git not ass to use. At least in emacs. magit is the best git interface... i ad-do-it (jump-to-register :magit-fullscreen))) ) - - (use-package magit-blame - :ensure magit - :ensure t - :commands (magit-blame-mode) - ) #+END_SRC *** workgroups2 @@ -993,6 +987,7 @@ Common mode defaults I think are sensible. (hl-line-mode) (whitespace-mode) (visual-line-mode) + (flyspell-prog-mode) (custom-set-variables '(indent-tabs-mode nil) '(tab-width 2) @@ -1042,10 +1037,6 @@ TODO: fixme #+BEGIN_SRC emacs-lisp (add-hook 'python-mode-hook '(lambda () - (setq-default - tab-width 4 - indent-tabs-mode t - python-indent-offset 4) (flycheck-select-checker 'python-flake8) (flycheck-select-checker 'python-pylint) ) diff --git a/git/.gitconfig.d/5-http b/git/.gitconfig.d/50-http similarity index 100% rename from git/.gitconfig.d/5-http rename to git/.gitconfig.d/50-http