From 2c9ca86b6a834e1be66678eee78246f8339b3e73 Mon Sep 17 00:00:00 2001
From: jakobst1n <jakob.stendahl@outlook.com>
Date: Thu, 20 Oct 2022 15:34:14 +0200
Subject: Config

---
 Common/i3/Xresources             | 46 ++++++++++++++++++++++++++++++++++++++++
 Common/nvim/init.lua             |  1 -
 Common/nvim/lua/lsp-conf.lua     | 34 +++++++++++++++++++++++++++++
 Common/nvim/lua/plugins-conf.lua | 34 -----------------------------
 Common/nvim/lua/plugins.lua      | 45 +++++++++++++++++++++++++++++++++++++--
 5 files changed, 123 insertions(+), 37 deletions(-)
 create mode 100644 Common/nvim/lua/lsp-conf.lua
 delete mode 100644 Common/nvim/lua/plugins-conf.lua

(limited to 'Common')

diff --git a/Common/i3/Xresources b/Common/i3/Xresources
index 5f8c283..ffd6974 100755
--- a/Common/i3/Xresources
+++ b/Common/i3/Xresources
@@ -43,6 +43,52 @@
 *.color7  : #e5e9f0
 *.color15 : #d1d5dc
 
+
+! -----------
+! Light theme
+! -----------
+!! *.foreground:  #3b2322
+!! *.background:  #dfdbc3
+!! *.cursorColor: #73635a
+!! !
+!! ! Black
+!! *.color0:      #000000
+!! *.color8:      #808080
+!! !
+!! ! Red
+!! *.color1:      #cc0000
+!! *.color9:      #cc0000
+!! !
+!! ! Green
+!! *.color2:      #009600
+!! *.color10:     #009600
+!! !
+!! ! Yellow
+!! *.color3:      #d06b00
+!! *.color11:     #d06b00
+!! !
+!! ! Blue
+!! *.color4:      #0000cc
+!! *.color12:     #0000cc
+!! !
+!! ! Magenta
+!! *.color5:      #cc00cc
+!! *.color13:     #cc00cc
+!! !
+!! ! Cyan
+!! *.color6:      #0087cc
+!! *.color14:     #0087cc
+!! !
+!! ! White
+!! *.color7:      #cccccc
+!! *.color15:     #ffffff
+!! !
+!! ! Bold, Italic, Underline
+!! *.colorBD:     #8e2a19
+!! !*.colorIT:
+!! !*.colorUL:
+
+
 ! ------------------------------------------------------------------------------
 ! Font configuration
 ! ------------------------------------------------------------------------------
diff --git a/Common/nvim/init.lua b/Common/nvim/init.lua
index d3f959a..ee75788 100755
--- a/Common/nvim/init.lua
+++ b/Common/nvim/init.lua
@@ -1,4 +1,3 @@
 require("helper_functions")
 require("basic")
 require('plugins')
-require('plugins-conf')
diff --git a/Common/nvim/lua/lsp-conf.lua b/Common/nvim/lua/lsp-conf.lua
new file mode 100644
index 0000000..0b494a5
--- /dev/null
+++ b/Common/nvim/lua/lsp-conf.lua
@@ -0,0 +1,34 @@
+-- lsp
+require("nvim-lsp-installer").setup()
+local lspconfig = require'lspconfig'
+local coq = require "coq"
+
+-- setup language servers here
+local lsp_flags = {
+  -- This is the default in Nvim 0.7+
+  debounce_text_changes = 150,
+}
+
+local lspconfig = require('lspconfig')
+lspconfig['pyright'].setup{
+    on_attach = on_attach,
+    flags = lsp_flags,
+}
+lspconfig.ccls.setup {
+  single_file_support = true;
+  init_options = {
+    compilationDatabaseDirectory = "build";
+    index = {
+      threads = 0;
+    };
+    clang = {
+      excludeArgs = { "-frounding-math"} ;
+    };
+  }
+}
+
+lspconfig.ccls.setup{}
+lspconfig.intelephense.setup{}
+lspconfig.cssls.setup{}
+lspconfig.html.setup{}
+lspconfig.bashls.setup{}
diff --git a/Common/nvim/lua/plugins-conf.lua b/Common/nvim/lua/plugins-conf.lua
deleted file mode 100644
index 0b494a5..0000000
--- a/Common/nvim/lua/plugins-conf.lua
+++ /dev/null
@@ -1,34 +0,0 @@
--- lsp
-require("nvim-lsp-installer").setup()
-local lspconfig = require'lspconfig'
-local coq = require "coq"
-
--- setup language servers here
-local lsp_flags = {
-  -- This is the default in Nvim 0.7+
-  debounce_text_changes = 150,
-}
-
-local lspconfig = require('lspconfig')
-lspconfig['pyright'].setup{
-    on_attach = on_attach,
-    flags = lsp_flags,
-}
-lspconfig.ccls.setup {
-  single_file_support = true;
-  init_options = {
-    compilationDatabaseDirectory = "build";
-    index = {
-      threads = 0;
-    };
-    clang = {
-      excludeArgs = { "-frounding-math"} ;
-    };
-  }
-}
-
-lspconfig.ccls.setup{}
-lspconfig.intelephense.setup{}
-lspconfig.cssls.setup{}
-lspconfig.html.setup{}
-lspconfig.bashls.setup{}
diff --git a/Common/nvim/lua/plugins.lua b/Common/nvim/lua/plugins.lua
index 0f7adcd..555dad3 100755
--- a/Common/nvim/lua/plugins.lua
+++ b/Common/nvim/lua/plugins.lua
@@ -104,17 +104,58 @@ return require('packer').startup(function(use)
         ]]
       end,
   }
+  -- vim-fugitive (Git commands)
+  use { 'tpope/vim-fugitive' }
   -- Surround
   use { 'tpope/vim-surround' }
 
+  -- Tree-sitter-mysql
+  use { 'PatrickFeiring/tree-sitter-sql' }
+
   -- terryma/vim-multiple-cursors
   -- preservim/nerdcommenter
 
   -- Lsp things
   use 'neovim/nvim-lsp'
-  use 'neovim/nvim-lspconfig'
+  use {
+    'neovim/nvim-lspconfig',
+    config = function()
+      local lsp_flags = {
+        -- This is the default in Nvim 0.7+
+        debounce_text_changes = 150,
+      }
+      local lspconfig = require('lspconfig')
+      lspconfig['pyright'].setup{
+          on_attach = on_attach,
+          flags = lsp_flags,
+      }
+      lspconfig.ccls.setup {
+        single_file_support = true;
+        init_options = {
+          compilationDatabaseDirectory = "build";
+          index = {
+            threads = 0;
+          };
+          clang = {
+            excludeArgs = { "-frounding-math"} ;
+          };
+        }
+      }
+      
+      lspconfig.ccls.setup{}
+      lspconfig.intelephense.setup{}
+      lspconfig.cssls.setup{}
+      lspconfig.html.setup{}
+      lspconfig.bashls.setup{}
+    end,
+  }
   --use 'kabouzeid/nvim-lspinstall'
-  use 'williamboman/nvim-lsp-installer'
+  use {
+    'williamboman/nvim-lsp-installer',
+    config = function()
+
+    end,
+  }
   use 'ms-jpq/coq_nvim'
 
   use 'mfussenegger/nvim-jdtls'
-- 
cgit v1.2.3