Merge branch 'master' of https://gitlab.com/fschl/dotfiles

* 'master' of https://gitlab.com/fschl/dotfiles:
  some small fixes
  update README
  move gopath to .path to activate on non-interactive shells
  add spacemacs

.bashrc

@@ -114,7 +114,3 @@ if ! shopt -oq posix; then
         . /etc/bash_completion
     fi
 fi
-
-export GOROOT=/usr/local/go
-export GOPATH=/home/fschl/projects/go
-export PATH=${PATH}:${GOROOT}/bin:${GOPATH}/bin

.path

@@ -0,0 +1,4 @@
+
+#export GOROOT=/usr/local/go/bin
+export GOPATH=/home/fschl/projects/go_projects
+export PATH=${PATH}:/usr/local/go/bin:${GOPATH}/bin

.spacemacs

@@ -36,34 +36,33 @@ values."
      ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
      ;; <M-m f e R> (Emacs style) to install them.
      ;; ----------------------------------------------------------------
-     yaml
-     python
-     shell-scripts
-     go
-     bibtex
-     graphviz
-     helm
      ;; auto-completion
      better-defaults
+     bibtex
+     docker
      emacs-lisp
      git
+     go
+     graphviz
+     helm
      markdown
      org
+     python
      shell
-     ;; (shell :variables
+     shell-scripts
-     ;;        shell-default-height 30
-     ;;        shell-default-position 'bottom)
      spell-checking
      syntax-checking
      version-control
-     dockerfile
+     yaml
+     ;; (shell :variables
+     ;;        shell-default-height 30
+     ;;        shell-default-position 'bottom)
      )
    ;; List of additional packages that will be installed without being
    ;; wrapped in a layer. If you need some configuration for these
    ;; packages, then consider creating a layer. You can also put the
    ;; configuration in `dotspacemacs/user-config'.
-   dotspacemacs-additional-packages '(
+   dotspacemacs-additional-packages '()
-                                      dockerfile)
    ;; A list of packages that cannot be updated.
    dotspacemacs-frozen-packages '()
    ;; A list of packages that will not be installed and loaded.
@@ -329,7 +328,7 @@ you should place your code here."
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (xterm-color shell-pop multi-term eshell-z eshell-prompt-extras esh-help git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter diff-hl org-ref pdf-tools key-chord ivy tablist insert-shebang helm-bibtex parsebib graphviz-dot-mode go-guru go-eldoc go-mode fish-mode biblio biblio-core unfill mwim yaml-mode yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode dash-functional helm-pydoc cython-mode anaconda-mode pythonic docker-tramp smeargle orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mmm-mode markdown-toc markdown-mode magit-gitflow htmlize helm-gitignore gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck evil-magit magit magit-popup git-commit ghub treepy let-alist graphql with-editor auto-dictionary ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))))
+    (dockerfile-mode docker json-mode json-snatcher json-reformat xterm-color shell-pop multi-term eshell-z eshell-prompt-extras esh-help git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter diff-hl org-ref pdf-tools key-chord ivy tablist insert-shebang helm-bibtex parsebib graphviz-dot-mode go-guru go-eldoc go-mode fish-mode biblio biblio-core unfill mwim yaml-mode yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode dash-functional helm-pydoc cython-mode anaconda-mode pythonic docker-tramp smeargle orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mmm-mode markdown-toc markdown-mode magit-gitflow htmlize helm-gitignore gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck evil-magit magit magit-popup git-commit ghub treepy let-alist graphql with-editor auto-dictionary ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

README.org

@@ -68,7 +68,7 @@
 
 **** Managing logins & passphrases
 
-     - use a secure, cross-platform, _locale_ password manager, e.g keepass2
+     - use a secure, cross-platform, *cloudless* password manager, e.g keepass2
 
 **** Backup Secure Keys
 
@@ -91,8 +91,23 @@
 
      Solution: multi-boot!
 
-** TODO
+**** thumb drive setup
+
+     3 partitions: boot+isos, luks encrypted, unencrypted partition for non-sensitive data
+
+**** building kali linux iso [0/7]
+
+     - [ ] https://docs.kali.org/downloading/kali-linux-live-usb-install
+     - [ ] add encrypted persistence https://docs.kali.org/downloading/kali-linux-live-usb-persistence
+     - [ ] add kali meta packages https://www.kali.org/news/kali-linux-metapackages/
+     - [ ] https://docs.kali.org/development/live-build-a-custom-kali-iso
+     - [ ] customize live image contents https://live-team.pages.debian.net/live-manual/html/live-manual/customizing-contents.en.html#517
+     - [ ] add LUKS Nuke support https://www.kali.org/tutorials/nuke-kali-linux-luks/
+     - [ ] OPTIONAL add PowerShell https://www.kali.org/tutorials/installing-powershell-on-kali-linux/
+
+** TODO [0/4]
 
    - [ ] explain setup, ideas, practises
-   - [ ] add HOW-TO
+   - [ ] add HOWTO
    - [ ] seperate sources.list setup for server/desktop/laptop
+   - [ ] move to ansible for easier modularization of setup

scripts/backup.sh

@@ -23,7 +23,6 @@ files=( ".android"
         ".gradle"
         ".bash_history"
         ".Clion2016.3"
-        ".revive.el"
       )
 
 main() {

scripts/install.sh

@@ -175,7 +175,7 @@ install_i3() {
         i3 \
         i3lock \
         i3status \
-        keepass2 \
+        keepass2/stable \
         pulseaudio \
         rxvt-unicode-256color \
         scrot \