Merge branch 'master' of git.blakenorth.net/home/git/dotfiles

.config/nvim/lua/blake/lsp.lua

@@ -167,7 +167,17 @@ M.cmp = function()
       formatting = {
          format = function(entry, vim_item)
             -- fancy icons and a name of kind
-            vim_item.kind = require("lspkind").presets.default[vim_item.kind] .. " " .. vim_item.kind
+            format = require('lspkind').cmp_format({
+               mode = 'symbol', -- show only symbol annotations
+               maxwidth = 50, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters)
+
+               -- The function below will be called before any actual modifications from lspkind
+               -- so that you can provide more controls on popup customization. (See [#30](https://github.com/onsails/lspkind-nvim/pull/30))
+               -- before = function (entry, vim_item)
+               --    ...
+               --    return vim_item
+               -- end
+            })
             -- set a name for each source
             vim_item.menu = ({
                path           = "[Path]",

.config/nvim/lua/blake/plugins.lua

@@ -134,6 +134,7 @@ return require('packer').startup({function()
       'simrat39/symbols-outline.nvim',
       config = function()
          vim.cmd 'command! SO SymbolsOutline'
+         vim.cmd 'nnoremap <Leader>so <cmd>SymbolsOutline<CR>'
       end,
    }
    use {                                           -- ALE: Support for lots of linters, etc

.config/shell/aliases

@@ -21,7 +21,7 @@ alias          \
    rd='rmdir'  \
 
 # opt for trash-cli over rm
-if command -v > /dev/null; then
+if command -v trash > /dev/null; then
    alias rm=trash
 fi
 

.config/shell/bin/ala

@@ -1,4 +0,0 @@
-#!/bin/bash
-# Runs zsh in alacritty. Good if you're put in some other terminal for some reason.
-
-nohup alacritty > /dev/null 2>&1 &

.config/shell/bin/mkswp

@@ -2,8 +2,14 @@
 
 # Makes a swapfile at /swapfile of a given size (ex: mkswp 4G)
 
-sudo fallocate -l "$1" /swapfile &&
-   sudo chmod 600 /swapfile
-sudo mkswap /swapfile &&
-   sudo swapon /swapfile
+if [ -d /swap ]; then
+   SWAPFILE=/swap/swapfile
+else
+   SWAPFILE=/swapfile
+fi
+
+sudo fallocate -l "$1" "$SWAPFILE" &&
+   sudo chmod 600 "$SWAPFILE"
+sudo mkswap "$SWAPFILE" &&
+   sudo swapon "$SWAPFILE"
 

.config/shell/bin/rmswp

@@ -1,6 +1,13 @@
 #!/bin/bash
 
 # Deletes the swapfile created by mkswp()
-sudo swapoff -v /swapfile
-sudo rm /swapfile
+
+if [ -d /swap ]; then
+   SWAPFILE=/swap/swapfile
+else
+   SWAPFILE=/swapfile
+fi
+
+sudo swapoff -v "$SWAPFILE"
+sudo rm "$SWAPFILE"
 

.config/shell/functions/ala

@@ -0,0 +1,9 @@
+#!/bin/bash
+# Re-open your shell in alacritty and exit the current shell. Good if you're
+# put in another terminal for some reason and you want alacritty.
+
+ala() {
+   nohup alacritty > /dev/null 2>&1 &
+   disown
+   exit
+}

.config/shell/profile

@@ -24,7 +24,7 @@ export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc"
 #export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs.
 export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
 export LESSHISTFILE="-"
-export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME/alsa/asoundrc"
+[ -f "$XDG_CONFIG_HOME/alsa/asoundrc" ] && export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME/alsa/asoundrc"
 # export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg"
 export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default"
 export KODI_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/kodi"

.gitconfig

@@ -11,6 +11,9 @@
 	email = blakelysnorth@gmail.com
 	name = PowerUser64
 
+[safe]
+	directory = /storage/emulated/0/docs
+
 [alias]
 	a = add
 	c = commit