From 77e7273c570713e710a53ad42bd6f15fd25f49bd Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 4 Jul 2025 10:30:06 +0100
Subject: [PATCH] Fix keybindings

---
 .config/nvim/after/plugin/colors.lua |   4 ++
 .config/nvim/init.vim.bak            | 102 ---------------------------
 .config/nvim/lua/keybindings.lua     |  15 ++--
 3 files changed, 12 insertions(+), 109 deletions(-)
 delete mode 100644 .config/nvim/init.vim.bak

diff --git a/.config/nvim/after/plugin/colors.lua b/.config/nvim/after/plugin/colors.lua
index e69de29..0740645 100644
--- a/.config/nvim/after/plugin/colors.lua
+++ b/.config/nvim/after/plugin/colors.lua
@@ -0,0 +1,4 @@
+vim.cmd([[
+    set termguicolors
+    colorscheme dracula
+]])
\ No newline at end of file
diff --git a/.config/nvim/init.vim.bak b/.config/nvim/init.vim.bak
deleted file mode 100644
index 2eef270..0000000
--- a/.config/nvim/init.vim.bak
+++ /dev/null
@@ -1,102 +0,0 @@
-let mapleader = " "
-let g:copilot_enabled = v:false
-
-set nocompatible
-set showmatch
-set ignorecase
-set mouse=v
-set hlsearch
-set incsearch
-set tabstop=4
-set softtabstop=4
-set expandtab
-set shiftwidth=4
-set autoindent
-set number
-set relativenumber
-set wildmode=longest,list
-set cc=80
-filetype plugin indent on
-syntax on
-set mouse=a
-set clipboard=unnamedplus
-filetype plugin on
-set cursorline
-set ttyfast
-set nofixeol
-
-let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
-if empty(glob(data_dir . '/autoload/plug.vim'))
-  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-
-call plug#begin("~/.vim/plugged")
-    Plug 'dracula/vim'
-    Plug 'ryanoasis/vim-devicons'
-    " Plug 'SirVer/ultisnips'
-    Plug 'honza/vim-snippets'
-    Plug 'scrooloose/nerdtree'
-    Plug 'preservim/nerdcommenter'
-    Plug 'mhinz/vim-startify'
-    Plug 'neoclide/coc.nvim', {'branch': 'release'}
-    Plug 'nvim-lua/plenary.nvim'
-    Plug 'ThePrimeagen/harpoon'
-    Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-    Plug 'junegunn/fzf.vim'
-    Plug 'neovim/nvim-lspconfig'
-    Plug 'jose-elias-alvarez/null-ls.nvim'
-    Plug 'MunifTanjim/prettier.nvim'
-    Plug 'OmniSharp/omnisharp-vim'
-call plug#end()
-
-if (has("termguicolors"))
-    set termguicolors
-endif
-syntax enable
-colorscheme dracula
-
-set splitright
-set splitbelow
-
-inoremap <A-j> <Esc>:m .+1<CR>==gi
-inoremap <A-k> <Esc>:m .-2<CR>==gi
-vnoremap <A-j> :m '>+1<CR>gv=gv
-vnoremap <A-k> :m '<-2<CR>gv=gv
-
-nnoremap <A-h> <C-W>H
-nnoremap <A-j> <C-W>J
-nnoremap <A-k> <C-W>K
-nnoremap <A-l> <C-W>L
-
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-
-nnoremap gf :vert winc f<cr>
-
-inoremap <silent><expr> <cr> coc#pum#visible() ? coc#_select_confirm() : "\<C-g>u\<CR>"
-inoremap <expr> <Tab> coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"
-inoremap <expr> <S-Tab> coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"
-
-nnoremap <leader>n :NERDTreeFocus<CR>
-nnoremap <C-n> :NERDTree<CR>
-nnoremap <C-t> :NERDTreeToggle<CR>
-nnoremap <C-f> :NERDTreeFind<CR>
-nnoremap <leader>ee :Ex<CR>
-
-nnoremap <leader>ha <cmd>lua require("harpoon.mark").add_file()<CR>
-nnoremap <leader>hh <cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>
-nnoremap <leader>1 <cmd>lua require("harpoon.ui").nav_file(1)<CR>
-nnoremap <leader>2 <cmd>lua require("harpoon.ui").nav_file(2)<CR>
-nnoremap <leader>3 <cmd>lua require("harpoon.ui").nav_file(3)<CR>
-nnoremap <leader>4 <cmd>lua require("harpoon.ui").nav_file(4)<CR>
-nnoremap <A-[> <cmd>lua require("harpoon.ui").nav_prev()<CR>
-nnoremap <A-]> <cmd>lua require("harpoon.ui").nav_next()<CR>
-
-nnoremap <leader>ff :FZF<CR>
-
-nnoremap mm :nohl<CR>
-nnoremap ml :%s/\r//g<CR>
-
diff --git a/.config/nvim/lua/keybindings.lua b/.config/nvim/lua/keybindings.lua
index 76bd697..50a0b6c 100644
--- a/.config/nvim/lua/keybindings.lua
+++ b/.config/nvim/lua/keybindings.lua
@@ -7,7 +7,8 @@ function map(mode, lhs, rhs, opts)
     vim.keymap.set(mode, lhs, rhs, options)
 end
 
