modules/terminal-life: add nvim filetype handling for age secrets

hosts/frikandel/email.nix

@@ -207,7 +207,7 @@ in {
         # replace rcpt to catchall and deliver it there
         destination $(local_domains) {
           modify {
-            replace_rcpt regexp ".*" "mail@$(primary_domain)"
+            replace_rcpt regexp "(.+)@(.+)" "mail@$2"
           }
           deliver_to &local_mailboxes
         }

modules/terminal-life/nvim/filetypes.vim

@@ -1,3 +1,10 @@
 au BufRead,BufNewFile *.html.twig set filetype=html
 au BufRead,BufNewFile *.vto set filetype=html
 au BufRead,BufNewFile *.njk set filetype=html
+
+au BufRead,BufNewFile *.age set filetype=age
+autocmd FileType age setlocal noeol nofixeol
+
+au! BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml
+autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
+

modules/terminal-life/nvim/init.vim

@@ -58,10 +58,6 @@ map <leader>wJ :wincmd H<CR>
 map <leader>wK :wincmd J<CR>
 map <leader>wL :wincmd L<CR>
 
-map <leader>tj :tabprevious<CR>
-map <leader>tl :tabnext<CR>
-map <leader>tq :tabclose<CR>
-
 " replay macro for each line of a visual selection
 xnoremap @q :normal @q<CR>
 xnoremap @@ :normal @@<CR>

modules/terminal-life/nvim/lsp.vim

@@ -16,11 +16,11 @@ local lspconfig    = require('lspconfig')
 -- Mappings (global)
 -- See `:help vim.diagnostic.*` for documentation on any of the below functions
 local opts = { noremap=true, silent=true }
-vim.api.nvim_set_keymap('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
 vim.api.nvim_set_keymap('n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
 vim.api.nvim_set_keymap('n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
 vim.api.nvim_set_keymap('n', '<leader>dq', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+vim.api.nvim_set_keymap('n', '<leader>do', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
+vim.api.nvim_set_keymap('n', '<leader>bf', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
 
 local on_attach = function(client, bufnr)
   -- Enable completion triggered by <c-x><c-o>
@@ -32,12 +32,12 @@ local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gT', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
 

modules/terminal-life/nvim/plugins.vim

@@ -1,7 +1,3 @@
-" Happy yaml configuration
-au! BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml
-autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
-
 let g:gutentags_file_list_command = 'git ls-files'
 
 " https://github.com/unblevable/quick-scope
@@ -84,7 +80,6 @@ local builtin = require('telescope.builtin')
 vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
 vim.keymap.set('n', '<leader>f/', builtin.live_grep, {})
 vim.keymap.set('n', '<leader>f?', builtin.builtin, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
 vim.keymap.set('n', '<leader>fr', builtin.command_history, {})
 vim.keymap.set('n', '<leader>fc', builtin.commands, {})
 vim.keymap.set('n', '<leader>ft', builtin.treesitter, {})

treefmt.toml

@@ -1,7 +1,8 @@
 [formatter.nix]
-command = "alejandra"
+command = "nix"
+options = ["fmt"]
 includes = ["*.nix"]
-excludes = ["pkgs/_sources/generated.nix"]
+excludes = []
 
 [formatter.prettier]
 command = "prettier"