Removing more things/snap/bin/nvim --version

init.lua

@@ -14,79 +14,25 @@ if not vim.loop.fs_stat(lazypath) then
   })
 end
 vim.opt.rtp:prepend(lazypath)
-require("lazy").setup("plugins")
 
 -- SET NEOVIM THEME --
 vim.o.termguicolors = true
 -- vim.cmd "let g:everforest_background = 'hard'"
-vim.cmd.colorscheme('nordfox')
+-- vim.cmd.colorscheme('sistine')
+vim.o.background = "dark"
+
+-- Load Plugins
+require("lazy").setup("plugins")
+vim.cmd.colorscheme('everforest')
+
+vim.keymap.set("n", "<leader>ct", "<cmd>Telescope colorscheme<CR>")
 
 -- LSP --
 vim.o.winborder = 'rounded'
 vim.lsp.enable({'intelephense'})
-vim.lsp.enable({'drupal-lsp'})
 vim.lsp.enable({'rust_analyzer'})
 vim.lsp.enable({'elixirls'})
 vim.lsp.enable({'lexical'})
 vim.keymap.set("n", "K", vim.lsp.buf.hover, {})
 vim.keymap.set("n", "gd", vim.lsp.buf.definition, {})
 vim.keymap.set({ "n" }, "<leader>ca", vim.lsp.buf.code_action, {})
-
--- XDEBUG --
-local dap = require('dap')
-require('telescope').load_extension('dap')
-dap.adapters.php = {
-  type = "executable",
-  command = "node",
-  args = { os.getenv("HOME") .. "/vscode-php-debug/out/phpDebug.js" }
-}
-dap.configurations.php = {
-  {
-    type = "php",
-    request = "launch",
-    name = "Listen for Xdebug",
-    port = 9003,
-    log = true,
-  },
-  {
-    name = "listen for Xdebug docker",
-    type = "php",
-    request = "launch",
-    port = 9003,
-    log = true,
-    -- this is where your file is in the container
-    pathMappings = {
-      ["/var/www/html/web"] = "${workspaceFolder}"
-    }
-  }
-}
-
-vim.fn.sign_define('DapBreakpoint',{ text ='🟥', texthl ='', linehl ='', numhl =''})
-vim.fn.sign_define('DapStopped',{ text ='▶️', texthl ='', linehl ='', numhl =''})
-vim.keymap.set('n', '<leader>?', function() dap.continue() end)
-vim.keymap.set('n', '<leader>N', function() dap.step_over() end)
-vim.keymap.set('n', '<leader>n', function() dap.step_into() end)
-vim.keymap.set('n', '<leader>E', function() dap.step_out() end)
-vim.keymap.set('n', '<leader>b', function() dap.toggle_breakpoint() end)
-vim.keymap.set('n', '<leader>B', function() dap.set_breakpoint() end)
-vim.keymap.set('n', '<leader>dr', function() dap.repl.open() end)
-vim.keymap.set('n', '<leader>dl', function() dap.run_last() end)
-vim.keymap.set('n', '<leader>db', function()
-  local widgets = require('dap.ui.widgets')
-  widgets.centered_float(widgets.scopes)
-end)
-
--- local lspconfig = require 'lspconfig'
--- local configs = require 'lspconfig.configs'
--- if not configs.drupal then
---   configs.drupal = {
---     default_config = {
---       cmd = {'drupal-lsp'},
---       filetypes = {'php', 'module', 'inc', 'theme'},
---       root_dir = function(fname)
---         return lspconfig.util.root_pattern('composer.json', '.git')(fname)
---       end
---     };
---   }
--- end
--- lspconfig.drupal.setup{ autostart = true }

lazy-lock.json

@@ -1,35 +1,40 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" },
+  "LuaSnip": { "branch": "master", "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9" },
   "ahoy.nvim": { "branch": "main", "commit": "a08ced2a95ac9e0b8cf7048d9daa7c39756b8261" },
+  "barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
-  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "everforest": { "branch": "master", "commit": "ffa5a2032fd41903135fa829bd4b49ba2e1d5d18" },
+  "everforest": { "branch": "master", "commit": "3fffb096f6ac11372944ac964c60f8af41d8809f" },
+  "gitsigns.nvim": { "branch": "main", "commit": "23ae90a2a52fdc9b8c50dc61d6c30ebb18521343" },
   "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" },
