From c8b73ad84671139030800f7131d69fa46d1bb396 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 5 Mar 2026 23:31:03 +0100 Subject: [PATCH] some more fixes --- modules/neovim/_picker.nix | 1 - modules/neovim/extraFiles/winterly.lua | 6 +++--- modules/scrolling-desktop/default.nix | 19 +++++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/neovim/_picker.nix b/modules/neovim/_picker.nix index 2f13fc8..d911342 100644 --- a/modules/neovim/_picker.nix +++ b/modules/neovim/_picker.nix @@ -36,7 +36,6 @@ picker = { enabled = true, prompt = "λ ", - layout = { preset = "ivy" }, }, statuscolumn = { enabled = true }, }) diff --git a/modules/neovim/extraFiles/winterly.lua b/modules/neovim/extraFiles/winterly.lua index d3b6a51..4710c9f 100644 --- a/modules/neovim/extraFiles/winterly.lua +++ b/modules/neovim/extraFiles/winterly.lua @@ -25,8 +25,8 @@ hi("IncSearch", { bg = palette.magenta_subtle_bg, fg = palette.magenta }) hi("ModeMsg", { bold = true, cterm = { bold = true } }) hi("NonText", { fg = palette.grey, ctermfg = "DarkGrey" }) hi("PmenuSbar", { bg = palette.grey, ctermbg = "Grey" }) -hi("StatusLine", { reverse = true, bold = true, cterm = { reverse = true, bold = true } }) -hi("StatusLineNC", { reverse = true, cterm = { reverse = true } }) +hi("StatusLine", { bg = palette.bg_secondary, fg = palette.fg, bold = true, cterm = { reverse = true, bold = true } }) +hi("StatusLineNC", { bg = palette.bg_secondary, fg = palette.fg, cterm = { reverse = true } }) hi("TabLineFill", { reverse = true, cterm = { reverse = true } }) hi("TabLineSel", { bold = true, cterm = { bold = true } }) hi("TermCursor", { reverse = true, cterm = { reverse = true } }) @@ -210,7 +210,7 @@ hi("@lsp.type.variable", { link = "Identifier" }) hi("@lsp.typemod.keyword.documentation", { fg = palette.grey, bold = true }) if vim.o.background == "light" then --- TODO: Define light scheme + -- TODO: Define light scheme else -- Default colors only used with a dark background. hi("ColorColumn", { bg = palette.red_subtle_bg, ctermbg = "DarkRed" }) diff --git a/modules/scrolling-desktop/default.nix b/modules/scrolling-desktop/default.nix index 9d5fe7a..69b37dd 100644 --- a/modules/scrolling-desktop/default.nix +++ b/modules/scrolling-desktop/default.nix @@ -79,6 +79,9 @@ enable = true; settings = { options = { + border_active_window = true; + border_color = "#c57faf"; + sliver_width = 10; preset_column_widths = [ 0.25 0.5 @@ -93,14 +96,14 @@ padding_right = 4; }; bindings = { - window_focus_west = "cmd - h"; - window_focus_east = "cmd - l"; - window_focus_north = "cmd - k"; - window_focus_south = "cmd - j"; - window_swap_west = "alt - h"; - window_swap_east = "alt - l"; - window_swap_first = "alt + shift - h"; - window_swap_last = "alt + shift - l"; + window_focus_west = "alt - h"; + window_focus_east = "alt - l"; + window_focus_north = "alt - k"; + window_focusalt_south = "alt - j"; + window_swap_west = "alt - shift - h"; + window_swap_east = "alt - shift - l"; + window_swap_first = "alt + shift - a"; + window_swap_last = "alt + shift - e"; window_center = "alt - c"; window_resize = "alt - r"; window_fullwidth = "alt - f";