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

.config/nvim/lua/other.lua

@@ -51,7 +51,7 @@ M.toggleterm = function()
             return vim.o.columns * 0.4
          end
       end,
-      open_mapping = [[<c-\>]],
+      open_mapping = [[<F12>]],
       hide_numbers = true, -- hide the number column in toggleterm buffers
       shade_filetypes = {},
       shade_terminals = true,
@@ -69,8 +69,8 @@ M.toggleterm = function()
          -- the 'curved' border is a custom border type
          -- not natively supported but implemented in this plugin.
          border = 'curved', -- single, double, shadow, or curved
-         width = 120,
-         height = 32,
+         width = 200,
+         height = 50,
          winblend = 10, -- transparancy
          highlights = {
             border = "Normal",

.config/nvim/lua/plugins.lua

@@ -104,7 +104,7 @@ return require('packer').startup(function()
    }
    use {                                           -- ALE: Support for lots of linters, etc
       'dense-analysis/ale',
-      ft = {'sh', 'zsh', 'bash', 'cmake', 'html', 'markdown', 'racket', 'vim', 'tex'},
+      ft = {'sh', 'zsh', 'bash', 'html', 'markdown', 'racket', 'vim', 'tex'},
       config = function()
          vim.g.ale_disable_lsp = 1
       end

.config/nvim/lua/settings.lua

@@ -81,7 +81,21 @@ vim.cmd [[
    vnoremap J :m '>+1<CR>gv=gv
    vnoremap K :m '<-2<CR>gv=gv
 
-colorscheme slate
+  " Make vim a hex editor
+  " Edit *.bin files as binaries rather than text files (if your file isn't a .bin,
+  " make a symlink that points to it with the .bin extension and edit the symlink ;)
+	augroup Binary
+	   au!
+	   au BufReadPre  *.bin let &bin=1
+	   au BufReadPost *.bin if &bin | %!xxd
+	   au BufReadPost *.bin set ft=xxd | endif
+	   au BufWritePre *.bin if &bin | %!xxd -r
+	   au BufWritePre *.bin endif
+	   au BufWritePost *.bin if &bin | %!xxd
+	   au BufWritePost *.bin set nomod | endif
+	augroup END
+
+   colorscheme slate
 ]]
 
 vim.cmd [[

.zshrc

@@ -62,8 +62,10 @@
 
    # Git aliases
    alias \
-      gst='git status' \
       gc='git commit' \
+      gca='git commit -a' \
+      gst='git status' \
+      gp='git push' \
 
    # <<<
    ## Program improvements (ex: ls = ls -h) >>>