Merge branch 'main' of git.clustercockpit.org:moebiusband/dotfiles

dot_config/nvim/lua/config/autocmds.lua

@@ -1,3 +1,10 @@
 -- Autocmds are automatically loaded on the VeryLazy event
 -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
 -- Add any additional autocmds here
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = { "norg" },
+  callback = function()
+    vim.opt_local.wrap = true
+    vim.opt_local.spell = true
+  end,
+})

dot_config/nvim/lua/config/options.lua

@@ -5,5 +5,17 @@
 if vim.g.neovide then
   vim.g.neovide_cursor_animation_length = 0
   vim.o.guifont = "BrutalistMono Nerd Font Regular:h16"
-  vim.g.neovide_theme = "auto"
+  vim.g.neovide_theme = "dark"
+  vim.keymap.set("n", "<D-s>", ":w<CR>") -- Save
+  vim.keymap.set("v", "<D-c>", '"+y') -- Copy
+  vim.keymap.set("n", "<D-v>", '"+P') -- Paste normal mode
+  vim.keymap.set("v", "<D-v>", '"+P') -- Paste visual mode
+  vim.keymap.set("c", "<D-v>", "<C-R>+") -- Paste command mode
+  vim.keymap.set("i", "<D-v>", '<ESC>l"+Pli') -- Paste insert mode
 end
+
+-- Allow clipboard copy paste in neovim
+vim.api.nvim_set_keymap("", "<D-v>", "+p<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("!", "<D-v>", "<C-R>+", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("t", "<D-v>", "<C-R>+", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("v", "<D-v>", "<C-R>+", { noremap = true, silent = true })

dot_config/nvim/lua/plugins/notes.lua

@@ -7,12 +7,12 @@ return {
       "renerocksai/calendar-vim",
     },
     opts = {
-      home = vim.fn.expand("~/doc/zettelkasten"),
       take_over_my_home = true,
       auto_set_filetype = true,
-      -- dailies      = home .. '/' .. 'daily',
-      -- weeklies     = home .. '/' .. 'weekly',
-      -- templates    = home .. '/' .. 'templates',
+      home = "/Users/jan/doc/zettelkasten",
+      dailies = "/Users/jan/doc/zettelkasten/daily",
+      weeklies = "/Users/jan/doc/zettelkasten/weekly",
+      templates = "/Users/jan/doc/zettelkasten/templates",
       image_subdir = "img",
       extension = ".md",
       new_note_filename = "uuid-title",
@@ -25,15 +25,15 @@ return {
 
       -- template for new notes (new_note, follow_link)
       -- set to `nil` or do not specify if you do not want a template
-      -- template_new_note = home .. '/' .. 'templates/new_note.md',
+      template_new_note = "/Users/jan/doc/zettelkasten/templates/new_note.md",
 
       -- template for newly created daily notes (goto_today)
       -- set to `nil` or do not specify if you do not want a template
-      -- template_new_daily = home .. '/' .. 'templates/daily.md',
+      template_new_daily = "/Users/jan/doc/zettelkasten/templates/daily.md",
 
       -- template for newly created weekly notes (goto_thisweek)
       -- set to `nil` or do not specify if you do not want a template
-      -- template_new_weekly= home .. '/' .. 'templates/weekly.md',
+      template_new_weekly = "/Users/jan/doc/zettelkasten/templates/weekly.md",
 
       -- image link style
       -- wiki:     ![[image name]]
@@ -78,21 +78,35 @@ return {
       vim.api.nvim_set_hl(0, "tkBrackets", { fg = "gray", bg = "gray" })
     end,
   },
-
   {
     "nvim-neorg/neorg",
     build = ":Neorg sync-parsers",
-    dependencies = { "nvim-lua/plenary.nvim" },
+    dependencies = { { "nvim-lua/plenary.nvim" }, { "nvim-neorg/neorg-telescope" } },
     opts = {
       load = {
         ["core.defaults"] = {},
-        ["core.concealer"] = {}, -- Adds pretty icons to your documents
+        ["core.concealer"] = {},
+        ["core.completion"] = {
+          config = {
+            engine = "nvim-cmp",
+            name = "[Norg]",
+          },
+        },
+        ["core.integrations.nvim-cmp"] = {},
+        ["core.integrations.telescope"] = {},
+        ["core.esupports.metagen"] = {
+          config = {
+            type = "auto",
+          },
+        },
         ["core.dirman"] = { -- Manages Neorg workspaces
           config = {
             workspaces = {
               notes = "~/doc/notes/private",
               work = "~/doc/notes/work",
             },
+            default_workspace = "work",
+            index = "index.norg",
           },
         },
       },

dot_ssh/config

@@ -12,6 +12,16 @@ Hostname cshpc.rrze.uni-erlangen.de
 ForwardAgent no
 User unrz254
 
+Host moodle
+Hostname moodle.nhr.fau.de
+ForwardAgent no
+User moodle
+
+Host moebiusband
+Hostname server.moebiusband.org
+ForwardAgent no
+User jan
+
 Host fritz
 HostName fritz
 ForwardAgent no
@@ -52,6 +62,13 @@ Host gondor
 Hostname 192.168.178.60
 ForwardAgent no
 
+Host rohan
+HostName rohan
+ForwardAgent no
+User jan
+ProxyJump cshpc
+
+ProxyJump cshpc
 Host gitolite
 Hostname moebiusband.org
 ForwardAgent no

dot_tmux.conf.tmpl

@@ -3,8 +3,8 @@ set -g prefix C-a
 bind C-a send-prefix
 
 set -g base-index 1
-set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'
-set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'
+set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'  # undercurl support
+set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'  # underscore colours - needs tmux-3.0
 
 # Basic functions
 bind -n M-n new-window
@@ -24,9 +24,14 @@ bind -n M-4   select-window -t 4
 bind -n M-5   select-window -t 5
 bind -n M-6   select-window -t 6
 
-# Linux system clipboard
+{{- if eq .chezmoi.os "darwin" }}
+bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'reattach-to-user-namespace pbcopy'
+bind-key -T copy-mode-vi Enter send -X copy-pipe-and-cancel 'reattach-to-user-namespace pbcopy'
+bind-key -T copy-mode-vi MouseDragEnd1Pane send -X copy-pipe-and-cancel 'reattach-to-user-namespace pbcopy'
+{{- else }}
 bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "xclip -in -selection clipboard"
 bind -T copy-mode-vi MouseDragEnd1Pane send -X copy-pipe-and-cancel "xclip -in -selection clipboard"
+{{- end }}
 
 # enable vi mode
 setw -g mode-keys vi
@@ -47,7 +52,7 @@ set -g display-time 4000
 set -g status-interval 5
 
 # upgrade $TERM
-set -g default-terminal "screen-256color"
+set -g default-terminal "tmux-256color"
 set-option -sa terminal-features ',{{ .term }}:RGB'
 
 # emacs key bindings in tmux command prompt (prefix + :) are better than