-  "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "lazygit.nvim": { "branch": "main", "commit": "2305deed25bc61b866d5d39189e9105a45cf1cfb" },
-  "lualine.nvim": { "branch": "master", "commit": "ecfcfee812ef4fee1e86ae8f315c4a045f7da719" },
+  "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "ce0e87c0be12e7c48296a7513e90430e3eac7f24" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
+  "markview.nvim": { "branch": "main", "commit": "3b9ad1ef6527c220b9b6b0c0d7694c74a95524f4" },
-  "mason.nvim": { "branch": "main", "commit": "9eaedb864cdadc29c6eb7d761a6c0d8aee26c91b" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f760507df8c49a4bf46a4d12e1fc616797508979" },
-  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" },
+  "mason.nvim": { "branch": "main", "commit": "b3689a41dd77e5294498dba9757fb22cc80cbebd" },
+  "mini.icons": { "branch": "main", "commit": "e8fae66cb400744daeedf6e387347df50271c252" },
   "nightfox": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
+  "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
+  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
+  "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
+  "nvim-web-devicons": { "branch": "master", "commit": "f6b0920f452bfd7595ee9a9efe5e1ae78e0e2997" },
-  "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
+  "oil.nvim": { "branch": "master", "commit": "919e155fdf38e9148cdb5304faaaf53c20d703ea" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
+  "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
-  "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
+  "snacks.nvim": { "branch": "main", "commit": "5d9dacd09876eed33bde204d224fa7596ac850e8" },
   "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
   "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
-  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
 }

lsp/drupal.lua

@@ -1,12 +0,0 @@
-return {
-  cmd = {'drupal-lsp'},
-  filetypes = {'php', 'module', 'inc', 'theme'},
-  root_dir = function(bufnr, on_dir)
-    local fname = vim.api.nvim_buf_get_name(bufnr)
-    local cwd = assert(vim.uv.cwd())
-    local root = vim.fs.root(fname, { 'composer.json', '.git' })
-
-    -- prefer cwd if root is a descendant
-    on_dir(root and vim.fs.relpath(cwd, root) and cwd)
-  end,
-}

lua/dan/core.lua

@@ -14,14 +14,17 @@ end)
 vim.keymap.set("n", "-", "<cmd>Oil<CR>")
 vim.keymap.set("n", "<CR>", "<cmd>w!<CR>")
 vim.keymap.set("n", "<leader>nh", "<cmd>noh<CR>")
-vim.keymap.set("n", "<leader>wq", "<cmd>wq!<CR>")
+vim.keymap.set("n", "<leader>sq", "<cmd>wq!<CR>")
+vim.keymap.set("n", "<leader>lg", "<cmd>LazyGit<CR>")
 
 -- Terminal in neovim --
+vim.keymap.set('t', '<C-space>', "<C-\\><C-n><C-w>h",{silent = true})
 vim.api.nvim_create_autocmd('TermOpen', {
   group = vim.api.nvim_create_augroup('open-terminal', { clear = true }),
   callback = function()
     vim.opt.number = false
     vim.opt.relativenumber = false
+    vim.api.nvim_input("i")
   end,
 })
 local job_id = 0
@@ -41,9 +44,16 @@ vim.cmd("set shiftwidth=2")
 vim.cmd("set syntax=on")
 vim.cmd("set number")
 vim.cmd("set nu")
+vim.cmd("set linebreak")
+vim.cmd("set termguicolors")
 -- vim.cmd("set guicursor=n-v-c:block")
 vim.api.nvim_set_option("clipboard","unnamed")
 
+-- Markview
+vim.keymap.set("n", "<leader>mv", function()
+  vim.cmd("Markview splitToggle")
+end)
+
 -- Command to turn off diagnostics, if crowding screen
 vim.api.nvim_create_user_command("DiagnosticsToggle", function()
 	local config = vim.diagnostic.config
@@ -55,3 +65,4 @@ vim.api.nvim_create_user_command("DiagnosticsToggle", function()
 	}
 end, { desc = "toggle diagnostic" })
 vim.keymap.set("n", "<leader>dtog", "<cmd>DiagnosticsToggle<CR>")
+

lua/plugins/ahoy.lua

