Update dotfiles

3 files changed, 40 insertions, 18 deletions

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index ee7985f..c884f45 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,3 +1,6 @@
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @resurrect-capture-pane-contents 'on'
+
 bind-key Up select-pane -U
 bind-key Down select-pane -D
 bind-key Left select-pane -L
@@ -41,3 +44,9 @@ set-window-option -g mode-keys vi
 set -g mouse on 
 
 set-option -g history-limit 60000
+
+set -g default-terminal 'tmux-256color'
+set -as terminal-overrides ',xterm*:Tc:sitm=\E[3m'
+
+run '~/.tmux/plugins/tpm/tpm'
+
diff --git a/vim/nvim/init.lua b/vim/nvim/init.lua
index 4d252b8..e830296 100644
--- a/vim/nvim/init.lua
+++ b/vim/nvim/init.lua
@@ -7,6 +7,7 @@ syntax on
 
 set number
 highlight LineNr ctermfg=darkgrey
+highlight NormalFloat ctermbg=NONE
 
 filetype plugin indent on
 set tabstop=4
@@ -15,8 +16,13 @@ set expandtab
 
 set signcolumn=number
 let g:airline_theme='lucius'
+set termguicolors
+colorscheme darcula-solid
+
+highlight Comment cterm=italic gui=italic
 ]],
 false)
+-- 
 
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
@@ -99,8 +105,8 @@ vim.diagnostic.config({
     float = {
         show_header = true,
         source = 'if_many',
-        border = 'rounded',
         focusable = false,
+        transparent = true,
     },
     update_in_insert = true, -- default to false
     severity_sort = false, -- default to false
@@ -110,10 +116,10 @@ vim.api.nvim_exec([[ autocmd InsertEnter * :lua vim.diagnostic.config({virtual_t
 vim.api.nvim_exec([[ autocmd InsertLeave * :lua vim.diagnostic.config({virtual_text = false}) ]], false)
 vim.api.nvim_exec([[ autocmd CursorMoved * :lua vim.diagnostic.open_float({ silent=true }) ]], false)
 
-vim.api.nvim_set_hl(0, 'FloatBorder', {bg='None', fg='#FFFFFF'})
-vim.api.nvim_set_hl(0, 'NormalFloat', {bg='#3B4252'})
-vim.api.nvim_set_hl(0, 'TelescopeNormal', {bg='#3B4252'})
-vim.api.nvim_set_hl(0, 'TelescopeBorder', {bg='#3B4252'})
+-- vim.api.nvim_set_hl(0, 'FloatBorder', {bg='None', fg='#FFFFFF'})
+-- vim.api.nvim_set_hl(0, 'NormalFloat', {bg='#3B4252'})
+-- vim.api.nvim_set_hl(0, 'TelescopeNormal', {bg='#3B4252'})
+-- vim.api.nvim_set_hl(0, 'TelescopeBorder', {bg='#3B4252'})
 
 local luasnip = require 'luasnip'
 
@@ -166,8 +172,8 @@ cmp.setup {
     })
   },
   window = {
-    completion = cmp.config.window.bordered(),
-    documentation = cmp.config.window.bordered()
+	documentation = cmp.config.window.bordered(),
+	completion = cmp.config.window.bordered(),
   },
 }
 
@@ -216,3 +222,10 @@ for type, icon in pairs(signs) do
   local hl = "DiagnosticSign" .. type
   vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
 end
+
+require'nvim-treesitter.configs'.setup {
+  highlight = {
+    enable = true,
+    additional_vim_regex_highlighting = { "haskell" },
+  },
+}
diff --git a/vim/nvim/lua/plugins.lua b/vim/nvim/lua/plugins.lua
index a9d98c9..134d669 100644
--- a/vim/nvim/lua/plugins.lua
+++ b/vim/nvim/lua/plugins.lua
@@ -4,21 +4,21 @@ return require('packer').startup(function(use)
   use 'vim-airline/vim-airline-themes'
   use 'neovim/nvim-lspconfig'
   use {'quick-lint/quick-lint-js', rtp = 'plugin/vim/quick-lint-js.vim', tag = '2.10.0', opt = true}
-  use 'hrsh7th/nvim-cmp' -- Autocompletion plugin
-  use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp
-  use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp
+  use 'hrsh7th/nvim-cmp'
+  use 'hrsh7th/cmp-nvim-lsp' 
+  use 'saadparwaiz1/cmp_luasnip' 
   use 'onsails/lspkind.nvim'
-  use 'L3MON4D3/LuaSnip' -- Snippets plugin
+  use 'L3MON4D3/LuaSnip' 
   use {
-    "folke/trouble.nvim",
-    requires = "kyazdani42/nvim-web-devicons",
+    'folke/trouble.nvim',
+    requires = 'kyazdani42/nvim-web-devicons',
     config = function()
-      require("trouble").setup {
-        -- your configuration comes here
-        -- or leave it empty to use the default settings
-        -- refer to the configuration section below
+      require('trouble').setup {
+
       }
     end
   }
-  use "p00f/clangd_extensions.nvim"
+  use 'p00f/clangd_extensions.nvim'
+  use 'nvim-treesitter/nvim-treesitter'
+  use { "briones-gabriel/darcula-solid.nvim", requires = "rktjmp/lush.nvim" }
 end)