diff --git a/home/dot_config/foot/foot.ini.tmpl b/home/dot_config/foot/foot.ini.tmpl index 529db62..003126f 100644 --- a/home/dot_config/foot/foot.ini.tmpl +++ b/home/dot_config/foot/foot.ini.tmpl @@ -36,11 +36,16 @@ gamma-correct-blending=yes # selection-target=primary # workers= -include = /usr/share/foot/themes/selenized-dark + +include = ~/.config/foot/kanagawa.ini +include = ~/.config/foot/kanagawa-light.ini [colors] alpha = 0.92 +[colors2] +alpha = 0.92 + [environment] # name=value diff --git a/home/dot_config/foot/kanagawa-light.ini b/home/dot_config/foot/kanagawa-light.ini new file mode 100644 index 0000000..ff1e1bb --- /dev/null +++ b/home/dot_config/foot/kanagawa-light.ini @@ -0,0 +1,34 @@ +[colors2] +background = f2ecbc +foreground = 545464 + +selection-background = c9cbd1 +selection-foreground = 43436c + +cursor = f2ecbc 43436c +urls = 73A7BC + +# normal +regular0 = 1F1F28 +regular1 = c84053 +regular2 = 6f894e +regular3 = 77713f +regular4 = 4d699b +regular5 = b35b79 +regular6 = 597b75 +regular7 = 545464 + +# bright +bright0 = 8a8980 +bright1 = d7474b +bright2 = 6e915f +bright3 = 836f4a +bright4 = 6693bf +bright5 = 624c83 +bright6 = 5e857a +bright7 = 43436c + + +# extended colors +16 = cc6d00 +17 = e82424 diff --git a/home/dot_config/foot/kanagawa.ini b/home/dot_config/foot/kanagawa.ini new file mode 100644 index 0000000..f89a270 --- /dev/null +++ b/home/dot_config/foot/kanagawa.ini @@ -0,0 +1,27 @@ +[colors] +foreground = dcd7ba +background = 1f1f28 + +selection-foreground = c8c093 +selection-background = 2d4f67 + +regular0 = 090618 +regular1 = c34043 +regular2 = 76946a +regular3 = c0a36e +regular4 = 7e9cd8 +regular5 = 957fb9 +regular6 = 6a9589 +regular7 = c8c093 + +bright0 = 727169 +bright1 = e82424 +bright2 = 98bb6c +bright3 = e6c384 +bright4 = 7fb4ca +bright5 = 938aa9 +bright6 = 7aa89f +bright7 = dcd7ba + +16 = ffa066 +17 = ff5d62 diff --git a/home/dot_config/lazygit/config.yml b/home/dot_config/lazygit/config.yml new file mode 100644 index 0000000..4428682 --- /dev/null +++ b/home/dot_config/lazygit/config.yml @@ -0,0 +1,4 @@ +git: + paging: + colorArg: always + pager: delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}" diff --git a/home/dot_config/nvim/init.lua b/home/dot_config/nvim/init.lua index a542a05..1472dfc 100644 --- a/home/dot_config/nvim/init.lua +++ b/home/dot_config/nvim/init.lua @@ -543,23 +543,6 @@ require('lazy').setup({ }, }, - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'calind/selenized.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - config = function() - ---@diagnostic disable-next-line: missing-fields - - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'selenized' - end, - }, - -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', @@ -661,11 +644,12 @@ require('lazy').setup({ require 'kickstart.plugins.neo-tree', require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- This is the easiest way to modularize your config. - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - { import = 'custom.plugins' }, + require 'custom.colourscheme', + -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` + -- This is the easiest way to modularize your config. + -- + -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/home/dot_config/nvim/lua/custom/colourscheme.lua b/home/dot_config/nvim/lua/custom/colourscheme.lua new file mode 100644 index 0000000..6718cfd --- /dev/null +++ b/home/dot_config/nvim/lua/custom/colourscheme.lua @@ -0,0 +1,40 @@ +local function toggleDarkLight() + print 'Running toggle dark light' + if vim.o.background == 'light' then + vim.o.background = 'dark' + else + vim.o.background = 'light' + end +end + +return { + { -- You can easily change to a different colorscheme. + -- Change the name of the colorscheme plugin below, and then + -- change the command in the config to whatever the name of that colorscheme is. + -- + -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + 'calind/selenized.nvim', + }, + { 'folke/tokyonight.nvim' }, + { 'neanias/everforest-nvim' }, + { 'ellisonleao/gruvbox.nvim' }, + { + 'rebelot/kanagawa.nvim', + priority = 1000, -- Make sure to load this before all the other start plugins. + lazy = false, + config = function() + ---@diagnostic disable-next-line: missing-fields + + -- Load the colorscheme here. + -- Like many other themes, this one has different styles, and you could load + -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + vim.cmd.colorscheme 'kanagawa' + + vim.api.nvim_create_autocmd('Signal', { callback = toggleDarkLight }) + end, + keys = { + { 'tl', toggleDarkLight, desc = 'Toggle [L]ight mode' }, + }, + }, +} +-- vim: ts=2 sts=2 sw=2 et diff --git a/home/dot_config/nvim/lua/custom/plugins/snacks.lua b/home/dot_config/nvim/lua/custom/plugins/snacks.lua index 7cca9db..51c3539 100644 --- a/home/dot_config/nvim/lua/custom/plugins/snacks.lua +++ b/home/dot_config/nvim/lua/custom/plugins/snacks.lua @@ -16,11 +16,23 @@ return { what = 'permalink', }, lazygit = { enabled = true }, - dim = { enabled = true }, + dim = { + scope = { + siblings = true, + min_size = 10, + max_size = 20, + }, + animate = { + enabled = true, + easing = 'outQuad', + duration = { + step = 20, + total = 150, + }, + }, + }, + toggle = { enabled = true }, }, - init = function() - require('snacks').dim() - end, keys = { { @@ -50,6 +62,15 @@ return { desc = 'Lazy[g]it (Root Dir)', }, }, + init = function() + vim.api.nvim_create_autocmd('User', { + pattern = 'VeryLazy', + callback = function() + Snacks.toggle.dim():map 'td' + Snacks.toggle.zen():map 'tz' + end, + }) + end, }, }