Merge branch 'cscherrNT-master'

Reviewed-on: cscherrNT/configs#3

home/.config/kitty/kitty.conf

@@ -1,12 +1,12 @@
 # vim:fileencoding=utf-8:foldmethod=marker
 
-#: Fonts {{{
+Fonts {{{
 
 #: kitty has very powerful font management. You can configure
 #: individual font faces and even specify special fonts for particular
 #: characters.
 
-# font_family      monospace
+font_family     NotoMono Nerd Font Mono
 # bold_font        auto
 # italic_font      auto
 # bold_italic_font auto
@@ -184,7 +184,7 @@
 #: arrive at a pixel value. There must be four values corresponding to
 #: thin, normal, thick, and very thick lines.
 
-#: }}}
+}}}
 
 #: Cursor customization {{{
 

home/.config/nvim/coc-settings.json

@@ -1,5 +1,11 @@
 {
     "rust-analyzer.server.path": "~/.cargo/bin/rust-analyzer",
     "suggest.acceptSuggestionOnCommitCharacter": true,
-    "diagnostic.displayByAle": false
+    "diagnostic.displayByAle": false,
+    "languageserver": {
+        "digestif": {
+            "command": "digestif",
+            "filetypes": ["tex", "plaintex", "context"]
+        }
+    }
 }

home/.config/nvim/coc.vim

@@ -1,4 +1,21 @@
-let g:coc_global_extensions = ['coc-json', 'coc-git', 'coc-clangd', 'coc-cmake', 'coc-css', 'coc-floaterm', 'coc-fzf-preview', 'coc-html', 'coc-json', 'coc-lists', 'coc-lua', 'coc-pyright', 'coc-rust-analyzer', 'coc-sh', 'coc-sql', 'coc-yaml']
+let g:coc_global_extensions = [
+            \'coc-json', 
+            \'coc-git', 
+            \'coc-clangd', 
+            \'coc-cmake',
+            \'coc-css',
+            \'coc-floaterm',
+            \'coc-fzf-preview',
+            \'coc-html',
+            \'coc-json',
+            \'coc-lists',
+            \'coc-lua',
+            \'coc-pyright',
+            \'coc-rust-analyzer',
+            \'coc-sh',
+            \'coc-sql',
+            \'coc-yaml',
+            \]
 
 " navigate between errors quickly
 nmap <silent> <C-k> <Plug>(coc-diagnostic-prev)

home/.config/nvim/common.vim

@@ -75,7 +75,6 @@ nnoremap <SPACE> <Nop>
 let mapleader=" "
 map <leader>t :echo "leader tested!"<CR>
 map <leader>h :noh<CR>
