Update configs

- Fish gets autojump
- Spacemacs gets
  - Autocomplete
  - C#
  - Default shell is fish
  - Themes megapack
  - Updated spacemacs config for 0.104
  - C-;/C-: leader keys
  - Slightly larger default window size
  - - counts as part of a word as well for vim syntax table.

fish/config.fish

@@ -13,6 +13,12 @@ if test -e ~/.config/fish/local.fish
   source ~/.config/fish/local.fish
 end
 
+# ========
+# Autojump
+# ========
+
+[ -f /usr/local/share/autojump/autojump.fish ]; and . /usr/local/share/autojump/autojump.fish
+
 # =========
 # Functions
 # =========

spacemacs

@@ -11,19 +11,22 @@
           ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
           ;; <M-m f e R> (Emacs style) to install them.
           ;; ----------------------------------------------------------------
-          ;; auto-completion
+          auto-completion
           ;; better-defaults
           clojure
+          csharp
           (colors :variables
                   colors-enable-rainbow-identifiers t)
           emacs-lisp
           git
           ;; markdown
           org
-          shell
+          (shell :variables
+                 shell-default-term-shell "/usr/local/bin/fish")
           shell-scripts
           ruby
           ;; syntax-checking
+          themes-megapack
           version-control
           ))
 
@@ -33,6 +36,8 @@
     (add-to-list 'ttm-layers 'osx)))
 
   (setq-default
+   ;; Spacemacs distribution
+   dotspacemacs-distribution 'spacemacs
    ;; List of additional paths where to look for configuration layers.
    ;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
    dotspacemacs-configuration-layer-path '()
@@ -76,13 +81,8 @@ before layers configuration."
    ;; List of themes, the first of the list is loaded when spacemacs starts.
    ;; Press <SPC> T n to cycle to the next theme in the list (works great
    ;; with 2 themes variants, one dark and one light)
-   dotspacemacs-themes '(solarized-light
+   dotspacemacs-themes '(spacemacs-dark
-                         solarized-dark
+                         material)
-                         spacemacs-light
-                         spacemacs-dark
-                         leuven
-                         monokai
-                         zenburn)
    ;; If non nil the cursor color matches the state color.
    dotspacemacs-colorize-cursor-according-to-state t
    ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
@@ -95,12 +95,12 @@ before layers configuration."
    ;; The leader key
    dotspacemacs-leader-key "SPC"
    ;; The leader key accessible in `emacs state' and `insert state'
-   dotspacemacs-emacs-leader-key "C-x m"
+   dotspacemacs-emacs-leader-key "C-;"
    ;; Major mode leader key is a shortcut key which is the equivalent of
    ;; pressing `<leader> m`. Set it to `nil` to disable it.
    dotspacemacs-major-mode-leader-key ","
    ;; Major mode leader key accessible in `emacs state' and `insert state'
-   dotspacemacs-major-mode-emacs-leader-key "C-M-m"
+   dotspacemacs-major-mode-emacs-leader-key "C-:"
    ;; The command key used for Evil commands (ex-commands) and
    ;; Emacs commands (M-x).
    ;; By default the command key is `:' so ex-commands are executed like in Vim
@@ -167,8 +167,8 @@ before layers configuration."
    ruby-enable-ruby-on-rails-support t
    )
   ;; User initialization goes here
-  (add-to-list 'default-frame-alist '(height . 50))
+  (add-to-list 'default-frame-alist '(height . 60))
-  (add-to-list 'default-frame-alist '(width . 100))
+  (add-to-list 'default-frame-alist '(width . 115))
   )
 
 (defun dotspacemacs/config ()
@@ -178,6 +178,7 @@ layers configuration."
   (defadvice evil-inner-word (around underscore-as-word activate)
     (let ((table (copy-syntax-table (syntax-table))))
       (modify-syntax-entry ?_ "w" table)
+      (modify-syntax-entry ?- "w" table)
       (with-syntax-table table
         ad-do-it)))
   (evil-set-initial-state 'term-mode 'emacs)
@@ -199,11 +200,44 @@ layers configuration."
  '(ahs-idle-interval 0.25)
  '(ahs-idle-timer 0 t)
  '(ahs-inhibit-face-list nil)
+ '(ansi-color-faces-vector
+   [default bold shadow italic underline bold bold-italic bold])
+ '(ansi-color-names-vector
+   (vector "#ffffff" "#f36c60" "#8bc34a" "#fff59d" "#4dd0e1" "#b39ddb" "#81d4fa" "#263238"))
+ '(custom-safe-themes
+   (quote
+    ("614f8478963ec8caac8809931c9d00f670e4519388c02f71d9d27b66d5741a7f" default)))
+ '(fci-rule-color "#37474f" t)
+ '(hl-sexp-background-color "#1c1f26")
  '(ring-bell-function (quote ignore) t)
+ '(shell-pop-autocd-to-working-dir nil)
+ '(vc-annotate-background nil)
+ '(vc-annotate-color-map
+   (quote
+    ((20 . "#f36c60")
+     (40 . "#ff9800")
+     (60 . "#fff59d")
+     (80 . "#8bc34a")
+     (100 . "#81d4fa")
+     (120 . "#4dd0e1")
+     (140 . "#b39ddb")
+     (160 . "#f36c60")
+     (180 . "#ff9800")
+     (200 . "#fff59d")
+     (220 . "#8bc34a")
+     (240 . "#81d4fa")
+     (260 . "#4dd0e1")
+     (280 . "#b39ddb")
+     (300 . "#f36c60")
+     (320 . "#ff9800")
+     (340 . "#fff59d")
+     (360 . "#8bc34a"))))
+ '(vc-annotate-very-old-color nil)
  '(vc-follow-symlinks t))
 (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.
- )
+ '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil))))
+ '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))))