Preliminary customization

pull/81/head
droctothorpe 3 years ago
parent 35a0e3be19
commit 6ddae98be9

@ -2,6 +2,7 @@ require "user.options"
require "user.keymaps" require "user.keymaps"
require "user.plugins" require "user.plugins"
require "user.colorscheme" require "user.colorscheme"
vim.cmd "colorscheme nord"
require "user.cmp" require "user.cmp"
require "user.lsp" require "user.lsp"
require "user.telescope" require "user.telescope"

@ -36,8 +36,8 @@ keymap("n", "<S-l>", ":bnext<CR>", opts)
keymap("n", "<S-h>", ":bprevious<CR>", opts) keymap("n", "<S-h>", ":bprevious<CR>", opts)
-- Move text up and down -- Move text up and down
keymap("n", "<A-j>", "<Esc>:m .+1<CR>==gi", opts) keymap("n", "<C-A-j>", "<Esc>:m .+1<CR>==gi", opts)
keymap("n", "<A-k>", "<Esc>:m .-2<CR>==gi", opts) keymap("n", "<C-A-k>", "<Esc>:m .-2<CR>==gi", opts)
-- Insert -- -- Insert --
-- Press jk fast to enter -- Press jk fast to enter

@ -16,7 +16,7 @@ local options = {
splitbelow = true, -- force all horizontal splits to go below current window 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 splitright = true, -- force all vertical splits to go to the right of current window
swapfile = false, -- creates a swapfile 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) timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds)
undofile = true, -- enable persistent undo undofile = true, -- enable persistent undo
updatetime = 300, -- faster completion (4000ms default) updatetime = 300, -- faster completion (4000ms default)

@ -52,7 +52,6 @@ return packer.startup(function(use)
use "moll/vim-bbye" use "moll/vim-bbye"
use "nvim-lualine/lualine.nvim" use "nvim-lualine/lualine.nvim"
use "akinsho/toggleterm.nvim" use "akinsho/toggleterm.nvim"
use "ahmedkhalf/project.nvim"
use "lewis6991/impatient.nvim" use "lewis6991/impatient.nvim"
use "lukas-reineke/indent-blankline.nvim" use "lukas-reineke/indent-blankline.nvim"
use "goolord/alpha-nvim" use "goolord/alpha-nvim"
@ -60,8 +59,10 @@ return packer.startup(function(use)
use "folke/which-key.nvim" use "folke/which-key.nvim"
-- Colorschemes -- Colorschemes
-- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out
use "lunarvim/darkplus.nvim" use "arcticicestudio/nord-vim"
-- use "lunarvim/darkplus.nvim"
-- cmp plugins -- cmp plugins
use "hrsh7th/nvim-cmp" -- The completion plugin use "hrsh7th/nvim-cmp" -- The completion plugin
@ -94,6 +95,18 @@ return packer.startup(function(use)
-- Git -- Git
use "lewis6991/gitsigns.nvim" 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 -- Automatically set up your configuration after cloning packer.nvim
-- Put this at the end after all plugins -- Put this at the end after all plugins
if PACKER_BOOTSTRAP then if PACKER_BOOTSTRAP then

@ -33,7 +33,7 @@ function _G.set_terminal_keymaps()
vim.api.nvim_buf_set_keymap(0, 't', '<C-h>', [[<C-\><C-n><C-W>h]], opts) vim.api.nvim_buf_set_keymap(0, 't', '<C-h>', [[<C-\><C-n><C-W>h]], opts)
vim.api.nvim_buf_set_keymap(0, 't', '<C-j>', [[<C-\><C-n><C-W>j]], opts) vim.api.nvim_buf_set_keymap(0, 't', '<C-j>', [[<C-\><C-n><C-W>j]], opts)
vim.api.nvim_buf_set_keymap(0, 't', '<C-k>', [[<C-\><C-n><C-W>k]], opts) vim.api.nvim_buf_set_keymap(0, 't', '<C-k>', [[<C-\><C-n><C-W>k]], opts)
vim.api.nvim_buf_set_keymap(0, 't', '<C-l>', [[<C-\><C-n><C-W>l]], opts) -- vim.api.nvim_buf_set_keymap(0, 't', '<C-l>', [[<C-\><C-n><C-W>l]], opts)
end end
vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()') vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')

@ -95,6 +95,7 @@ local mappings = {
}, },
["F"] = { "<cmd>Telescope live_grep theme=ivy<cr>", "Find Text" }, ["F"] = { "<cmd>Telescope live_grep theme=ivy<cr>", "Find Text" },
["P"] = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" }, ["P"] = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" },
["r"] = { "<cmd>Telescope command_history<CR>", "Command History" },
p = { p = {
name = "Packer", name = "Packer",

Loading…
Cancel
Save