Merge branch 'master' of git.framasoft.org:mpo/dotfiles

.gitmodules

@@ -25,3 +25,9 @@
 [submodule "vim/.vim/bundle/vim-colors-solarized"]
 	path = vim/.vim/bundle/vim-colors-solarized
 	url = https://github.com/altercation/vim-colors-solarized.git
+[submodule "vim/.vim/bundle/vim-nix"]
+	path = vim/.vim/bundle/vim-nix
+	url = https://github.com/LnL7/vim-nix.git
+[submodule "vim/.vim/bundle/elm.vim"]
+	path = vim/.vim/bundle/elm.vim
+	url = https://github.com/lambdatoast/elm.vim.git

emacs/.spacemacs

@@ -18,6 +18,8 @@ values."
    ;; of a list then all discovered layers will be installed.
    dotspacemacs-configuration-layers
    '(
+     html
+     ;; javascript
      ;; ----------------------------------------------------------------
      ;; Example of useful layers you may want to use right away.
      ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
@@ -243,8 +245,8 @@ executes.
  This function is mostly useful for variables that need to be set
 before packages are loaded. If you are unsure, you should try in setting them in
 `dotspacemacs/user-config' first."
-  (setq-default dotspacemacs-default-font '("Fantasque Sans Mono"
+  (setq-default dotspacemacs-default-font '("Fira Code Retina"
-                                            :size 16
+                                            :size 14
                                             :weight normal
                                             :width normal
                                             :powerline-scale 1.1))
@@ -269,7 +271,7 @@ This function is called at the very end of Spacemacs initialization after
 layers configuration.
 This is the place where most of your configurations should be done. Unless it is
 explicitly specified that a variable should be set before a package is loaded,
-you should place you code here."
+you should place your code here."
   (setq powerline-default-separator 'bar)
 
   ;; About ORG mode
@@ -297,7 +299,9 @@ you should place you code here."
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(package-selected-packages
+   (quote
+    (web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor yasnippet multiple-cursors js2-mode js-doc coffee-mode pcache hide-comnt uuidgen caml spinner org-projectile org org-download link-hint parent-mode epl request gitignore-mode git-link flx eyebrowse evil-visual-mark-mode evil-unimpaired magit-popup evil-ediff anzu undo-tree highlight dumb-jump f diminish column-enforce-mode bind-map bind-key packed dash avy popup async ws-butler spacemacs-theme spaceline persp-mode org-plus-contrib open-junk-file neotree leuven-theme indent-guide help-fns+ helm-themes helm-projectile helm-descbinds helm-ag google-translate evil-surround evil-search-highlight-persist evil-mc evil-matchit evil-iedit-state iedit auctex-latexmk auctex ace-link ace-jump-helm-line smartparens projectile helm helm-core markdown-mode s alert magit git-commit with-editor hydra package-build which-key evil window-numbering volatile-highlights vi-tilde-fringe utop use-package tuareg toc-org smooth-scrolling smeargle restart-emacs rainbow-delimiters quelpa powerline popwin pkg-info pcre2el paradox page-break-lines orgit org-repo-todo org-present org-pomodoro org-bullets ocp-indent move-text mmm-mode merlin markdown-toc magit-gitflow macrostep lorem-ipsum log4e linum-relative info+ ido-vertical-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-swoop helm-mode-manager helm-make helm-gitignore helm-flx goto-chg golden-ratio gnuplot gntp gitconfig-mode gitattributes-mode git-timemachine git-messenger gh-md flx-ido fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-numbers evil-nerd-commenter evil-magit evil-lisp-state evil-indent-plus evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu elisp-slime-nav define-word color-theme-sanityinc-solarized clean-aindent-mode buffer-move bracketed-paste auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

scripts/prefix/bin/vpn

@@ -1,10 +1,12 @@
 #!/bin/sh
-sudo systemctl stop openvpn-client@DeathStar.service
+PROFILE=$(hostname)
+
+sudo systemctl stop openvpn-client@$PROFILE.service
 
 if [[ $1 = "on" ]]
 then
-  sudo systemctl start openvpn-client@DeathStar.service
+  sudo systemctl start openvpn-client@$PROFILE.service
-  echo "VPN started"
+  echo "$PROFILE started"
 else
   echo "All stopped."
 fi

vim/.vim/bundle/VOoM

@@ -1 +1 @@
-Subproject commit 4a26ad12d4c4030bd6a1bffaed980e60e348251a
+Subproject commit 68e1137061c7e97aa920d58a9eded5635675d1a1

vim/.vim/bundle/elm.vim

@@ -0,0 +1 @@
+Subproject commit 04df290781f8a8a9a800e568262e0f2a077f503e

vim/.vim/bundle/vim-better-whitespace

@@ -1 +1 @@
-Subproject commit 7b3889cd072847f952211693f9aaf0c4ccede0a4
+Subproject commit 7729bada7ad8d341b910367da8a900490bd15e86

vim/.vim/bundle/vim-fugitive

@@ -1 +1 @@
-Subproject commit 58ed86e434951319ff7d438fb1096f24a51e6458
+Subproject commit f44845e4408aae03e018e98afb7fbf0c2ee87dd5

vim/.vim/bundle/vim-nix

@@ -0,0 +1 @@
+Subproject commit b06cccd8ff61149b13d3fc8b7e0d06caa55c9888

vim/.vim/bundle/vim-systemd-syntax

@@ -1 +1 @@
-Subproject commit 3e8c31052cb2daf5ef7e42afe024b8ffd7e643e2
+Subproject commit 36e8a13a778d3fc4dcb51ad148ccb7605dab487b

vim/.vim/bundle/vimtex

@@ -1 +1 @@
-Subproject commit c1dabd446f2419d20d2a79e16b7abbba3d51ed82
+Subproject commit de61b31cf89b6fd4653dc812d779abcf21ed33d0

zsh/.zshrc

@@ -5,6 +5,7 @@ export ZSH=$HOME/.oh-my-zsh
 plugins=(git systemd)
 
 ZSH_THEME="zhann"
+DISABLE_AUTO_UPDATE="true"
 source $ZSH/oh-my-zsh.sh
 
 export EDITOR='vim'