changed themes

7 files changed, 44 insertions, 39 deletions

diff --git a/after/ftplugin/javascript.lua b/after/ftplugin/javascript.lua
index abd4d87..d410660 100644
--- a/after/ftplugin/javascript.lua
+++ b/after/ftplugin/javascript.lua
@@ -1 +1 @@
-require('conftool').set({'tabstop', 2},{'shiftwidth', 2})
+require('conftool').set({'tabstop', 4},{'shiftwidth', 4})
diff --git a/after/ftplugin/markdown.lua b/after/ftplugin/markdown.lua
new file mode 100644
index 0000000..fb5cb00
--- /dev/null
+++ b/after/ftplugin/markdown.lua
@@ -0,0 +1 @@
+require('conftool').set({'tabstop', 5},{'shiftwidth', 5})
diff --git a/ginit.vim b/ginit.vim
index 60af804..51b89e8 100644
--- a/ginit.vim
+++ b/ginit.vim
@@ -21,7 +21,7 @@ endif
 
 "" parameters
 let s:defaultfontsize = 10
-let s:fontname = "Roboto Mono [GOOG]"
+let s:fontname = "RobotoMono Nerd Font [GOOG]"
 
 "" set default font
 :execute "Guifont " . s:fontname . ":h" . s:defaultfontsize
diff --git a/lua/misc.lua b/lua/misc.lua
index 467524b..9113b13 100644
--- a/lua/misc.lua
+++ b/lua/misc.lua
@@ -33,8 +33,8 @@ ct.set({'spellsuggest', {'best', 5}})
 --
 vim.g.netrw_liststyle = 3 -- tree style display
 vim.g.netrw_banner = 0 -- no banner needed
-vim.g.netrw_browse_split = 0
-vim.g.netrw_chgwin = 1
+vim.g.netrw_browse_split = 4
+-- vim.g.netrw_chgwin = 1
 
 --
 -- EtC.
diff --git a/lua/plugins/10_ide.lua b/lua/plugins/10_ide.lua
index 382a0d7..dc355d8 100644
--- a/lua/plugins/10_ide.lua
+++ b/lua/plugins/10_ide.lua
@@ -76,6 +76,11 @@ return {
 				color = {
 					enabled = true,
 				},
+				on_attach = function(client, bufnr)
+					local basics = require('lsp_basics')
+					basics.make_lsp_commands(client, bufnr)
+					basics.make_lsp_mappings(client, bufnr)
+				end,
 			},
 		},
 	},
diff --git a/lua/plugins/50_ui.lua b/lua/plugins/50_ui.lua
index 10bef97..798bfb5 100644
--- a/lua/plugins/50_ui.lua
+++ b/lua/plugins/50_ui.lua
@@ -2,37 +2,35 @@ return {
 	--
 	-- Theme
 	--
-	--{
-	--	'navarasu/onedark.nvim',
-	--	lazy = false,
-	--	opts = {
-	--		style = 'darker',
-	--		toggle_style_key = '<leader>c',
-	--		toggle_style_list = {'warmer', 'light'},
-	--	},
-	--	config = function()
-	--		local ct = require('conftool')
-	--		-- ct.set({'background', 'dark'})
-	--		vim.cmd [[colo onedark]]
-	--	end,
-	--	--[[  keys = {
-	--		{
-	--			'<Leader>c',
-	--			function()
-	--				if vim.o.background == 'light' then
-	--					vim.o.background = 'dark'
-	--				else
-	--					vim.o.background = 'light'
-	--					-- vim.api.nvim_set_hl(0, 'ColorColumn', {bg = '#c0bfbc'})
-	--					vim.cmd('redraw')
-	--					vim.cmd('redraw')
-	--				end
-	--			end,
-	--			desc = 'toggle color themes'
-	--		},
-	--	}, --]]
+	{
+		'navarasu/onedark.nvim',
+		lazy = false,
+		opts = {
+			style = 'darker',
+			toggle_style_key = '<leader>c',
+			toggle_style_list = {'darker', 'light'},
+		},
+		config = function()
+			require('onedark').load()
+		end,
+		--[[  keys = {
+			{
+				'<Leader>c',
+				function()
+					if vim.o.background == 'light' then
+						vim.o.background = 'dark'
+					else
+						vim.o.background = 'light'
+						-- vim.api.nvim_set_hl(0, 'ColorColumn', {bg = '#c0bfbc'})
+						vim.cmd('redraw')
+						vim.cmd('redraw')
+					end
+				end,
+				desc = 'toggle color themes'
+			},
+		}, --]]
 
-	--},
+	},
 
 	--
 	-- Indentation
diff --git a/lua/plugins/90_misc.lua b/lua/plugins/90_misc.lua
index ade41ea..e9ffd26 100644
--- a/lua/plugins/90_misc.lua
+++ b/lua/plugins/90_misc.lua
@@ -2,10 +2,10 @@ return {
 	--
 	-- Focus Mode
 	--
-	{
-		'junegunn/goyo.vim',
-		cmd = 'Goyo'
-	},
+	-- {
+	-- 	'junegunn/goyo.vim',
+	-- 	cmd = 'Goyo'
+	-- },
 
 	--
 	-- Multi-cursor
@@ -14,6 +14,7 @@ return {
 	-- 	'mg979/vim-visual-multi',
 	-- 	lazy = false
 	-- },
-	{ 'Raimondi/delimitMate', lazy = false }
+	{ 'Raimondi/delimitMate', lazy = false },
+	{'tpope/vim-sleuth', lazy = false },
 }