-let maplocalleader=","
 
 " copy to Wayland clipboard when leader is used. (note, install gvim for this)
 vnoremap  <leader>wy  y :call system("wl-copy", @")<CR>
@@ -95,6 +94,9 @@ vnoremap p pgvy
 " open terminal with F12
 nnoremap <F12> :terminal<CR>
 
+" no line numbers for terminals
+autocmd TermOpen * setlocal nonumber norelativenumber
+
 " vsplit with <Leader>, then "
 map <Leader>" :vsplit<CR>
 
@@ -115,8 +117,13 @@ nnoremap <leader>S i<CR><ESC> V:m -2<CR>
 nmap <A-u> kzz
 nmap <A-d> jzz
 
+" stuff for marks
+" jump to the given mark with <#> instead of `, i have a qwertz keyboard
+nmap # `
+vmap # `
+
 " spell checking -----------------------------------------------------------------------------------
-set spell spelllang=en
+set spell spelllang=en,de
 
 " set a location
 set spellfile=~/.config/nvim/spell/en.utf-8.add

home/.config/nvim/ltex.vim

@@ -0,0 +1 @@
+let g:coc_filetype_map = {'tex': 'latex'}

home/.config/nvim/main.vim

@@ -8,6 +8,8 @@ augroup terminal
 augroup END
 
 " debuging
+"let g:termdebug_config['map_K'] = 0
+let g:termdebug_map_K = 0
 packadd termdebug
 
 " debugging for rust
@@ -37,8 +39,8 @@ runtime tagbar.vim
 " load suda
 runtime suda.vim
 
-" load neorg
-runtime neorg.vim
+" load vimtex
+runtime vimtex.vim
 
 " load ALE (another language server or something that works with COC)
 "runtime ale.vim
@@ -131,10 +133,6 @@ nmap <leader>cs :SlimeConfig<CR>
 "------------------------------------------------------
 lua << EOF
 
--- disable netrw at the very start of your init.lua (strongly advised)
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
 -- set termguicolors to enable highlight groups
 vim.opt.termguicolors = true
 

home/.config/nvim/neorg.vim

@@ -1,24 +0,0 @@
-lua << EOF
-require 'nvim-treesitter.configs'.setup {
-	ensure_installed = { 'norg' },
-
-	highlight = {
-		enable = true,
-	}
-}
-
-require('neorg').setup {
-    load = {
-        ["core.defaults"] = {}, -- Loads default behaviour
-        ["core.concealer"] = {}, -- Adds pretty icons to your documents
-        ["core.dirman"] = { -- Manages Neorg workspaces
-            config = {
-                workspaces = {
-                    main = "~/Nextcloud/Neorg",
-                    work = "~/Nextcloud/Neorg/500-Work",
-                },
-            },
-        },
-    },
-}
-EOF

home/.config/nvim/nvim-tree.vim

@@ -3,10 +3,6 @@ nnoremap <F5> :NvimTreeToggle<CR>
 
 lua << EOF
 
--- disable netrw at the very start of your init.lua
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
 local function my_on_attach(bufnr)
   local api = require "nvim-tree.api"
 

home/.config/nvim/plugs.vim

@@ -23,8 +23,7 @@ Plug 'nvim-tree/nvim-web-devicons'
 Plug 'rust-lang/rust.vim'
 Plug 'preservim/tagbar'
 Plug 'lambdalisue/suda.vim'
-Plug 'nvim-neorg/neorg', {'do': ':Neorg sync-parsers'}
-Plug 'nvim-lua/plenary.nvim'
-Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'lervag/vimtex'
+"Plug 'dense-analysis/ale'
 
 call plug#end()

home/.config/nvim/spell/en.utf-8.add

@@ -0,0 +1,227 @@
+NvimTree
+F5
+netrw
+init
+lua
+nvim
+api
+WSL
+config
+wsl
+cd
+termguicolors
+NewTec
+GmbH
+www
+newtec
+Scherr
+well
+ServiceWrapper
+of
+PythonCallback
+vvvvvvvvvvvvvvvv
+const
+u64
+u8
+str
+fifos
+tmp
+bbc
+LogLevel
+wildcard
+mutex
+ENUMS
+enum
+STRUCT
+structs
+ServiceNotRunningError
+pyo3
+CallbackAlreadyRegisteredError
+CallbackNotRegisteredError
+backend
+tx
+fifo
+rx
+fn
+json
+JsonValue
+struct
+stdout
+stderr
+syslog
+PyDict
+deregister
+deregister_callback/!
+deregister_callback
+PyObject
+RustCallback
+PyO3
+call1
+py
+args
+CONFIGS
+hjkl
+F3
+gvim
+F12
+zg
+zw
+zug
+zuw
+fzf
+zc
+qwertz
+cword
+FzfSpellSink
+vsplit
+FifoCreationError
+AtomicBool
+displayByAle
+acceptSuggestionOnCommitCharacter
+bool
+serv
+SafeService
+PyErr
+CallbackAlreadyRegisteredException
+CallbackNotRegisteredException
+srv
+ServiceAlreadyRunningError
+ServiceAlreadyRunningException
+ServiceNotRunningException
+ADDRESSOR
+TIMESTAMP
+timestamp
+MessageMissingKey
+MessageMissingKey
+T13
+dir
+ToString
+dirs
+traceback
+PyString
+RFC3339
+rfc
+rfc3339
+mylogger
+mylog
+v2
+LogEntry
+logseverity
+Hashmap
+CallbackTable
+HashMap
+VecDeque
+toml
+TBD
+msg
+FrontEnd
+submodule
+frontend
+init
+loop
+try
+KeyboardInterrupt
+#IGINT
+SIGINT/!
+SIGTERM
+SIGINT
+Ctrl
+try
+SignalWatcher
+exc
+txt
+ECDSA
+PRIVKEY
+DER
+secp384r1
+pem
+sig
+PEM
+MessengerError
+Kloos
+levi
+kloos
+serde
+OldJson
+ServiceError
+YubiKey
+submodules
+Kleopatra
+Kleopatra
+GPG
+lazygit
+DevOps
+rsa
+TODO
+IDEs
+VsCode
+JetBrains
+NeoVim
+#orewarding
+forewarding
+foreward
+hypervisors
+BrokerApplication
+autostyle
+csquotes
+ngerman
+biber
+sortlocale
+natbib
+url
+doi
+eprint
+biblatex
+hyperref
+colorlinks
+citecolor
+filecolor
+linkcolor
+urlcolor
+pdfpages
+Ggfs
+weitere
+ggfs
+sec1
+sec2
+arabic
+NTSG
+lipsum
+Qux
+Akronymverzeichnis
+NTSecureGateway
+Nachspann
+#orraussetzungen
+IEC62443
+SBC
+RustBook
+Klabnik
+lifecycle
+compat
+configs
+#clc
+rclc
+feb
+LTS
+OOP
+TPM
+rustdoc
+Yocto
+Shield96
+NTSecureCloudSolutions
+#TSecureCloud
+NTSecureCloud
+loesungen
+IoT
+datensicherer
+ATSAMA5D27
+TrustZone
+A5
+ARMv7
+eMMC
+MT25QU0512BBB
+ATECC608
+Keystore
+io
+acp
+subfigure

home/.config/nvim/vimtex.vim

@@ -0,0 +1,43 @@
+" This is necessary for VimTeX to load properly. The "indent" is optional.
+" Note that most plugin managers will do this automatically.
+filetype plugin indent on
+
+" This enables Vim's and neovim's syntax-related features. Without this, some
+" VimTeX features will not work (see ":help vimtex-requirements" for more
+" info).
+syntax enable
+
+" Viewer options: One may configure the viewer either by specifying a built-in
+" viewer method:
+let g:vimtex_view_method = 'zathura'
+
+" Or with a generic interface:
+let g:vimtex_view_general_viewer = 'okular'
+let g:vimtex_view_general_options = '--unique file:@pdf\#src:@line@tex'
+
+" VimTeX uses latexmk as the default compiler backend. If you use it, which is
+" strongly recommended, you probably don't need to configure anything. If you
+" want another compiler backend, you can change it as follows. The list of
+" supported backends and further explanation is provided in the documentation,
+" see ":help vimtex-compiler".
+let g:vimtex_compiler_method = 'latexmk'
+
+" Most VimTeX mappings rely on localleader and this can be changed with the
+" following line. The default is usually fine and is the symbol "\".
+let maplocalleader = ","
+
+let g:vimtex_compiler_latexmk = {
+    \ 'aux_dir' : 'build',
+    \ 'out_dir' : '',
+    \ 'callback' : 1,
+    \ 'continuous' : 1,
+    \ 'executable' : 'latexmk',
+    \ 'hooks' : [],
+    \ 'options' : [
+    \   '-verbose',
+    \   '-file-line-error',
+    \   '-synctex=1',
+    \   '-interaction=nonstopmode',
+    \ ],
+    \}
+

home/.gitconfig

@@ -1,8 +1,10 @@
 [user]
-	email = software@cscherr.de
-	name = PlexSheep
-	signingkey = software@cscherr.de
+	email = Christoph.Scherr@newtec.de
+	name = Christoph J. Scherr
+	signingkey = Christoph.Scherr@newtec.de
 [credential]
 	helper = store --file ~/.git-credentials
 [commit]
 	gpgsign = false
+[init]
+    defaultBranch = master

home/.zsh-server/zshrc

@@ -29,6 +29,10 @@ alias gls=/bin/ls
 function largefiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(G|T|P|E)\s" }
 function midfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(M|G|T|P|E)\s" }
 function smallfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(B|K)\s" }
+function cachekeys () { exec 2>/dev/null; 
+    eval $(ssh-agent)
+    ssh-add ~/.ssh/id_rsa
+}
 function newpass() {
     LC_ALL=C tr -dc '[:alnum:]' < /dev/urandom | head -c${1:-$0}
 }

home/.zsh/zshrc

@@ -32,12 +32,15 @@ alias isotime='date +"%Y-%m-%dT%H:%M:%S%z"'
 alias gg=lazygit
 alias reload="source ~/.zshrc"
 alias gls=/bin/ls
-alias neorg='nvim -c "Neorg workspace main"'
 
 ### Functions
 function largefiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(G|T|P|E)\s" }
 function midfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(M|G|T|P|E)\s" }
 function smallfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(B|K)\s" }
+function cachekeys () { exec 2>/dev/null; 
+    eval $(ssh-agent)
+    ssh-add ~/.ssh/id_rsa
+}
 function newpass() {
     LC_ALL=C tr -dc '[:alnum:]' < /dev/urandom | head -c${1:-$0}
 }