From 894a7cda68112c77c0fd98cad9cf1517aabb4cfa Mon Sep 17 00:00:00 2001
From: Julian T <julian@jtle.dk>
Date: Fri, 4 Jun 2021 15:32:10 +0200
Subject: Change to new nix release and no ultisnips

---
 nixhome/.config/nixpkgs/home.nix | 2 +-
 vim-extra/.config/nvim/extra.vim | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixhome/.config/nixpkgs/home.nix b/nixhome/.config/nixpkgs/home.nix
index 75ea6ef..214ac07 100644
--- a/nixhome/.config/nixpkgs/home.nix
+++ b/nixhome/.config/nixpkgs/home.nix
@@ -17,7 +17,7 @@
         gdb php ghc stack
 
         # Email and calendar
-        gnome3.evolution gnome3.gnome-calendar evolution-data-server
+        evolution gnome3.gnome-calendar evolution-data-server
 
         # Gui applications
         firefox pavucontrol evince leafpad inkscape gimp 
diff --git a/vim-extra/.config/nvim/extra.vim b/vim-extra/.config/nvim/extra.vim
index 55f8006..d508018 100644
--- a/vim-extra/.config/nvim/extra.vim
+++ b/vim-extra/.config/nvim/extra.vim
@@ -43,6 +43,7 @@
     " Plugin 'aklt/plantuml-syntax'
     Plugin 'LnL7/vim-nix'
     Plugin 'dart-lang/dart-vim-plugin'
+    Plugin 'fatih/vim-go'
 
     " Plugin 'vimwiki/vimwiki'
 
@@ -50,7 +51,7 @@
 
 
     " Snippits
-    Plugin 'SirVer/ultisnips'
+    " Plugin 'SirVer/ultisnips'
     " Plugin 'honza/vim-snippets'
 
     call vundle#end()            " required
@@ -96,8 +97,8 @@
     colorscheme gruvbox
 
     " Tab is already in use by completion
-    let g:UltiSnipsExpandTrigger="<c-s>"
-    let g:UltiSnipsJumpForwardTrigger="<c-space>"
+    "let g:UltiSnipsExpandTrigger="<c-s>"
+    "let g:UltiSnipsJumpForwardTrigger="<c-space>"
 
     " let g:firenvim_config = { 
     "     \ 'localSettings': {
-- 
cgit v1.2.3