diff options
| -rw-r--r-- | .config/nvim/colors/mine.vim | 46 | ||||
| -rw-r--r-- | .config/nvim/init.lua | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/map.lua | 4 | ||||
| -rw-r--r-- | .config/nvim/lua/plugin/setup.lua | 45 | ||||
| -rw-r--r-- | .config/picom/picom.conf | 4 |
5 files changed, 73 insertions, 27 deletions
diff --git a/.config/nvim/colors/mine.vim b/.config/nvim/colors/mine.vim index 3aa142d..4c4bf54 100644 --- a/.config/nvim/colors/mine.vim +++ b/.config/nvim/colors/mine.vim @@ -11,15 +11,15 @@ hi! link MessageWindow Pmenu hi! link PopupNotification Todo hi! link Character String -hi ColorColumn guifg=#ffffff guibg=#333333 gui=NONE -hi CursorLine guifg=NONE guibg=#2b2b2b gui=NONE -hi EndOfBuffer guifg=bg guibg=NONE gui=NONE -hi SignColumn guifg=NONE guibg=#222222 gui=NONE -hi LineNr guifg=#666666 guibg=#101010 gui=NONE -hi LineNrAbove guifg=#666666 guibg=#191919 gui=NONE -hi LineNrBelow guifg=#666666 guibg=#191919 gui=NONE -hi MatchParen guifg=#ffffff guibg=#990000 gui=bold -hi Normal guifg=#ffffff guibg=#222222 gui=NONE +hi ColorColumn guifg=#333333 guibg=#333333 gui=NONE +hi CursorLine guifg=NONE guibg=NONE gui=NONE +hi EndOfBuffer guifg=#222222 guibg=NONE gui=NONE +hi SignColumn guifg=NONE guibg=NONE gui=NONE +hi LineNr guifg=#666666 guibg=NONE gui=NONE +hi LineNrAbove guifg=#666666 guibg=NONE gui=NONE +hi LineNrBelow guifg=#666666 guibg=NONE gui=NONE +hi MatchParen guifg=#000000 guibg=#FF0000 gui=bold +hi Normal guifg=#AAAAAA guibg=NONE gui=NONE hi Pmenu guifg=#ffffff guibg=#333333 gui=NONE hi PmenuSel guifg=#333333 guibg=#ffffff gui=bold,underdouble hi Search guifg=#333333 guibg=#ffff88 gui=bold,italic @@ -27,25 +27,25 @@ hi Visual guifg=NONE guibg=#333333 gui=NONE hi Comment guifg=#777777 guibg=NONE gui=italic -hi Constant guifg=#99ff99 guibg=NONE gui=NONE -hi Number guifg=#55bb55 guibg=NONE gui=NONE -hi String guifg=#ff99ff guibg=NONE gui=italic -hi Boolean guifg=#99ff99 guibg=NONE gui=italic +hi Constant guifg=#44FF99 guibg=NONE gui=NONE +hi Number guifg=#44FF99 guibg=NONE gui=NONE +hi String guifg=#CCFF66 guibg=NONE gui=italic +hi Boolean guifg=#44FF99 guibg=NONE gui=italic -hi Identifier guifg=#ffcc80 guibg=NONE gui=NONE -hi Function guifg=#99ffff guibg=NONE gui=italic +hi Identifier guifg=#FFFFFF guibg=NONE gui=NONE +hi Function guifg=#FF4499 guibg=NONE gui=NONE -hi Statement guifg=#ff7099 guibg=NONE gui=NONE -hi Label guifg=#ff7099 guibg=NONE gui=italic -hi Operator guifg=#c5c8c6 guibg=NONE gui=NONE +hi Statement guifg=#FF9944 guibg=NONE gui=NONE +hi Label guifg=#FF9944 guibg=NONE gui=italic +hi Operator guifg=#AAAABB guibg=NONE gui=NONE -hi PreProc guifg=#ff9977 guibg=NONE gui=NONE +hi PreProc guifg=#FF4499 guibg=NONE gui=NONE -hi Type guifg=#9999ff guibg=NONE gui=italic -hi StorageClass guifg=#99ffff guibg=NONE gui=italic -hi Structure guifg=#99ffff guibg=NONE gui=italic +hi Type guifg=#997FFF guibg=NONE gui=italic +hi StorageClass guifg=#4499FF guibg=NONE gui=italic +hi Structure guifg=#4499FF guibg=NONE gui=bold,italic -hi Special guifg=#ff9977 guibg=NONE gui=NONE +hi Special guifg=#CCCCDD guibg=NONE gui=NONE hi SpecialChar guifg=#ffffff guibg=NONE gui=bold,italic hi Error guifg=#ff4444 guibg=NONE gui=bold,undercurl diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 183009e..aeeaee0 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -2,4 +2,3 @@ require("opt") require("map") require("plugin") -vim.cmd("colorscheme monokai-pro-spectrum") diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua index ced64d7..a627bb5 100644 --- a/.config/nvim/lua/map.lua +++ b/.config/nvim/lua/map.lua @@ -61,8 +61,8 @@ vim.keymap.set("n", "dc", "cc<ESC>", {}) vim.keymap.set({"n", "v", "o"}, "+", "$", {}) -- Allow yanking to system clipboard -vim.keymap.set(nv, "<C-c>", "\"+y", {}) -vim.keymap.set(nv, "<C-v>", "\"+p", {}) +vim.keymap.set(nv, "<leader>y", "\"+y", {}) +vim.keymap.set(nv, "<leader>p", "\"+p", {}) -- Commands vim.keymap.set(nv, "<leader>c", "<CMD>set invhlsearch<CR>", {silent=true}) diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua index b2fe8f7..47bd447 100644 --- a/.config/nvim/lua/plugin/setup.lua +++ b/.config/nvim/lua/plugin/setup.lua @@ -10,8 +10,53 @@ require("oil").setup { }, } +vim.cmd.colorscheme("mine") + +local colors = { + white = "#FFFFFF", + pink = "#FF4499", + dark_pink = "#D8225F", + green = "#22CC55", + bg = "#222222", + bg_alt = "#333333", +} + +local theme = { + normal = { + a = {bg = colors.pink, fg = colors.white, gui = 'bold,italic'}, + b = {bg = colors.bg, fg = colors.white}, + c = {bg = colors.bg, fg = colors.white} + }, + insert = { + a = {bg = colors.dark_pink, fg = colors.white, gui = 'bold,italic'}, + b = {bg = colors.bg, fg = colors.white}, + c = {bg = colors.bg, fg = colors.white} + }, + visual = { + a = {bg = colors.green, fg = colors.white, gui = 'bold,italic'}, + b = {bg = colors.lightgray, fg = colors.white}, + c = {bg = colors.lightgray, fg = colors.white} + }, + replace = { + a = {bg = colors.pink, fg = colors.whtie, gui = 'bold,italic'}, + b = {bg = colors.bg, fg = colors.white}, + c = {bg = colors.bg, fg = colors.white} + }, + command = { + a = {bg = colors.bg_alt, fg = colors.black, gui = 'bold,italic'}, + b = {bg = colors.bg, fg = colors.white}, + c = {bg = colors.bg, fg = colors.white} + }, + inactive = { + a = {bg = colors.pink, fg = colors.white, gui = 'bold,italic'}, + b = {bg = colors.bg, fg = colors.white}, + c = {bg = colors.bg, fg = colors.white} + } +} + require("lualine").setup { options = { + theme = theme, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, }, diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 5bf675b..1dcff65 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -2,7 +2,9 @@ shadow = true; shadow-radius = 15; shadow-offset-x = -15; shadow-offset-y = -7; -shadow-exclude = []; +shadow-exclude = [ + "class_g = 'i3-frame' && argb", +]; fading = true; fade-in-step = 0.1; |