From 166437f64441cf4f5ce2e35725c738102e406521 Mon Sep 17 00:00:00 2001
From: dogeystamp <dogeystamp@disroot.org>
Date: Fri, 5 Apr 2024 12:13:19 -0400
Subject: [PATCH] nvim: merge remaining VimL configs back into init.vim

also removed digraphs config.
run :digraphs for a list of built-in digraphs
---
 src/.config/nvim/coding.vim   | 11 -----------
 src/.config/nvim/digraphs.vim | 30 ------------------------------
 src/.config/nvim/init.vim     | 28 +++++++++++-----------------
 3 files changed, 11 insertions(+), 58 deletions(-)
 delete mode 100644 src/.config/nvim/coding.vim
 delete mode 100644 src/.config/nvim/digraphs.vim

diff --git a/src/.config/nvim/coding.vim b/src/.config/nvim/coding.vim
deleted file mode 100644
index ed76b29..0000000
--- a/src/.config/nvim/coding.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-" configurations for coding
-" -------------------------
-
-" Code folding
-set foldmethod=expr
-set foldexpr=nvim_treesitter#foldexpr()
-" unfold by default
-set foldlevel=99
-
-" auto-pairs
-let g:AutoPairsFlyMode = 0
diff --git a/src/.config/nvim/digraphs.vim b/src/.config/nvim/digraphs.vim
deleted file mode 100644
index 1af062d..0000000
--- a/src/.config/nvim/digraphs.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-" see :help digraphs
-" these digraphs are reminiscent of canadian french keyboard layout
-
-if exists("*digraph_setlist")
-	call digraph_setlist([
-			\["'a", 'à'],
-			\["'e", 'è'],
-			\["'u", 'ù'],
-			\["/e", 'é'],
-			\["}a", 'ä'],
-			\["}e", 'ë'],
-			\["}i", 'ï'],
-			\["}o", 'ö'],
-			\["}u", 'ü'],
-			\["}y", 'ÿ'],
-			\["]c", 'ç'],
-			\["[a", 'â'],
-			\["[e", 'ê'],
-			\["[i", 'î'],
-			\["[o", 'ô'],
-			\["[u", 'û'],
-		\])
-
-	" misc funny digraphs
-	call digraph_setlist([
-			\["++", '✝'],
-			\["+-", '†'],
-			\["m-", '—'],
-		\])
-end
diff --git a/src/.config/nvim/init.vim b/src/.config/nvim/init.vim
index 17eb968..d3471b5 100755
--- a/src/.config/nvim/init.vim
+++ b/src/.config/nvim/init.vim
@@ -11,7 +11,7 @@ au TermOpen * setlocal nonumber norelativenumber
 tnoremap <silent> <esc> <c-\><c-n><c-\><c-n>
 
 " sign column on top of the line number (gutter for things like breakpoints, warnings)
-" set scl=number
+set scl=number
 
 " enable line numbers
 set number relativenumber
@@ -23,6 +23,9 @@ set showtabline=0
 " performance?
 set lazyredraw nocursorline ttyfast
 
+" disable splash screen
+set shortmess+=I
+
 let mapleader = ","
 
 " " use system clipboard instead of internal
@@ -55,9 +58,6 @@ highlight LineNr ctermfg=grey
 " Disable highlighting when searching
 nnoremap <silent> <esc> :noh<return><esc>
 
-" shortcuts to type symbols easier
-source $XDG_CONFIG_HOME/nvim/digraphs.vim
-
 " tab, window management
 set splitbelow splitright
 nnoremap <C-j> <C-w>w
@@ -70,17 +70,11 @@ nnoremap <silent> ZF :qa<cr>
 " see .config/nvim/lua/init.lua
 lua require('init')
 
-" The rest will not be sourced if the system is on minimal settings.
-if $SYSTEM_PROFILE == "MINIMAL"
-	finish
-endif
+" Code folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
+" unfold by default
+set foldlevel=99
 
-filetype plugin indent on
-
-if $SYSTEM_PROFILE == "DEFAULT"
-	" plugins for IDE-like nvim
-	source $XDG_CONFIG_HOME/nvim/coding.vim
-endif
-
-" personal preference
-set shortmess+=I
+" auto-pairs
+let g:AutoPairsFlyMode = 0