@@ -1,9 +0,0 @@
-return {
-  -- dir = "/Users/danchadwick/Projects/neovim/ahoy.nvim",
-  "calcu1on/ahoy.nvim",
-  config = function()
-    local ahoy = require('ahoy')
-    vim.keymap.set('n', '<leader>sf', function() ahoy.save_file() end)
-  end
-}
-

lua/plugins/barbar.lua

@@ -0,0 +1,14 @@
+return {
+  'romgrk/barbar.nvim',
+  dependencies = {
+    'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status
+    'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
+  },
+  config = function()
+    local opts = { noremap = true, silent = true }
+    vim.keymap.set("n", "<C-k>", "<cmd>BufferNext<CR>")
+    vim.keymap.set("n", "<C-j>", "<cmd>BufferPrevious<CR>")
+    vim.keymap.set('n', '<C-p>', '<Cmd>BufferPin<CR>')
+    vim.keymap.set('n', '<C-q>', '<Cmd>BufferClose<CR>')
+  end
+}

lua/plugins/colorizer.lua

@@ -0,0 +1,10 @@
+return {
+  "norcalli/nvim-colorizer.lua",
+  config = function()
+    require("colorizer").setup({
+      'css',
+      'scss',
+      'javascript',
+    })
+  end,
+}

lua/plugins/fugitive.lua

@@ -1,9 +0,0 @@
-return {
-  "tpope/vim-fugitive",
-  config = function()
-    vim.keymap.set("n", "<leader>gs", "<cmd>Git<CR>")
-    vim.keymap.set("n", "<leader>gvd", "<cmd>Gvdiff<CR>")
-    vim.keymap.set("n", "<leader>gc", "<cmd>Git commit<CR>")
-    vim.keymap.set("n", "<leader>gp", "<cmd>Git push<CR>")
-  end
-}

lua/plugins/lazygit.lua

@@ -1,6 +0,0 @@
-return {
-  "kdheepak/lazygit.nvim",
-  dependencies = {
-    "nvim-lua/plenary.nvim",
-  }
-}

lua/plugins/nightfox.lua

@@ -1,5 +0,0 @@
-return {
-  "EdenEast/nightfox.nvim",
-  priority = 1000,
-  name = "nightfox",
-}

lua/plugins/rosepine.lua

@@ -0,0 +1,4 @@
+return {
+	"rose-pine/neovim",
+	name = "rose-pine",
+}

lua/plugins/snacks.lua

@@ -5,6 +5,10 @@ return {
     picker = {
       ignored = true,
       hidden = true,
+      exclude = {
+        ".git",
+        ".DS_Store",
+      }
     },
     explorer = {},
     indent = {},

lua/plugins/supermaven.lua

@@ -1,6 +0,0 @@
-return {
-  "supermaven-inc/supermaven-nvim",
-  config = function()
-    require("supermaven-nvim").setup({})
-  end,
-}

lua/plugins/telescope.lua

@@ -29,11 +29,5 @@ return {
       -- load_extension, somewhere after setup function:
       require("telescope").load_extension("ui-select")
     end
-  },
-  {
-    "nvim-telescope/telescope-dap.nvim",
-    config = function()
-      require('telescope').load_extension('dap')
-    end
   }
 }

lua/plugins/treesitter.lua

@@ -9,6 +9,10 @@ return  {
       highlight = { enable = true },
       indent = { enable = true },
     })
-  end
+  end,
+  dependencies = {
+    "OXY2DEV/markview.nvim" 
+  },
+  lazy = false
 }
 

lua/plugins/xdebug.lua

@@ -1,29 +0,0 @@
-return {
-  {
-    'mfussenegger/nvim-dap',
-  },
-  {
-    "jay-babu/mason-nvim-dap.nvim",
-    config = function()
-      require("mason-nvim-dap").setup({
-        ensure_installed = { "php-debug-adapter" }
-      })
-    end
-  },
-  {
-    'theHamsta/nvim-dap-virtual-text',
-    config = function()
-      require("nvim-dap-virtual-text").setup()
-    end
-  },
-  {
-    "rcarriga/nvim-dap-ui",
-    dependencies = {
-      "mfussenegger/nvim-dap",
-      "nvim-neotest/nvim-nio"
-    },
-    config = function()
-      require("dapui").setup()
-    end
-  }
-}