chore: reformat and remove some old stuff

README.md

@@ -12,7 +12,7 @@ The docs currently still live in [@caarlos0][caarlos-docs] repository.
 
 ## Some useful commands
 
-* `reload!`: reload your shell
+- `reload!`: reload your shell
 
 ## Why not a fork?
 

bin.symlink/delete-nix.sh

@@ -22,12 +22,12 @@ rm /Library/LaunchDaemons/org.nixos.darwin-store.plist
 
 echo "🧹 Remove the files created by nix"
 rm -rf \
-	/etc/nix /var/root/.nix-profile \
-	/var/root/.nix-defexpr \
-	/var/root/.nix-channels \
-	~/.nix-profile \
-	~/.nix-defexpr \
-	~/.nix-channels
+  /etc/nix /var/root/.nix-profile \
+  /var/root/.nix-defexpr \
+  /var/root/.nix-channels \
+  ~/.nix-profile \
+  ~/.nix-defexpr \
+  ~/.nix-channels
 
 echo "🛑 Remove the groups created by nix"
 dscl . delete /Groups/nixbld

git/install.sh

@@ -2,18 +2,12 @@
 
 # Don't ask ssh password all the time
 if [ "$(uname -s)" = "Darwin" ]; then
-	git config --global credential.helper osxkeychain
+  git config --global credential.helper osxkeychain
 else
-	git config --global credential.helper cache
+  git config --global credential.helper cache
 fi
 
 # better diffs
 if command -v diff-so-fancy >/dev/null 2>&1; then
-	git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
-fi
-
-# use vscode as mergetool
-if command -v code >/dev/null 2>&1; then
-	git config --global merge.tool vscode
-	git config --global mergetool.vscode.cmd "code --wait $MERGED"
+  git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
 fi

nixpkgs.symlink/vim/customization.nix

@@ -1,20 +1,34 @@
-{ pkgs }:
-
-let
+{pkgs}: let
   my_plugins = pkgs.callPackage ./plugins.nix {};
   vimConfig = {
     customRC = builtins.readFile ~/.vimrc;
     packages.knownPlugins = pkgs.vimPlugins // my_plugins; # optional
     packages.pluginDictionaries = [
       # load always
-      { names = [
-        "idris-vim" "UltiSnips" "vim-snippets"
-        "fugitive" "Solarized" "vim-airline"
-        "Syntastic" "vim-nix" "vim-dispatch"
-        "vim-dispatch-neovim" "vim-elixir"
-        "vim-projectionist" "vim-phoenix"
-        "vim-ledger" "vim-ruby"
-        "elm-vim" "gruvbox"
+      {
+        names = [
+          # Theme
+          #"Solarized" # Theme
+          "gruvbox" # Theme
+
+          # UI
+          "vim-airline"
+
+          # Tools
+          "fugitive" # Tpope git stuff
+          "UltiSnips" # Snippets
+          "vim-snippets" # Snippets
+          "vim-dispatch" # Async adapter by tpope
+          "vim-dispatch-neovim"
+          "vim-projectionist" # Project management
+          "Syntastic" # Syntax checking
+
+          # Lang
+          "vim-nix" #
+          "vim-elixir"
+          "vim-phoenix"
+          "vim-ledger"
+          "vim-ruby"
         ];
       }
       # only load when opening a .nix file
@@ -25,4 +39,7 @@ let
     ];
   };
 in
-  pkgs.neovim.override {vimAlias = true; configure = vimConfig;}
+  pkgs.neovim.override {
+    vimAlias = true;
+    configure = vimConfig;
+  }

nixpkgs.symlink/vim/plugins.nix

@@ -1,8 +1,9 @@
-{ pkgs, fetchgit }:
-let
+{
+  pkgs,
+  fetchgit,
+}: let
   buildVimPlugin = pkgs.vimUtils.buildVimPluginFrom2Nix;
 in {
-
   "vim-dispatch" = buildVimPlugin {
     name = "vim-dispatch";
     src = fetchgit {