3 files changed, 61 insertions, 135 deletions

diff --git a/lua/config/editor.lua b/lua/config/editor.lua
index eec0e08..0649006 100644
--- a/lua/config/editor.lua
+++ b/lua/config/editor.lua
@@ -1,10 +1,6 @@
-local js_based_languages = { "typescript", "javascript", "typescriptreact", "javascriptreact" }
 local option = vim.opt
 local keymap = vim.keymap
 
-local telescope = require("telescope.builtin")
-local autotag = require("nvim-ts-autotag").setup()
-
 --Basic Editor Setup
 option.nu = true
 option.tabstop = 2
@@ -21,13 +17,15 @@ option.laststatus = 0
 option.signcolumn = "number"
 option.autoindent = true
 option.clipboard = "unnamedplus"
-option.termguicolors = true
+option.termguicolors = false
+option.fillchars = 'eob: '
 
 -- Setup Editor Theme
-vim.cmd.colorscheme("tokyonight")
 vim.cmd([[
 highlight GitGutterAdd ctermbg=none
 highlight GitGutterAdd guibg=none
+highlight NonText guifg=none
+highlight EndOfBuffer ctermfg=none ctermbg=none
 highlight Normal ctermbg=none
 highlight Normal guibg=none
 highlight signcolumn ctermbg=none
@@ -62,7 +60,6 @@ highlight DiagnosticVirtualTextHint ctermbg=none
 highlight DiagnosticVirtualTextHint guibg=none
 ]])
 
