diff --git a/.config/aliasrc b/.config/aliasrc index 52107f3..dafd4dd 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -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" \ diff --git a/.config/nvim/lua/settings/theme.lua b/.config/nvim/lua/settings/theme.lua index 583ec66..23630e0 100644 --- a/.config/nvim/lua/settings/theme.lua +++ b/.config/nvim/lua/settings/theme.lua @@ -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 diff --git a/.config/nvim/lua/tovi/core/autocmd.lua b/.config/nvim/lua/tovi/core/autocmd.lua index 1684f10..1f6112a 100644 --- a/.config/nvim/lua/tovi/core/autocmd.lua +++ b/.config/nvim/lua/tovi/core/autocmd.lua @@ -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]], }, }, diff --git a/.config/nvim/lua/tovi/plugins/colorscheme.lua b/.config/nvim/lua/tovi/plugins/colorscheme.lua index 949a806..a546078 100644 --- a/.config/nvim/lua/tovi/plugins/colorscheme.lua +++ b/.config/nvim/lua/tovi/plugins/colorscheme.lua @@ -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, + }, } diff --git a/.config/nvim/lua/tovi/plugins/copilot.lua b/.config/nvim/lua/tovi/plugins/copilot.lua index 96f6544..af4dbc6 100644 --- a/.config/nvim/lua/tovi/plugins/copilot.lua +++ b/.config/nvim/lua/tovi/plugins/copilot.lua @@ -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("")', --- { expr = true, silent = true } --- ) --- --- vim.api.nvim_set_keymap( --- "n", --- "cs", --- "Copilot panel", --- { noremap = true } --- ) --- end, --- } - return { 'zbirenbaum/copilot.lua', + enabled = false, cmd = "Copilot", event = "InsertEnter", config = function() diff --git a/.config/nvim/lua/tovi/plugins/harpoon.lua b/.config/nvim/lua/tovi/plugins/harpoon.lua index 2f75977..17d758d 100644 --- a/.config/nvim/lua/tovi/plugins/harpoon.lua +++ b/.config/nvim/lua/tovi/plugins/harpoon.lua @@ -15,7 +15,7 @@ return { local keymap = vim.keymap -- for conciseness keymap.set("n", "a", function () - harpoon:list():append() + harpoon:list():add() end, { desc = "Mark file with harpoon" }) keymap.set("n", "", function () diff --git a/.config/nvim/lua/tovi/plugins/lualine.lua b/.config/nvim/lua/tovi/plugins/lualine.lua index 2ed12e2..ebc4419 100644 --- a/.config/nvim/lua/tovi/plugins/lualine.lua +++ b/.config/nvim/lua/tovi/plugins/lualine.lua @@ -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 = "|" }, }, diff --git a/.config/nvim/lua/tovi/plugins/themery.lua b/.config/nvim/lua/tovi/plugins/themery.lua index 97fa527..406bfa6 100644 --- a/.config/nvim/lua/tovi/plugins/themery.lua +++ b/.config/nvim/lua/tovi/plugins/themery.lua @@ -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.