Browse Source

fix: add eldritch theme, fix harpoon, disable copilot

master
Tovi Jaeschke-Rogers 8 months ago
parent
commit
fce8823c21
8 changed files with 65 additions and 76 deletions
  1. +1
    -0
      .config/aliasrc
  2. +2
    -2
      .config/nvim/lua/settings/theme.lua
  3. +2
    -6
      .config/nvim/lua/tovi/core/autocmd.lua
  4. +11
    -1
      .config/nvim/lua/tovi/plugins/colorscheme.lua
  5. +1
    -21
      .config/nvim/lua/tovi/plugins/copilot.lua
  6. +1
    -1
      .config/nvim/lua/tovi/plugins/harpoon.lua
  7. +45
    -45
      .config/nvim/lua/tovi/plugins/lualine.lua
  8. +2
    -0
      .config/nvim/lua/tovi/plugins/themery.lua

+ 1
- 0
.config/aliasrc View File

@ -47,6 +47,7 @@ alias \
jsonlint="python -m json.tool" \
fresh="docker compose exec fpm php artisan migrate:fresh --seed" \
shrug="echo '¯\\_(ツ)_/¯' | xclip -selection clipboard && echo 'Copied ASCII shrug to clipboard'" \
dab="cat ~/Documents/dab.txt | xclip -selection clipboard && echo 'Copied ASCII dab to clipboard'"
alias \
c="xclip -selection clipboard" \


+ 2
- 2
.config/nvim/lua/settings/theme.lua View File

@ -1,5 +1,5 @@
-- Themery block
-- This block will be replaced by Themery.
vim.cmd("colorscheme carbonfox")
vim.g.theme_id = 2
vim.cmd("colorscheme eldritch")
vim.g.theme_id = 12
-- end themery block

+ 2
- 6
.config/nvim/lua/tovi/core/autocmd.lua View File

@ -42,9 +42,7 @@ local aucmd_dict = {
{
pattern = { '*.blade.php' },
callback = function()
vim.opt_local.syntax = 'html'
end
command = [[set syntax=html]],
},
},
@ -59,9 +57,7 @@ local aucmd_dict = {
{
pattern = { '*.blade.php' },
callback = function()
vim.opt_local.syntax = 'html'
end
command = [[set syntax=html]],
},
},


+ 11
- 1
.config/nvim/lua/tovi/plugins/colorscheme.lua View File

@ -96,5 +96,15 @@ return {
{
"olimorris/onedarkpro.nvim",
priority = 1000, -- Ensure it loads first
}
},
{
"eldritch-theme/eldritch.nvim",
lazy = false,
priority = 1000,
opts = {},
},
{
"luisiacc/the-matrix.nvim",
priority = 1000,
},
}

+ 1
- 21
.config/nvim/lua/tovi/plugins/copilot.lua View File

