Fix bug in apply and vim config

6 files changed, 14 insertions, 161 deletions

diff --git a/apply/state.py b/apply/state.py
index 2e9205c..806c785 100644
--- a/apply/state.py
+++ b/apply/state.py
@@ -128,7 +128,7 @@ class StateFile:
         self.dirs[path].remove(module)
 
         if len(self.dirs[path]) == 0:
-            writer.remove(Path(path))
+            writer.delete(Path(path))
 
     def __delete_link(self, writer: Writer, path: str):
         del self.links[path]
diff --git a/vim-core/.config/nvim/init.vim b/vim-core/.config/nvim/init.vim
index 070e076..5a57355 100644
--- a/vim-core/.config/nvim/init.vim
+++ b/vim-core/.config/nvim/init.vim
@@ -110,6 +110,7 @@ filetype plugin indent on    " required
 
 " Highlightning And colors{{{
     set termguicolors
+    colorscheme PaperColor
 
 " Spell check
     set spelllang=en,da
diff --git a/vim-extra/.config/nvim/UltiSnips/go.snippets b/vim-extra/.config/nvim/UltiSnips/go.snippets
deleted file mode 100644
index 96a9fec..0000000
--- a/vim-extra/.config/nvim/UltiSnips/go.snippets
+++ /dev/null
@@ -1,14 +0,0 @@
-snippet ec "if err no nil"
-if err != nil {
-    return $1err
-}
-$0
-endsnippet
-
-snippet eh "if err no nil write http"
-if err != nil {
-    ${1:http}.Error(w, err.Error(), http.Status${2:InternalServerError})
-    return
-}
-$0
-endsnippet
diff --git a/vim-extra/.config/nvim/UltiSnips/latex.snippets b/vim-extra/.config/nvim/UltiSnips/latex.snippets
deleted file mode 100644
index a3e508f..0000000
--- a/vim-extra/.config/nvim/UltiSnips/latex.snippets
+++ /dev/null
@@ -1,10 +0,0 @@
-# https://castel.dev/post/lecture-notes-1/
-snippet beg "begin{} / end{}" bA
-\begin{$1}
-    $0
-\end{$1}
-endsnippet
-
-snippet mk "Inline math" wA
-$${1}$
-end
diff --git a/vim-extra/.config/nvim/UltiSnips/tex.snippets b/vim-extra/.config/nvim/UltiSnips/tex.snippets
deleted file mode 100644
index 1cdc972..0000000
--- a/vim-extra/.config/nvim/UltiSnips/tex.snippets
+++ /dev/null
@@ -1,44 +0,0 @@
-# https://castel.dev/post/lecture-notes-1/
-snippet begin "begin{} / end{}" bA
-\begin{$1}
-    $0
-\end{$1}
-endsnippet
-
-snippet dm "Display math" wA
-\[
-$1
-.\] $0
-endsnippet
-
-# Subscript
-snippet _p "Subscript" iA
-_{$1}$0
-endsnippet
-
-# To the power of
-snippet td "To the power of" iA
-^{$1}$0
-endsnippet
-
-# Fraction
-snippet // "Fraction" iA
-\\frac{$1}{$2}$0
-endsnippet
-
-# Integral
-snippet \int_ "Bestemt intergrale" wA
-\int_{$1}^{$2} $3 \,dx$0
-:qa
-endsnippet
-
-# Section and stuff
-snippet sec "Section" bA
-\section{$1}
-$0
-endsnippet
-
-snippet ssec "Sub section" bA
-\subsection{$1}
-$0
-endsnippet
diff --git a/vim-extra/.config/nvim/extra.vim b/vim-extra/.config/nvim/extra.vim
index dad55f4..03b5e44 100644
--- a/vim-extra/.config/nvim/extra.vim
+++ b/vim-extra/.config/nvim/extra.vim
@@ -1,60 +1,18 @@
 " Plugins{{{
-    " set the runtime path to include Vundle and initialize
-    set rtp+=~/.vim/bundle/Vundle.vim
-    call vundle#begin("~/.vim/bundle")
-    " alternatively, pass a path where Vundle should install plugins
-    "call vundle#begin('~/some/path/here')
+  call plug#begin()
+    Plug 'neovim/nvim-lspconfig'
+    Plug 'Shougo/echodoc.vim'
 
