diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 5ad2f28..2d4120f 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,5 +1,3 @@ -import = ["~/.config/alacritty/themes/default.toml"] -live_config_reload = true [colors] draw_bold_text_with_bright_colors = true @@ -415,3 +413,7 @@ title = "Alacritty" [window.class] general = "Alacritty" instance = "Alacritty" + +[general] +live_config_reload = true +import = ["~/.config/alacritty/themes/default.toml"] diff --git a/.config/alacritty/themes/default.toml b/.config/alacritty/themes/default.toml deleted file mode 120000 index 7d06be3..0000000 --- a/.config/alacritty/themes/default.toml +++ /dev/null @@ -1 +0,0 @@ -cyberdream.toml \ No newline at end of file diff --git a/.config/alacritty/themes/default.toml b/.config/alacritty/themes/default.toml new file mode 100644 index 0000000..483299a --- /dev/null +++ b/.config/alacritty/themes/default.toml @@ -0,0 +1,36 @@ +# cyberdream theme for alacritty +[[colors.indexed_colors]] +color = "0xffbd5e" +index = 16 + +[[colors.indexed_colors]] +color = "0xff6e5e" +index = 17 + +[colors.bright] +black = "0x3c4048" +blue = "0x5ea1ff" +cyan = "0x5ef1ff" +green = "0x5eff6c" +magenta = "0xbd5eff" +red = "0xff6e5e" +white = "0xffffff" +yellow = "0xf1ff5e" + +[colors.normal] +black = "0x16181a" +blue = "0x5ea1ff" +cyan = "0x5ef1ff" +green = "0x5eff6c" +magenta = "0xbd5eff" +red = "0xff6e5e" +white = "0xffffff" +yellow = "0xf1ff5e" + +[colors.primary] +background = "0x16181a" +foreground = "0xffffff" + +[colors.selection] +background = "0x3c4048" +foreground = "0xffffff" diff --git a/.config/nvim/lua/plugins/cmp/init.lua b/.config/nvim/lua/plugins/cmp/init.lua index 4579027..67f34c5 100644 --- a/.config/nvim/lua/plugins/cmp/init.lua +++ b/.config/nvim/lua/plugins/cmp/init.lua @@ -7,7 +7,8 @@ return { dependencies = { 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-buffer', - 'hrsh7th/cmp-path', + -- 'hrsh7th/cmp-path', + 'https://codeberg.org/FelipeLema/cmp-async-path', 'hrsh7th/cmp-cmdline', 'lukas-reineke/cmp-rg', -- 'lukas-reineke/cmp-under-comparator', diff --git a/.config/nvim/lua/plugins/config/cmp.lua b/.config/nvim/lua/plugins/config/cmp.lua index bcf8cb7..623b4d4 100644 --- a/.config/nvim/lua/plugins/config/cmp.lua +++ b/.config/nvim/lua/plugins/config/cmp.lua @@ -198,7 +198,7 @@ cmp.setup({ }, { name = 'rg', - keyword_length = 4, + keyword_length = 3, max_item_count = 10, priority_weight = 50, option = { @@ -206,11 +206,12 @@ cmp.setup({ set_filetype = true, marker = ' ❰❰❰', }, - entry_filter = function(entry) - return not entry.exact - end, + -- entry_filter = function(entry) + -- return not entry.exact + -- end, }, - { name = 'path', priority = 50 }, + -- { name = 'path', priority = 50 }, + { name = 'async_path', priority = 50, option = { trailing_slash = false } }, { name = 'look', keyword_length = 4, diff --git a/.config/nvim/lua/plugins/config/fzf.lua b/.config/nvim/lua/plugins/config/fzf.lua index a871e87..15468e3 100644 --- a/.config/nvim/lua/plugins/config/fzf.lua +++ b/.config/nvim/lua/plugins/config/fzf.lua @@ -16,19 +16,13 @@ local m_keys = { } -- calling `setup` is optional for customization fzf.setup({ - defaults = { - formatter = { 'path.filename_first', 2 }, - }, + defaults = { formatter = { 'path.filename_first', 2 } }, fzf_opts = { ['--layout'] = 'reverse', ['--info'] = 'inline-right', -- ['--tiebreak'] = 'end', }, - winopts = { - preview = { - default = 'bat', -- override the default previewer? - }, - }, + winopts = { preview = { default = 'bat' } }, hls = { normal = hl_validate 'TelescopeNormal', border = hl_validate 'TelescopeBorder', diff --git a/.config/nvim/lua/plugins/config/nordic.lua b/.config/nvim/lua/plugins/config/nordic.lua new file mode 100644 index 0000000..b36a11e --- /dev/null +++ b/.config/nvim/lua/plugins/config/nordic.lua @@ -0,0 +1,23 @@ +require('nordic').setup({ + transparent = { bg = true }, + -- Enable brighter float border. + bright_border = true, + on_highlight = function(highlights, palette) + highlights.QuickScopePrimary = { + fg = palette.yellow.bright, + bg = palette.gray0, + bold = true, + underline = true, + } + highlights.QuickScopeSecondary = { + fg = palette.orange.dim, + bg = palette.gray0, + bold = true, + underline = true, + } + highlights['@tag.attribute'] = { + fg = '#6cc3b7', -- #6dada4 | + } + end, +}) +vim.cmd.colorscheme 'nordic' diff --git a/.config/nvim/lua/plugins/lsp/svelte.lua b/.config/nvim/lua/plugins/lsp/svelte.lua index 64e8190..c82424b 100644 --- a/.config/nvim/lua/plugins/lsp/svelte.lua +++ b/.config/nvim/lua/plugins/lsp/svelte.lua @@ -51,6 +51,11 @@ return { plugin = { svelte = { defaultScriptLanguage = 'typescript' } }, }, }, + capabilities = { + workspace = { + didChangeWatchedFiles = vim.fn.has 'nvim-0.10' == 0 and { dynamicRegistration = true }, + }, + }, }, }, }, diff --git a/.config/nvim/lua/plugins/mini/files.lua b/.config/nvim/lua/plugins/mini/files.lua index 2c02edf..29798ed 100644 --- a/.config/nvim/lua/plugins/mini/files.lua +++ b/.config/nvim/lua/plugins/mini/files.lua @@ -44,10 +44,11 @@ return { windows = { preview = true, width_preview = 45 }, }) require('lsp-file-operations').setup() + local map_split = function(buf_id, lhs, direction, close_on_file) local rhs = function() local new_target_window - local cur_target_window = require('mini.files').get_target_window() + local cur_target_window = require('mini.files').get_explorer_state().target_window if cur_target_window ~= nil then vim.api.nvim_win_call(cur_target_window, function() vim.cmd('belowright ' .. direction .. ' split') @@ -72,11 +73,17 @@ return { desc = 'Open in split(gs) or vsplit(gv)', callback = function(args) local buf_id = args.data.buf_id + -- Tweak keys to your liking map_split(buf_id, 'gs', 'horizontal', false) map_split(buf_id, 'gv', 'vertical', false) map_split(buf_id, 'gS', 'horizontal', true) map_split(buf_id, 'gV', 'vertical', true) + + map_split(buf_id, 's', 'horizontal', false) + map_split(buf_id, 'v', 'vertical', false) + map_split(buf_id, 'S', 'horizontal', true) + map_split(buf_id, 'V', 'vertical', true) end, }) local events = { diff --git a/.config/nvim/lua/plugins/theme.lua b/.config/nvim/lua/plugins/theme.lua index 06eb54b..6429790 100644 --- a/.config/nvim/lua/plugins/theme.lua +++ b/.config/nvim/lua/plugins/theme.lua @@ -4,7 +4,7 @@ return { 'catppuccin/nvim', name = 'catppuccin', event = 'VimEnter', - enabled = true, + enabled = false, config = function() require 'plugins.config.catppuccin' end, @@ -47,4 +47,12 @@ return { vim.cmd.colorscheme 'rose-pine' end, }, + { + 'AlexvZyl/nordic.nvim', + enabled = true, + event = 'VimEnter', + config = function() + require 'plugins.config.nordic' + end, + }, } diff --git a/.config/qtile/config.py b/.config/qtile/config.py index 8f9df7a..a8cb6a4 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -139,6 +139,8 @@ def assign_app_group(client: WindowType) -> None: "Thorium-browser", "thorium-browser", "vieb", + "io.github.ungoogled_software.ungoogled_chromium", + "Io.github.ungoogled_software.ungoogled_chromium", ]: client.togroup("2", switch_group=True) elif (wm_class[0] or wm_class[1]) in [