Merge branch 'master' of git.sr.ht:~hedy/dotfiles

.config/nvim/ftplugin/html.vim

@@ -1,4 +1,3 @@
-" HTML indentation... hmm
-
-set tabstop=2
-set shiftwidth=2
+setl tabstop=2
+setl shiftwidth=2
+setl softtabstop=2

.config/nvim/lua/lsp.lua

@@ -70,19 +70,25 @@ for _, lsp in pairs(servers) do
   }
 end
 -- pipx install python-lsp-server
+-- ~/.local/pipx/venvs/python-lsp-server/bin/python3 -m pip install python-lsp-black pylsp-mypy python-lsp-ruff
+-- Add additional symlinks!
 lspconfig.pylsp.setup{
   on_attach = on_attach,
   capabilities = capabilities,
   settings = {
-    formatCommand = {"black"},
+    -- formatCommand = {"black"},
     pylsp = {
       plugins = {
         pylint = { enabled = true },
         black = { enabled = true },
-        pyls_mypy = {
+        pylsp_mypy = {
           enabled = true,
           live_mode = true,
         },
+        ruff = {
+          enabled = true,
+          extendSelect = { "I" },
+        },
       },
     }
   }

.config/nvim/mappings.vim

@@ -81,7 +81,13 @@ nnoremap <leader>tp :tabprev<cr>
 " === Misc Mappings ===
 " Hooray for neovim :)))))
 " Terminal mappings
-noremap <C-`> :split term://fish<cr>i
+if has('macunix')
+  " WTF?? (I checked using C-v in insert mode)
+  " TODO: Fix in tmux
+  noremap <C-@> :split term://fish<cr>i
+else
+  noremap <C-`> :split term://fish<cr>i
+endif
 " LOL!
 nnoremap <leader>t :echom 'Deprecated. Please use C-` instead'<cr>
 tnoremap <Esc> <C-\><C-n>

.config/nvim/plugins.vim

@@ -42,6 +42,7 @@ Plug 'blankname/vim-fish'                       , { 'for': 'fish' }
 Plug 'hedyhli/vim-bun'                          , { 'for': 'bun' }
 Plug 'https://git.rawtext.club/slope-lang/slope-vim-syntax' , { 'for': 'slope' }
 Plug 'mzlogin/vim-markdown-toc'                 , { 'for': 'markdown' }
+Plug 'leafo/moonscript-vim'                     , { 'for': 'moon' }
 
 " beware, this<tab>
 " Plug 'github/copilot.vim'

.gitignore_global

@@ -1,3 +1,4 @@
 .vim/
 # vim-obsession
 Session.vim
+.DS_Store

bin/pbcopy

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# the pbcopy script
-
-tee | clip.exe
-
-exit 0
-

bin/pbpaste

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# the pbpaste script
-
-powershell.exe Get-Clipboard | sed 's/\r$//' | sed -z '$ s/\n$//'
-
-exit 0
-