diff --git a/init.lua b/init.lua index 6b87573..82dad0b 100644 --- a/init.lua +++ b/init.lua @@ -2,6 +2,7 @@ require "user.options" require "user.keymaps" require "user.plugins" require "user.colorscheme" +vim.cmd "colorscheme nord" require "user.cmp" require "user.lsp" require "user.telescope" diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index f380511..643c6cc 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -36,8 +36,8 @@ keymap("n", "", ":bnext", opts) keymap("n", "", ":bprevious", opts) -- Move text up and down -keymap("n", "", ":m .+1==gi", opts) -keymap("n", "", ":m .-2==gi", opts) +keymap("n", "", ":m .+1==gi", opts) +keymap("n", "", ":m .-2==gi", opts) -- Insert -- -- Press jk fast to enter diff --git a/lua/user/options.lua b/lua/user/options.lua index 799aa9d..4ca6757 100644 --- a/lua/user/options.lua +++ b/lua/user/options.lua @@ -16,7 +16,7 @@ local options = { splitbelow = true, -- force all horizontal splits to go below current window splitright = true, -- force all vertical splits to go to the right of current window swapfile = false, -- creates a swapfile - -- termguicolors = true, -- set term gui colors (most terminals support this) + termguicolors = true, -- set term gui colors (most terminals support this) timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds) undofile = true, -- enable persistent undo updatetime = 300, -- faster completion (4000ms default) diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 2aa1f93..ff427b5 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -52,7 +52,6 @@ return packer.startup(function(use) use "moll/vim-bbye" use "nvim-lualine/lualine.nvim" use "akinsho/toggleterm.nvim" - use "ahmedkhalf/project.nvim" use "lewis6991/impatient.nvim" use "lukas-reineke/indent-blankline.nvim" use "goolord/alpha-nvim" @@ -60,8 +59,10 @@ return packer.startup(function(use) use "folke/which-key.nvim" -- Colorschemes - -- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out - use "lunarvim/darkplus.nvim" + use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out + use "arcticicestudio/nord-vim" + -- use "lunarvim/darkplus.nvim" + -- cmp plugins use "hrsh7th/nvim-cmp" -- The completion plugin @@ -94,6 +95,18 @@ return packer.startup(function(use) -- Git use "lewis6991/gitsigns.nvim" + -- project + use { + "ahmedkhalf/project.nvim", + config = function() + require("project_nvim").setup { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + } + end + } + -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins if PACKER_BOOTSTRAP then diff --git a/lua/user/toggleterm.lua b/lua/user/toggleterm.lua index cecbd99..d839a2b 100644 --- a/lua/user/toggleterm.lua +++ b/lua/user/toggleterm.lua @@ -33,7 +33,7 @@ function _G.set_terminal_keymaps() vim.api.nvim_buf_set_keymap(0, 't', '', [[h]], opts) vim.api.nvim_buf_set_keymap(0, 't', '', [[j]], opts) vim.api.nvim_buf_set_keymap(0, 't', '', [[k]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[l]], opts) + -- vim.api.nvim_buf_set_keymap(0, 't', '', [[l]], opts) end vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()') diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index cce19ab..6108b75 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -95,6 +95,7 @@ local mappings = { }, ["F"] = { "Telescope live_grep theme=ivy", "Find Text" }, ["P"] = { "lua require('telescope').extensions.projects.projects()", "Projects" }, + ["r"] = { "Telescope command_history", "Command History" }, p = { name = "Packer",