fixs

3 files changed, 55 insertions, 47 deletions

diff --git a/.config/.alacritty.toml b/.config/.alacritty.toml
new file mode 100644
index 0000000..2bdb437
--- /dev/null
+++ b/.config/.alacritty.toml
@@ -0,0 +1,39 @@
+[colors.bright]
+black = "#6a6a6a"
+blue = "#ffaf00"
+cyan = "#00afaf"
+green = "#afd700"
+magenta = "#ffaf00"
+red = "#e74c3c"
+white = "#5f8787"
+yellow = "#f1c40f"
+
+[colors.cursor]
+cursor = "#808080"
+text = "#424242"
+
+[colors.normal]
+black = "#000000"
+blue = "#5fafd7"
+cyan = "#2ecc71"
+green = "#5faf00"
+magenta = "#808080"
+red = "#af005f"
+white = "#f2f2f2"
+yellow = "#f1c40f"
+
+[colors.primary]
+background = "#000000"
+foreground = "#c1c1c1"
+
+[font]
+size = 11.5
+
+[font.normal]
+family = "GitLabMono"
+style = "Regular"
+
+[shell]
+args = ["new"]
+program = "/usr/bin/tmux"
+# program = "/home/santo/.cargo/bin/zellij"
diff --git a/.config/.alacritty.yml b/.config/.alacritty.yml
deleted file mode 100644
index 2603373..0000000
--- a/.config/.alacritty.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-shell:
-  program: /usr/bin/tmux
-  args:
-    - new
-
-font:
-  size: 7
-  normal:
-    # family: DejaVuSansMono
-    # family: UbuntuMono
-    # style: Nerd
-    family: FiraMono
-    style: Normal
-
-colors:
-  primary:
-    background: "0x000000"
-    foreground: "0xc1c1c1"
-
-  cursor:
-    text: "0x424242"
-    cursor: "0x808080"
-
-  normal:
-    black: "0x080808"
-    red: "0xaf005f"
-    green: "0x5faf00"
-    yellow: "0xf1c40f"
-    blue: "0x5fafd7"
-    magenta: "0x808080"
-    cyan: "0x2ecc71"
-    white: "0xf2f2f2"
-
-  bright:
-    black: "0x6a6a6a"
-    red: "0xe74c3c"
-    green: "0xafd700"
-    yellow: "0xf1c40f"
-    blue: "0xffaf00"
-    magenta: "0xffaf00"
-    cyan: "0x00afaf"
-    white: "0x5f8787"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 74227f5..0c32012 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -22,7 +22,7 @@ Plug 'togglebyte/togglerust' " Debug Rust projects
 
 Plug 'chriskempson/base16-vim'
 
-Plug 'editorconfig/editorconfig-vim'
+" Plug 'editorconfig/editorconfig-vim'
 
 if has('nvim')
     Plug 'nvim-telescope/telescope.nvim'
@@ -44,9 +44,6 @@ if has('nvim')
     Plug 'folke/lsp-colors.nvim'
 
     Plug 'sindrets/diffview.nvim'
-
-    " Used as light theme
-    Plug 'yorik1984/newpaper.nvim'
 endif
 
 
@@ -102,6 +99,9 @@ set noswapfile
 set termguicolors
 set background=dark
 
+" copy with `y` to clipboard
+set clipboard+=unnamedplus
+
 if has('nvim')
     let base16colorspace=256
     colorscheme base16-irblack
@@ -109,8 +109,12 @@ if has('nvim')
     highlight LineNr guibg=NONE
     highlight CursorLine guibg=NONE
     highlight CursorLineNr guibg=NONE guifg=YELLOW
-    highlight StatusLine guibg=#111111 guifg=YELLOW
+    highlight StatusLine guibg=NONE guifg=YELLOW
     highlight StatusLineNC guibg=NONE guifg=#dddddd
+    highlight SignColumn guibg=NONE
+    highlight GitGutterChange guibg=NONE
+    highlight GitGutterAdd guibg=NONE
+    highlight GitGutterDelete guibg=NONE
 
     lua require('git')
     let g:coq_settings = { 'auto_start': v:true }
@@ -131,6 +135,12 @@ if has('nvim')
     ca dc DiffviewClose
     ca dh DiffviewFileHistory
 
+    " Launch gopls when Go files are in use
+    let g:LanguageClient_serverCommands = {
+           \ 'go': ['gopls']
+           \ }
+    " Run gofmt on save
+
     set cursorline " need for Neovim 0.6 for highlight CursorLineNr
 else
     colorscheme gruvbox
@@ -171,6 +181,7 @@ nnoremap k gk
 nnoremap tn :tabnew<cr>
 
 nnoremap <leader>xx :TroubleToggle<cr>
+nnoremap <leader>xf :TodoQuickFix<cr>
 
 " buffers
 nnoremap ]b :bnext<CR>