summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian T <julian@jtle.dk>2021-06-04 15:32:10 +0200
committerJulian T <julian@jtle.dk>2021-06-04 15:32:10 +0200
commit894a7cda68112c77c0fd98cad9cf1517aabb4cfa (patch)
tree235ddd7c3fc729bc3aeb2884d5621e2491714e58
parent88445bed5b46466e1604e0f40c16365739711918 (diff)
Change to new nix release and no ultisnips
-rw-r--r--nixhome/.config/nixpkgs/home.nix2
-rw-r--r--vim-extra/.config/nvim/extra.vim7
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': {