@ -1,26 +1,6 @@
-- return {
-- "github/copilot.vim",
-- config = function()
-- vim.g.copilot_no_tab_map = true
--
-- vim.api.nvim_set_keymap(
-- "i",
-- ",,",
-- 'copilot#Accept("<CR>")',
-- { expr = true, silent = true }
-- )
--
-- vim.api.nvim_set_keymap(
-- "n",
-- "<leader>cs",
-- "<cmd>Copilot panel<CR>",
-- { noremap = true }
-- )
-- end,
-- }
return {
'zbirenbaum/copilot.lua',
enabled = false,
cmd = "Copilot",
event = "InsertEnter",
config = function()


+ 1
- 1
.config/nvim/lua/tovi/plugins/harpoon.lua View File

@ -15,7 +15,7 @@ return {
local keymap = vim.keymap -- for conciseness
keymap.set("n", "<leader>a", function ()
harpoon:list():append()
harpoon:list():add()
end, { desc = "Mark file with harpoon" })
keymap.set("n", "<C-e>", function ()


+ 45
- 45
.config/nvim/lua/tovi/plugins/lualine.lua View File

@ -5,54 +5,54 @@ return {
local lualine = require("lualine")
local lazy_status = require("lazy.status")
local colors = {
blue = "#65D1FF",
green = "#3EFFDC",
violet = "#FF61EF",
yellow = "#FFDA7B",
red = "#FF4A4A",
fg = "#c3ccdc",
bg = "#112638",
inactive_bg = "#2c3043",
}
local my_lualine_theme = {
normal = {
a = { bg = colors.blue, fg = colors.bg, gui = "bold" },
b = { bg = colors.bg, fg = colors.fg },
c = { bg = colors.bg, fg = colors.fg },
},
insert = {
a = { bg = colors.green, fg = colors.bg, gui = "bold" },
b = { bg = colors.bg, fg = colors.fg },
c = { bg = colors.bg, fg = colors.fg },
},
visual = {
a = { bg = colors.violet, fg = colors.bg, gui = "bold" },
b = { bg = colors.bg, fg = colors.fg },
c = { bg = colors.bg, fg = colors.fg },
},
command = {
a = { bg = colors.yellow, fg = colors.bg, gui = "bold" },
b = { bg = colors.bg, fg = colors.fg },
c = { bg = colors.bg, fg = colors.fg },
},
replace = {
a = { bg = colors.red, fg = colors.bg, gui = "bold" },
b = { bg = colors.bg, fg = colors.fg },
c = { bg = colors.bg, fg = colors.fg },
},
inactive = {
a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = "bold" },
b = { bg = colors.inactive_bg, fg = colors.semilightgray },
c = { bg = colors.inactive_bg, fg = colors.semilightgray },
},
}
-- local colors = {
-- blue = "#65D1FF",
-- green = "#3EFFDC",
-- violet = "#FF61EF",
-- yellow = "#FFDA7B",
-- red = "#FF4A4A",
-- fg = "#c3ccdc",
-- bg = "#112638",
-- inactive_bg = "#2c3043",
-- }
--
-- local my_lualine_theme = {
-- normal = {
-- a = { bg = colors.blue, fg = colors.bg, gui = "bold" },
-- b = { bg = colors.bg, fg = colors.fg },
-- c = { bg = colors.bg, fg = colors.fg },
-- },
-- insert = {
-- a = { bg = colors.green, fg = colors.bg, gui = "bold" },
-- b = { bg = colors.bg, fg = colors.fg },
-- c = { bg = colors.bg, fg = colors.fg },
-- },
-- visual = {
-- a = { bg = colors.violet, fg = colors.bg, gui = "bold" },
-- b = { bg = colors.bg, fg = colors.fg },
-- c = { bg = colors.bg, fg = colors.fg },
-- },
-- command = {
-- a = { bg = colors.yellow, fg = colors.bg, gui = "bold" },
-- b = { bg = colors.bg, fg = colors.fg },
-- c = { bg = colors.bg, fg = colors.fg },
-- },
-- replace = {
-- a = { bg = colors.red, fg = colors.bg, gui = "bold" },
-- b = { bg = colors.bg, fg = colors.fg },
-- c = { bg = colors.bg, fg = colors.fg },
-- },
-- inactive = {
-- a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = "bold" },
-- b = { bg = colors.inactive_bg, fg = colors.semilightgray },
-- c = { bg = colors.inactive_bg, fg = colors.semilightgray },
-- },
-- }
--
-- configure lualine with modified theme
lualine.setup({
options = {
theme = my_lualine_theme,
theme = 'eldritch',
section_separators = { left = "", right = "" },
component_separators = { left = "|", right = "|" },
},


+ 2
- 0
.config/nvim/lua/tovi/plugins/themery.lua View File

@ -14,6 +14,8 @@ return {
"onedark",
"onedark_dark",
"onedark_vivid",
"eldritch",
"thematrix",
},
themeConfigFile = "~/.config/nvim/lua/settings/theme.lua", -- Described below
livePreview = true, -- Apply theme while browsing. Default to true.


Loading…
Cancel
Save