Update shebang to use /usr/bin/env.

6 files changed, 31 insertions, 15 deletions

diff --git a/bin/brightness.sh b/bin/brightness.sh
index 7a2107d..5cedc62 100755
--- a/bin/brightness.sh
+++ b/bin/brightness.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 readonly XBACKLIGHT=xbacklight
 
 current_level=$($XBACKLIGHT)
diff --git a/bin/dmenu_run.sh b/bin/dmenu_run.sh
index 9255d07..affa2af 100755
--- a/bin/dmenu_run.sh
+++ b/bin/dmenu_run.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 PATH=$HOME/dotfiles/bin:$HOME/bin:$PATH dmenu_run -fn -*-*-*-*-*-*-20-*-*-*-*-*-*-* "$@"
 
diff --git a/bin/kj-setup.sh b/bin/kj-setup.sh
index a5a91ad..f3ddc6b 100755
--- a/bin/kj-setup.sh
+++ b/bin/kj-setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 red='\e[0;31m'
 orange='\e[0;33m'
@@ -65,14 +65,15 @@ fi
 mkdir -p .ssh
 create_symlink ../dotfiles/ssh/config .ssh/config
 
-if which i3 >/dev/null; then
-  mkdir -p .i3
-  create_symlink ../dotfiles/i3/config .i3/config
-  create_symlink dotfiles/i3status.conf .i3status.conf
-  create_symlink dotfiles/i3blocks.conf .i3blocks.conf
-else
-  printf "${orange}[SKIPPED]${none} i3 not installed.\n"
-fi
+mkdir -p .xmonad
+create_symlink ../dotfiles/xmonad/xmonad.hs .xmonad/xmonad.hs
+create_symlink ../dotfiles/xmonad/xmobar.hs .xmonad/xmobar.hs
+create_symlink dotfiles/xsession .xsession
+
+mkdir -p .i3
+create_symlink ../dotfiles/i3/config .i3/config
+create_symlink dotfiles/i3status.conf .i3status.conf
+create_symlink dotfiles/i3blocks.conf .i3blocks.conf
 
 create_symlink dotfiles/vimrc .vimrc
 if [[ -e .vim/bundle/Vundle.vim ]]; then
diff --git a/bin/pb b/bin/pb
index 2145552..21b9021 100755
--- a/bin/pb
+++ b/bin/pb
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 curl -F c=@- https://ptpb.pw/
diff --git a/spacemacs b/spacemacs
index 21848b3..acb8467 100644
--- a/spacemacs
+++ b/spacemacs
@@ -34,7 +34,8 @@ values."
      javascript
      markdown
      haskell
-     ;; git
+     git
+     rust
      markdown
      org
      ;; (shell :variables
@@ -221,8 +222,8 @@ user code."
   (evil-leader/set-key "ot"
     (lambda () (interactive) (org-capture nil "t")))
 
-  (evil-leader/set-key-for-mode
-    'org-mode "mh" 'org-up-element)
+  ;; (evil-leader/set-key-for-mode
+  ;;   'org-mode "mh" 'org-up-element)
   )
 
 (defun kj-org-config ()
@@ -251,3 +252,17 @@ layers configuration. You are free to put any user code."
   (kj-org-config)
   (load-file "~/.spacemacs.local")
   )
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; 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
+    (toml-mode racer rust-mode smeargle orgit magit-gitflow helm-gitignore request gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger evil-magit magit magit-popup git-commit with-editor xterm-color ws-butler window-numbering web-mode web-beautify volatile-highlights vi-tilde-fringe toc-org tern tagedit spacemacs-theme spaceline powerline smooth-scrolling slim-mode shm shell-pop scss-mode sass-mode restart-emacs rainbow-delimiters popwin persp-mode pcre2el paradox hydra spinner page-break-lines org-repo-todo org-present org-pomodoro alert log4e gntp org-plus-contrib org-bullets open-junk-file nyan-mode neotree multi-term move-text mmm-mode markdown-toc markdown-mode macrostep lorem-ipsum linum-relative leuven-theme less-css-mode json-mode json-snatcher json-reformat js2-refactor multiple-cursors s js2-mode js-doc jade-mode info+ indent-guide ido-vertical-mode hungry-delete htmlize hl-todo hindent highlight-parentheses highlight-numbers parent-mode highlight-indentation help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flyspell helm-flx helm-descbinds helm-css-scss helm-ag haskell-snippets yasnippet haml-mode google-translate golden-ratio gnuplot ghc haskell-mode gh-md flx-ido flx fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar 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-args evil-anzu anzu eval-sexp-fu highlight eshell-prompt-extras esh-help emmet-mode elisp-slime-nav disaster define-word coffee-mode cmm-mode cmake-mode clean-aindent-mode clang-format buffer-move bracketed-paste auto-highlight-symbol auto-dictionary auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async quelpa package-build use-package which-key bind-key bind-map evil monokai-theme))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ )
diff --git a/zgen b/zgen
-Subproject 3a0f26ed2f2d0b7b2f34fa5bac3c3a58d58cfc5
+Subproject 09f542515e20ac655a4aa429cf9604fe698ccf4