From 6ddae98be9beb0f1ca278fc0abeea1506d5cc2c9 Mon Sep 17 00:00:00 2001
From: droctothorpe <mythicalsunlight@gmail.com>
Date: Mon, 21 Feb 2022 21:49:20 -0500
Subject: [PATCH] Preliminary customization

---
 init.lua                |  1 +
 lua/user/keymaps.lua    |  4 ++--
 lua/user/options.lua    |  2 +-
 lua/user/plugins.lua    | 19 ++++++++++++++++---
 lua/user/toggleterm.lua |  2 +-
 lua/user/whichkey.lua   |  1 +
 6 files changed, 22 insertions(+), 7 deletions(-)

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", "<S-l>", ":bnext<CR>", opts)
 keymap("n", "<S-h>", ":bprevious<CR>", opts)
 
 -- Move text up and down
-keymap("n", "<A-j>", "<Esc>:m .+1<CR>==gi", opts)
-keymap("n", "<A-k>", "<Esc>:m .-2<CR>==gi", opts)
+keymap("n", "<C-A-j>", "<Esc>:m .+1<CR>==gi", opts)
+keymap("n", "<C-A-k>", "<Esc>:m .-2<CR>==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', '<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-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
 
 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"] = { "<cmd>Telescope live_grep theme=ivy<cr>", "Find Text" },
   ["P"] = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" },
+  ["r"] = { "<cmd>Telescope command_history<CR>", "Command History" },
 
   p = {
     name = "Packer",