diff --git a/fish/.config/fish/conf.d/rustup.fish b/fish/.config/fish/conf.d/rustup.fish deleted file mode 100644 index e4cb363..0000000 --- a/fish/.config/fish/conf.d/rustup.fish +++ /dev/null @@ -1 +0,0 @@ -source "$HOME/.cargo/env.fish" diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua index c9d5a42..9b96fd3 100644 --- a/vim/.config/nvim/init.lua +++ b/vim/.config/nvim/init.lua @@ -150,11 +150,14 @@ if vim.env.TMUX ~= nil then end -if vim.treesitter.language.ft_to_lang == nil then - vim.treesitter.language.ft_to_lang = function(ft) - return ft - end -end -- https://simondalvai.org/blog/godot-neovim/ require("godot") + + + + +if not vim.g.is_purdue then + -- Enable experimental UI in neovim-nightly + require('vim._extui').enable({}) +end diff --git a/vim/.config/nvim/lua/plugins/init.lua b/vim/.config/nvim/lua/plugins/init.lua index aeebde4..213119d 100644 --- a/vim/.config/nvim/lua/plugins/init.lua +++ b/vim/.config/nvim/lua/plugins/init.lua @@ -31,13 +31,13 @@ return require('packer').startup(function(use) end } use { - 'nvim-telescope/telescope.nvim', + 'nvim-telescope/telescope.nvim', tag = '0.1.x', requires = { { 'nvim-lua/plenary.nvim' } } } use { 'nvim-treesitter/nvim-treesitter', - -- config = function() require("plugins/ts") end + config = function() require("plugins/ts") end } use 'mbbill/undotree' diff --git a/vim/.config/nvim/lua/remap.lua b/vim/.config/nvim/lua/remap.lua index 1f8964e..73b549c 100644 --- a/vim/.config/nvim/lua/remap.lua +++ b/vim/.config/nvim/lua/remap.lua @@ -31,12 +31,6 @@ vim.keymap.set("n", "qf", vim.lsp.buf.format) vim.keymap.set("n", "dd", vim.diagnostic.open_float) -vim.keymap.set("n", "yf", function() - local view = vim.fn.winsaveview() - vim.cmd("%y") - vim.fn.winrestview(view) -end, { desc = "Yank entire file" }) - -------- PLUGINS -------