-    " let Vundle manage Vundle, required
-    Plugin 'VundleVim/Vundle.vim'
+    Plug 'tpope/vim-surround'
+    Plug 'tpope/vim-repeat'
 
-    " Completion
-    "Plugin 'Shougo/deoplete.nvim'
-    Plugin 'ajh17/VimCompletesMe'
-    " Plugin 'prabirshrestha/vim-lsp'
-    Plugin 'autozimu/LanguageClient-neovim'
-    Plugin 'Shougo/echodoc.vim'
+    Plug 'NLKNguyen/papercolor-theme'
+    Plug 'LnL7/vim-nix'
+    Plug 'fatih/vim-go'
 
-    " Installed through vim-core
-    Plugin 'tpope/vim-surround'
-    Plugin 'tpope/vim-repeat'
-    Plugin 'tpope/vim-unimpaired'
-    Plugin 'tpope/vim-commentary'
+  call plug#end()
 
-    "Plugin 'godlygeek/tabular'
-
-    " Editor config
-    Plugin 'sgur/vim-editorconfig'
-
-    " Color theme
-    Plugin 'agude/vim-eldar'
-    " Plugin 'ntk148v/vim-horizon'
-    Plugin 'rakr/vim-colors-rakr'
-    " Plugin 'rakr/vim-one'
-    Plugin 'morhetz/gruvbox'
-    " Plugin 'ntk148v/vim-horizon'
-
-    " Git
-    Plugin 'tpope/vim-fugitive'
-
-    " File support
-    Plugin 'cespare/vim-toml'
-    Plugin 'lervag/vimtex'
-    " Plugin 'aklt/plantuml-syntax'
-    Plugin 'LnL7/vim-nix'
-    Plugin 'dart-lang/dart-vim-plugin'
-    Plugin 'fatih/vim-go'
-
-    " Plugin 'vimwiki/vimwiki'
-
-    " Plugin 'glacambre/firenvim'
-
-
-    " Snippits
-    " Plugin 'SirVer/ultisnips'
-    " Plugin 'honza/vim-snippets'
-
-    call vundle#end()            " required}}}
+" }}}
 
 " Completion{{{
     set completeopt+=menuone
@@ -65,48 +23,10 @@
         let g:echodoc#type = 'virtual'
     endif
 
-    "let g:deoplete#enable_at_startup = 1
-    "let g:deoplete#disable_auto_complete = 1
-
-    let b:vcm_tab_complete = 'omni'
-
     " Close completion window
     autocmd CompleteDone * pclose
 
-    " Lsp options
-    " let g:LanguageClient_setOmnifunc = 1
-    let g:LanguageClient_hoverPreview = "Never"
-    let g:LanguageClient_useVirtualText = "No"
-    let g:LanguageClient_loggingFile = "/tmp/lsp.log"
-    let g:LanguageClient_loggingLevel = "DEBUG"
-    let g:LanguageClient_diagnosticsList = "Disabled"
-
-
-    " Setup lsp servers
-    let g:LanguageClient_serverCommands = {
-        \ 'c' : ['clangd'],
-        \ 'cpp' : ['clangd'],
-        \ 'python' : ['pyls'],
-        \ 'go' : ['gopls'],
-        \ 'rust' : ['rls'],
-        \ 'typescript' : ['tsserver'],
-        \ }
-
-    " let g:one_allow_italics = 1
-    let g:gruvbox_italic = 1
-    colorscheme gruvbox
-
-    " Tab is already in use by completion
-    "let g:UltiSnipsExpandTrigger="<c-s>"
-    "let g:UltiSnipsJumpForwardTrigger="<c-space>"
-
-    " let g:firenvim_config = { 
-    "     \ 'localSettings': {
-    "         \ '.*': {
-    "             \ 'takeover': 'never',
-    "         \ },
-    "     \ }
-    " \ }}}}
-
+    colorscheme PaperColor
+    "
 " Latex
     let g:vimtex_quickfix_open_on_warning = 0