diff --git a/home/config/nvim/legacy.vim b/home/config/nvim/legacy.vim index 4834e5b..a87688d 100644 --- a/home/config/nvim/legacy.vim +++ b/home/config/nvim/legacy.vim @@ -5,7 +5,7 @@ let mapleader = " " set autoindentz set preserveindent set copyindent -set shell=~/.nix-profile/bin/zsh +set shell=zsh " Set Colors if (has("termguicolors")) diff --git a/home/config/nvim/lua/plugins.lua b/home/config/nvim/lua/plugins.lua index 15e0e36..f1749ca 100644 --- a/home/config/nvim/lua/plugins.lua +++ b/home/config/nvim/lua/plugins.lua @@ -12,6 +12,8 @@ return function(use) -- require("nvim-treesitter.configs").setup({ -- parser_install_dir = parser_install_dir, -- }) + use({"SirVer/ultisnips"}) + use({"honza/vim-snippets"}) use({"williamboman/mason.nvim"}) use({'williamboman/mason-lspconfig.nvim'}) diff --git a/home/config/nvim/lua/settings.lua b/home/config/nvim/lua/settings.lua index 2f5d4fe..2514372 100644 --- a/home/config/nvim/lua/settings.lua +++ b/home/config/nvim/lua/settings.lua @@ -1,7 +1,7 @@ vim.g.mapleader = " " vim.g.maplocalleader = " " -vim.opt.shell = "~/.nix-profile/bin/zsh" +vim.opt.shell = "zsh" vim.opt.history = 1000 vim.opt.termguicolors = true @@ -47,13 +47,16 @@ vim.cmd 'colorscheme jellybeans' vim.g.floaterm_keymap_toggle = '' vim.g.floaterm_width = 0.9 vim.g.floaterm_height = 0.9 +vim.g.floaterm_shell = "~/.nix-profile/bin/zsh" vim.g.rustfmt_autosave = 1 vim.g.rust_use_custom_ctags_defs = 1 vim.g.tagbar_autofocus=1 - +-- vim.g.UltiSnipsExpandTrigger="" +-- vim.g.UltiSnipsJumpForwardTrigger="" +-- vim.g.UltiSnipsJumpBackwardTrigger="" -- Highlight yank