refactor, and change colors

4 files changed, 27 insertions, 37 deletions

diff --git a/after/plugin/completition.lua b/after/plugin/cmp.lua
index 8b260d2..ffafe96 100644
--- a/after/plugin/completition.lua
+++ b/after/plugin/cmp.lua
@@ -3,6 +3,8 @@ if not ok then
 	return
 end
 
+local _ = require("alpha.colors")
+
 local lspkind = require("lspkind")
 local luasnip = require("luasnip")
 local cmp_autopairs = require("nvim-autopairs.completion.cmp")
@@ -127,12 +129,3 @@ require("lspconfig")["emmet_ls"].setup({
 	capabilities = capabilities,
 })
 
-local Group = require("colorbuddy.group").Group
-local g = require("colorbuddy.group").groups
-local s = require("colorbuddy.style").styles
-
-Group.new("CmpItemAbbr", g.Comment)
-Group.new("CmpItemAbbrDeprecated", g.Error)
-Group.new("CmpItemAbbrMatchFuzzy", g.CmpItemAbbr.fg:dark(), nil, s.italic)
-Group.new("CmpItemKind", g.Special)
-Group.new("CmpItemMenu", g.NonText)
diff --git a/after/plugin/nightfox.lua b/after/plugin/nightfox.lua
new file mode 100644
index 0000000..beb5c44
--- /dev/null
+++ b/after/plugin/nightfox.lua
@@ -0,0 +1,16 @@
+local ok, nightfox = pcall(require, "nightfox")
+if not ok then
+    return
+end
+
+nightfox.setup({
+  options = {
+    styles = {
+      comments = "italic",
+      keywords = "bold",
+      types = "italic,bold",
+    }
+  }
+})
+
+vim.cmd("colorscheme duskfox")
diff --git a/after/plugin/colors.lua b/lua/alpha/colors.lua
index d6d0d18..6e26311 100644
--- a/after/plugin/colors.lua
+++ b/lua/alpha/colors.lua
@@ -14,3 +14,12 @@ Group.new('NonText' , groups.Comment    , groups.Comment   , groups.Comment)
 
 -- Define highlights in relative terms of other colors
 Group.new('Error'           , colors.red:light() , nil               , styles.bold)
+
+local g = require("colorbuddy.group").groups
+local s = require("colorbuddy.style").styles
+
+Group.new("CmpItemAbbr", g.Comment)
+Group.new("CmpItemAbbrDeprecated", g.Error)
+Group.new("CmpItemAbbrMatchFuzzy", g.CmpItemAbbr.fg:dark(), nil, s.italic)
+Group.new("CmpItemKind", g.Special)
+Group.new("CmpItemMenu", g.NonText)
diff --git a/plugin/colors.vim b/plugin/colors.vim
deleted file mode 100644
index cc04474..0000000
--- a/plugin/colors.vim
+++ /dev/null
@@ -1,28 +0,0 @@
-fun! ColorMyPencils()
-    " let g:gruvbox_contrast_dark = 'hard'
-    " let g:gruvbox_bold = 0
-    if exists('+termguicolors')
-        let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
-        let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
-    endif
-
-    set background=dark
-    colorscheme nightfox
-
-    " Transparency
-    "highlight Normal ctermbg=NONE guibg=NONE
-    "highlight EndOfBuffer ctermbg=NONE guibg=NONE
-
-    highlight ColorColumn ctermbg=0 guibg=grey
-    " highlight Normal guibg=none
-    " highlight LineNr guifg=#ff8659
-    " highlight LineNr guifg=#aed75f
-    highlight LineNr guifg=#5eacd3
-    highlight netrwDir guifg=#5eacd3
-    highlight qfFileName guifg=#aed75f
-    hi TelescopeBorder guifg=#5eacd
-endfun
-
-call ColorMyPencils()
-
-" nnoremap <leader>cc :call ColorMyPencils()<CR>