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

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

@@ -52,7 +52,7 @@ return require('packer').startup({function()
    use { -- tokyonight.nvim:           tokyonight theme
       'folke/tokyonight.nvim',
       config = function()
-         vim.g.tokyonight_style = "night"
+         -- vim.g.tokyonight_style = "night"
          vim.g.tokyonight_italic_functions = true
          vim.g.tokyonight_sidebars = { "nvimtree", "qf", "vista_kind", "terminal", "packer" }
          vim.cmd [[
@@ -105,9 +105,11 @@ return require('packer').startup({function()
    }
    use { -- rust-tools:                make nvim a better rust environment
       'simrat39/rust-tools.nvim',
+      requires = {
+         'mattn/webapi-vim',  -- allow :RustPlay
+      },
       config = function ()
          local rt = require("rust-tools")
-
          rt.setup({
             server = {
                on_attach = function(_, bufnr)
@@ -446,6 +448,12 @@ return require('packer').startup({function()
          require("which-key").setup()
       end,
    }
+   use { -- marks.nvim:                Show marks in sign column
+      'chentoast/marks.nvim',
+      config = function()
+         require('marks').setup()
+      end
+   }
    use { -- rhysd: clever-split:       split calculation based on pane dimensions - CS or CleverSplit
       'rhysd/clever-split.vim',
       config = function()

.config/nvim/lua/blake/settings.lua

@@ -58,13 +58,8 @@ command! QA qa
 command! Wqa wqa
 command! WQa wqa
 command! WQA wqa
-
-command! Set set
 ]]
 
--- Quit even if there are more files to edit (files passed from the command line)
-vim.cmd 'au QuitPre * args %'
-
 -- Go to previous file, but faster
 vim.cmd 'command! P previous'
 
@@ -115,7 +110,7 @@ vim.cmd 'let g:markdown_fenced_languages = [ "bash=sh", "javascript", "cpp=cpp",
 
 --- autocmd's ---
 -- Set comment strings
-vim.cmd 'autocmd FileType crontab set commentstring=#%s'
+vim.cmd 'autocmd FileType crontab setlocal commentstring=#%s'
 -- vim.cmd 'autocmd FileType rmd set commentstring=<!--\\ %s\\ -->'
 
 -- Enable linewrap in markdown files

.config/shell/aliases

@@ -80,6 +80,11 @@ alias sdn='shutdown now'
 # open a new session called 0, but if there is already a session called 0, connect to it
 alias tm='tmux new -As0'
 
+# *sigh*...
+alias \
+   cd-='cd -' \
+   -='cd -'
+
 # List available X displays. Useful for finding what display to export when connected over ssh.
 alias lsx='ls /tmp/.X11-unix | tr "X" ":"'