-local opts = { silent = true, noremap = true, expr = true }
+local opts = { silent = true, noremap = true }
+local optsExpr = { silent = true, noremap = true, expr = true }
 
 -- Move Lines Up/Down
 map("i", "<A-j>", "<Esc>:m .+1<CR>==gi", opts)
@@ -27,17 +28,17 @@ map("n", "<C-l>", "<C-w>l", opts)
 
 map("n", "gf", ":vert winc f<cr>", opts)
 
-map("i", "<cr>", [[coc#pum#visible() ? coc#_select_confirm() : "\<C-g>u\<CR>"]], opts)
-map("i", "<Tab>", [[coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"]], opts)
-map("i", "<S-Tab>", [[coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"]], opts)
+map("i", "<cr>", [[coc#pum#visible() ? coc#_select_confirm() : "\<C-g>u\<CR>"]], optsExpr)
+map("i", "<Tab>", [[coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"]], optsExpr)
+map("i", "<S-Tab>", [[coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"]], optsExpr)
 
 map("n", "<leader>n", ":NERDTreeFocus<CR>", opts)
 map("n", "<C-n>", ":NERDTree<CR>", opts)
 map("n", "<C-t>", ":NERDTreeToggle<CR>", opts)
 map("n", "<C-f>", ":NERDTreeFind<CR>", opts)
 
-map("n", "<leader>ha", function() require("harpoon.mark").add_file() end, opts)
-map("n", "<leader>hh", function() require("harpoon.ui").toggle_quick_menu() end, opts)
+map("n", "<leader>ha", [[<cmd>lua require("harpoon.mark").add_file()<CR>]], opts)
+map("n", "<leader>hh", [[<cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>]], opts)
 map("n", "<leader>1", [[<cmd>lua require("harpoon.ui").nav_file(1)<CR>]], opts)
 map("n", "<leader>2", [[<cmd>lua require("harpoon.ui").nav_file(2)<CR>]], opts)
 map("n", "<leader>3", [[<cmd>lua require("harpoon.ui").nav_file(3)<CR>]], opts)
@@ -45,6 +46,6 @@ map("n", "<leader>4", [[<cmd>lua require("harpoon.ui").nav_file(4)<CR>]], opts)
 map("n", "<A-[>", [[<cmd>lua require("harpoon.ui").nav_prev()<CR>]], opts)
 map("n", "<A-]>", [[<cmd>lua require("harpoon.ui").nav_next()<CR>]], opts)
 
-map("n", "<leader>ff", require("fzf-lua").files, opts)
+map("n", "<leader>ff", [[<Cmd>lua require"fzf-lua".files()<CR>]], opts)
 
 map("n", "mm", ":nohl<CR>", opts)
\ No newline at end of file