Mitch Tishmack hace 11 años
padre
commit
7640d18cae
Se han modificado 4 ficheros con 13 adiciones y 23 borrados
  1. +10
    -11
      Makefile
  2. +2
    -2
      common/.profile.d/20-functions.sh
  3. +1
    -10
      emacs/.emacs.d/emacs.org
  4. +0
    -0
      git/.gitconfig.d/50-http

+ 10
- 11
Makefile Ver fichero

@@ -5,32 +5,31 @@ STOWOPTS=-target $(HOME) -d $(PWD)
DOTGITCONFIG=~/.gitconfig DOTGITCONFIG=~/.gitconfig
DOTPROFILE=~/.profile 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): $(DOTGITCONFIG):
$(STOW) $(STOWOPTS) git
touch $(DOTGITCONFIG) touch $(DOTGITCONFIG)
$(DOTDEE) $(DOTGITCONFIG) $(DOTDEE) $(DOTGITCONFIG)


clean: clean:
$(STOW) $(STOWOPTS) -D mosh common emacs git ruby haskell perl tmux vim zsh osx $(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): $(DOTPROFILE):
$(STOW) $(STOWOPTS) common
touch $(DOTPROFILE) touch $(DOTPROFILE)
$(DOTDEE) $(DOTPROFILE) $(DOTDEE) $(DOTPROFILE)


common:
$(STOW) $(STOWOPTS) common

# Specific stows, nothing special
git:
$(STOW) $(STOWOPTS) git
git: $(DOTGITCONFIG)


emacs: emacs:
$(STOW) $(STOWOPTS) emacs # $@? $(STOW) $(STOWOPTS) emacs # $@?


+ 2
- 2
common/.profile.d/20-functions.sh Ver fichero

@@ -86,7 +86,7 @@ login_shell()
cconv() cconv()
{ {
curl -L --silent\ 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[>]||' | perl -pe 's|[<]\w+ \w+[=]\w+[>]||g;' -e 's|[<][/]span[>]||'
} }

+ 1
- 10
emacs/.emacs.d/emacs.org Ver fichero

@@ -573,12 +573,6 @@ Make git not ass to use. At least in emacs. magit is the best git interface... i
ad-do-it ad-do-it
(jump-to-register :magit-fullscreen))) (jump-to-register :magit-fullscreen)))
) )

(use-package magit-blame
:ensure magit
:ensure t
:commands (magit-blame-mode)
)
#+END_SRC #+END_SRC


*** workgroups2 *** workgroups2
@@ -993,6 +987,7 @@ Common mode defaults I think are sensible.
(hl-line-mode) (hl-line-mode)
(whitespace-mode) (whitespace-mode)
(visual-line-mode) (visual-line-mode)
(flyspell-prog-mode)
(custom-set-variables (custom-set-variables
'(indent-tabs-mode nil) '(indent-tabs-mode nil)
'(tab-width 2) '(tab-width 2)
@@ -1042,10 +1037,6 @@ TODO: fixme
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(add-hook 'python-mode-hook (add-hook 'python-mode-hook
'(lambda () '(lambda ()
(setq-default
tab-width 4
indent-tabs-mode t
python-indent-offset 4)
(flycheck-select-checker 'python-flake8) (flycheck-select-checker 'python-flake8)
(flycheck-select-checker 'python-pylint) (flycheck-select-checker 'python-pylint)
) )


git/.gitconfig.d/5-http → git/.gitconfig.d/50-http Ver fichero


Cargando…
Cancelar
Guardar