-
 -- run specific commands after different file extensions
 vim.cmd([[
 augroup RunPfOnSave
@@ -83,21 +80,7 @@ vim.g.gitgutter_set_sign_backgrounds = 1
 --Keybinds
 vim.g.mapleader = " "
 keymap.set("n", "<leader>e", vim.cmd.Ex)
-keymap.set("n", "<leader>f", telescope.find_files, {})
-keymap.set("n", "<leader>fg", telescope.live_grep, {})
-keymap.set("n", "<leader>fb", telescope.buffers, {})
-keymap.set("n", "<leader>fh", telescope.help_tags, {})
 keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
 keymap.set("n", "<leader>a", "ggVG")
 keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-
---Treesitter
-require("nvim-treesitter.configs").setup({
-        ensure_installed = { "javascript", "typescript", "rust", "c", "lua", "vim" },
-        sync_install = false,
-        auto_install = true,
-        highlight = {
-                enable = true,
-        },
-})
diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua
index ca341d5..7fd0ddb 100644
--- a/lua/config/lsp.lua
+++ b/lua/config/lsp.lua
@@ -1,64 +1,64 @@
 -- local lsp = require('lsp-zero')
 
-local lsp_zero = require("lsp-zero")
-local cmp = require("cmp")
-require("luasnip.loaders.from_vscode").lazy_load()
+--local lsp_zero = require("lsp-zero")
+--local cmp = require("cmp")
+--require("luasnip.loaders.from_vscode").lazy_load()
 
-lsp_zero.preset("recommended")
-lsp_zero.setup()
-lsp_zero.on_attach(function(client_id, bufnr)
-        lsp_zero.default_keymaps({ buffer = bufnr })
-end)
+--lsp_zero.preset("recommended")
+--lsp_zero.setup()
+--lsp_zero.on_attach(function(client_id, bufnr)
+--      lsp_zero.default_keymaps({ buffer = bufnr })
+--end)
 
-require("mason").setup({})
-require("mason-lspconfig").setup({
-        ensure_installed = { "clangd", "rust_analyzer" },
-        handlers = {
-                lsp_zero.default_setup,
-        },
-})
+--require("mason").setup({})
+--require("mason-lspconfig").setup({
+--      ensure_installed = { "clangd", "rust_analyzer" },
+--      handlers = {
+--              lsp_zero.default_setup,
+--      },
+--})
 
-cmp.setup({
-        snippet = {
-                expand = function(args)
-                        require("luasnip").lsp_expand(args.body)
-                end,
-        },
-        window = {},
-        mapping = cmp.mapping.preset.insert({
-                ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-                ["<C-f>"] = cmp.mapping.scroll_docs(4),
-                ["<C-Space>"] = cmp.mapping.complete(),
-                ["<C-e>"] = cmp.mapping.abort(),
-                ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-        }),
-        sources = cmp.config.sources({
-                { name = "nvim_lsp" },
-                { name = "luasnip" },
-        }, {
-                { name = "buffer" },
-        }),
-})
+--cmp.setup({
+--      snippet = {
+--              expand = function(args)
+--                      require("luasnip").lsp_expand(args.body)
+--              end,
+--      },
+--      window = {},
+--      mapping = cmp.mapping.preset.insert({
+--              ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+--              ["<C-f>"] = cmp.mapping.scroll_docs(4),
+--              ["<C-Space>"] = cmp.mapping.complete(),
+--              ["<C-e>"] = cmp.mapping.abort(),
+--              ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+--      }),
+--      sources = cmp.config.sources({
+--              { name = "nvim_lsp" },
+--              { name = "luasnip" },
+--      }, {
+--              { name = "buffer" },
+--      }),
+--})
 
-function PrintDiagnostics(opts, bufnr, line_nr, client_id)
-        bufnr = bufnr or 0
-        line_nr = line_nr or (vim.api.nvim_win_get_cursor(0)[1] - 1)
-        opts = opts or { ["lnum"] = line_nr }
+--function PrintDiagnostics(opts, bufnr, line_nr, client_id)
+--      bufnr = bufnr or 0
+--      line_nr = line_nr or (vim.api.nvim_win_get_cursor(0)[1] - 1)
+--      opts = opts or { ["lnum"] = line_nr }
+--
+--      local line_diagnostics = vim.diagnostic.get(bufnr, opts)
+--      if vim.tbl_isempty(line_diagnostics) then
+--              return
+--      end
+--
+--      local diagnostic_message = ""
+--      for i, diagnostic in ipairs(line_diagnostics) do
+--              diagnostic_message = diagnostic_message .. string.format("%d: %s", i, diagnostic.message or "")
+--              print(diagnostic_message)
+--              if i ~= #line_diagnostics then
+--                      diagnostic_message = diagnostic_message .. "\n"
+--              end
+--      end
+--      vim.api.nvim_echo({ { diagnostic_message, "Normal" } }, false, {})
+--end
 
-        local line_diagnostics = vim.diagnostic.get(bufnr, opts)
-        if vim.tbl_isempty(line_diagnostics) then
-                return
-        end
-
-        local diagnostic_message = ""
-        for i, diagnostic in ipairs(line_diagnostics) do
-                diagnostic_message = diagnostic_message .. string.format("%d: %s", i, diagnostic.message or "")
-                print(diagnostic_message)
-                if i ~= #line_diagnostics then
-                        diagnostic_message = diagnostic_message .. "\n"
-                end
-        end
-        vim.api.nvim_echo({ { diagnostic_message, "Normal" } }, false, {})
-end
-
-vim.cmd([[ autocmd! CursorHold * lua PrintDiagnostics() ]])
+--vim.cmd([[ autocmd! CursorHold * lua PrintDiagnostics() ]])
diff --git a/lua/config/packer.lua b/lua/config/packer.lua
deleted file mode 100644
index 07a600a..0000000
--- a/lua/config/packer.lua
+++ /dev/null
@@ -1,57 +0,0 @@
-vim.cmd([[packadd packer.nvim]])
-return require("packer").startup(function(use)
-  use("wbthomason/packer.nvim")
-  use("nvim-treesitter/nvim-treesitter")
-  use("neovim/nvim-lspconfig")
-  use("lukas-reineke/indent-blankline.nvim")
-  use("lervag/vimtex")
-  use("folke/tokyonight.nvim")
-  use("airblade/vim-gitgutter")
-  use("jose-elias-alvarez/null-ls.nvim")
-  use("windwp/nvim-ts-autotag")
-  use({
-    "nvim-telescope/telescope.nvim",
-    tag = "0.1.4",
-    requires = { { "nvim-lua/plenary.nvim" } },
-  })
-  use({
-    "VonHeikemen/lsp-zero.nvim",
-    requires = {
-      { "neovim/nvim-lspconfig" },
-      { "williamboman/mason.nvim" },
-      { "williamboman/mason-lspconfig.nvim" },
-      { "hrsh7th/nvim-cmp" },
-      { "hrsh7th/cmp-buffer" },
-      { "hrsh7th/cmp-path" },
-      { "saadparwaiz1/cmp_luasnip" },
-      { "hrsh7th/cmp-nvim-lsp" },
-      { "hrsh7th/cmp-nvim-lua" },
-      { "rafamadriz/friendly-snippets" },
-    },
-  })
-  use({
-    "L3MON4D3/LuaSnip",
-    tag = "v2.*",
-    run = "make install_jsregexp",
-  })
-  use({
-    "numToStr/Comment.nvim",
-    config = function()
-      require("Comment").setup()
-    end,
-  })
-  use({
-    "iamcco/markdown-preview.nvim",
-    run = "cd app && npm install",
-    setup = function()
-      vim.g.mkdp_filetypes = { "markdown" }
-    end,
-    ft = { "markdown" },
-  })
-  use({
-    "windwp/nvim-autopairs",
-    config = function()
-      require("nvim-autopairs").setup({})
-    end,
-  })
-end)