From 997dc9812331e9553a5b7477022bb1f009a29765 Mon Sep 17 00:00:00 2001 From: quirinecker Date: Fri, 14 Nov 2025 23:11:46 +0100 Subject: [PATCH] fixed select keybind --- .../neovim/lua/plugins/config/lualine.lua | 29 ++++++++++++------- .../neovim/lua/plugins/spec/lualine.lua | 15 ++++++++-- homemanager/neovim/lua/plugins/spec/theme.lua | 24 +++++++++++++-- homemanager/theme.nix | 1 + homemanager/tmux.nix | 4 +-- 5 files changed, 55 insertions(+), 18 deletions(-) diff --git a/homemanager/neovim/lua/plugins/config/lualine.lua b/homemanager/neovim/lua/plugins/config/lualine.lua index 92f878f..f8cb77d 100644 --- a/homemanager/neovim/lua/plugins/config/lualine.lua +++ b/homemanager/neovim/lua/plugins/config/lualine.lua @@ -1,17 +1,11 @@ +local M = {} + local function CurrentTime() return os.date("%H:%M:%S") end -local function Text(text) - return function() - return text - end -end - - local theme = require('plugins.config.lualine.nord_theme') - local opts = { options = { theme = theme.spec, @@ -30,10 +24,16 @@ local opts = { end, tabs_color = { inactive = { fg = theme.colors.nord5 }, - active = { fg = theme.colors.nord8 }, + active = { fg = theme.colors.nord8 }, } }, 'filename', 'branch', 'diff' }, - lualine_c = {}, + lualine_c = { + { + require('tmux-status').tmux_windows, + cond = require('tmux-status').show, + padding = { left = 3 }, + }, + }, lualine_x = {}, lualine_y = { 'filetype', { 'diagnostics', always_visible = true }, 'progress' }, lualine_z = { @@ -59,4 +59,11 @@ local opts = { extensions = {}, } -require('lualine').setup(opts) + +M.setup = function() + require('lualine').setup(opts) +end + +M.setup() + +return M diff --git a/homemanager/neovim/lua/plugins/spec/lualine.lua b/homemanager/neovim/lua/plugins/spec/lualine.lua index bc70222..a8a2a75 100644 --- a/homemanager/neovim/lua/plugins/spec/lualine.lua +++ b/homemanager/neovim/lua/plugins/spec/lualine.lua @@ -3,9 +3,20 @@ return { event = "VeryLazy", lazy = false, config = function() - require('plugins.config.lualine') + local lualineConfig = require('plugins.config.lualine') + + -- loading lualine delayed again because of transparency issues + vim.defer_fn(function() + lualineConfig.setup() + end, 100) end, dependencies = { - require("plugins.spec.theme") + require("plugins.spec.theme"), + + { + "christopher-francisco/tmux-status.nvim", + lazy = true, + opts = {}, + }, } } diff --git a/homemanager/neovim/lua/plugins/spec/theme.lua b/homemanager/neovim/lua/plugins/spec/theme.lua index 3d675a0..dfef41a 100644 --- a/homemanager/neovim/lua/plugins/spec/theme.lua +++ b/homemanager/neovim/lua/plugins/spec/theme.lua @@ -2,26 +2,29 @@ return { { 'catppuccin/nvim', as = 'catppuccin', + enabled = false, config = function() require("catppuccin").setup { flavour = "mocha", transparent_background = true } - -- vim.cmd [[ colorscheme catppuccin ]] + vim.cmd [[ colorscheme catppuccin ]] end }, { 'EdenEast/nightfox.nvim', + enabled = false, config = function() require('nightfox').setup { options = { transparent = true } } - -- vim.cmd [[ colorscheme nightfox ]] + vim.cmd [[ colorscheme nightfox ]] end, }, { 'navarasu/onedark.nvim', + enabled = false, config = function() require('onedark').setup { transparent = true, @@ -30,14 +33,29 @@ return { } } - -- vim.cmd [[ colorscheme onedark ]] + vim.cmd [[ colorscheme onedark ]] end }, { 'shaunsingh/nord.nvim', + enabled = false, config = function() vim.g.nord_disable_background = true vim.cmd [[colorscheme nord]] end + }, + { + 'rmehri01/onenord.nvim', + enabled = true, + config = function() + require('onenord').setup({ + disable = { + background = true, -- Disable setting the background color + float_background = true, -- Disable setting the background color for floating windows + cursorline = true, -- Disable the cursorline + eob_lines = true, -- Hide the end-of-buffer lines + } + }) + end } } diff --git a/homemanager/theme.nix b/homemanager/theme.nix index 93cef60..d8c4cfe 100644 --- a/homemanager/theme.nix +++ b/homemanager/theme.nix @@ -36,6 +36,7 @@ dconf.settings = { "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; + gtk-key-theme = "Default"; }; }; diff --git a/homemanager/tmux.nix b/homemanager/tmux.nix index c6f36c1..b88d31a 100644 --- a/homemanager/tmux.nix +++ b/homemanager/tmux.nix @@ -25,6 +25,7 @@ in bind C-o display-popup -E "tms" set-option -g mode-keys vi set -g mouse on + set -g status on ''; programs.tmux.plugins = [ @@ -47,8 +48,7 @@ in ]; xdg.configFile = { - "tms/config.toml".source = - ./tms/config.toml; + "tms/config.toml".source = ./tms/config.toml; }; }; }