From 9f55f21eefdf831644a5c1a5dac58bdb64d893e6 Mon Sep 17 00:00:00 2001 From: quirinecker Date: Sat, 15 Nov 2025 16:42:03 +0100 Subject: [PATCH] merged tmux and neovim line. wip though --- .../neovim/lua/plugins/config/lualine.lua | 5 -- .../lua/plugins/config/lualine/nord_theme.lua | 2 +- .../neovim/lua/plugins/spec/lualine.lua | 9 +-- homemanager/neovim/lua/plugins/spec/noice.lua | 74 +++++++++---------- .../neovim/lua/plugins/spec/vimtpipeline.lua | 8 ++ homemanager/tmux.nix | 9 ++- 6 files changed, 57 insertions(+), 50 deletions(-) create mode 100644 homemanager/neovim/lua/plugins/spec/vimtpipeline.lua diff --git a/homemanager/neovim/lua/plugins/config/lualine.lua b/homemanager/neovim/lua/plugins/config/lualine.lua index f8cb77d..a7ff1f0 100644 --- a/homemanager/neovim/lua/plugins/config/lualine.lua +++ b/homemanager/neovim/lua/plugins/config/lualine.lua @@ -28,11 +28,6 @@ local opts = { } }, 'filename', 'branch', 'diff' }, 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' }, diff --git a/homemanager/neovim/lua/plugins/config/lualine/nord_theme.lua b/homemanager/neovim/lua/plugins/config/lualine/nord_theme.lua index 18e8f47..cb9f991 100644 --- a/homemanager/neovim/lua/plugins/config/lualine/nord_theme.lua +++ b/homemanager/neovim/lua/plugins/config/lualine/nord_theme.lua @@ -13,7 +13,7 @@ M.colors = { M.spec = { normal = { - a = { fg = M.colors.transparent, bg = M.colors.nord8, gui = 'bold' }, + a = { fg = M.colors.nord5, bg = M.colors.nord8 }, b = { fg = M.colors.nord5, bg = M.colors.nord1 }, c = { fg = M.colors.transparent, bg = M.colors.transparent }, }, diff --git a/homemanager/neovim/lua/plugins/spec/lualine.lua b/homemanager/neovim/lua/plugins/spec/lualine.lua index a8a2a75..c894957 100644 --- a/homemanager/neovim/lua/plugins/spec/lualine.lua +++ b/homemanager/neovim/lua/plugins/spec/lualine.lua @@ -8,15 +8,12 @@ return { -- loading lualine delayed again because of transparency issues vim.defer_fn(function() lualineConfig.setup() + if os.getenv("TMUX") then + vim.o.laststatus = 2 + end end, 100) end, dependencies = { require("plugins.spec.theme"), - - { - "christopher-francisco/tmux-status.nvim", - lazy = true, - opts = {}, - }, } } diff --git a/homemanager/neovim/lua/plugins/spec/noice.lua b/homemanager/neovim/lua/plugins/spec/noice.lua index 46b2f23..a94b748 100644 --- a/homemanager/neovim/lua/plugins/spec/noice.lua +++ b/homemanager/neovim/lua/plugins/spec/noice.lua @@ -1,39 +1,39 @@ return { - 'folke/noice.nvim', - event = "UIEnter", - enabled = true, - opts = { - messages = { - enabled = false, - view = "mini", - view_warn = "mini", - view_error = "mini" - }, - lsp = { - -- override makdown rendering so that **cmp** and other plugins use **Treesitter** - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, - }, - hover = { - enabled = false, - }, - signature = { - enabled = false - } - }, - -- you can enable a preset for easier configuration - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help - }, - }, - dependencies = { - 'MunifTanjim/nui.nvim', - require("plugins.spec.notify") - } + 'folke/noice.nvim', + event = "UIEnter", + enabled = true, + opts = { + messages = { + enabled = false, + view = "mini", + view_warn = "mini", + view_error = "mini" + }, + lsp = { + -- override makdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + hover = { + enabled = false, + }, + signature = { + enabled = false + } + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = false, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, + }, + dependencies = { + 'MunifTanjim/nui.nvim', + require("plugins.spec.notify") + } } diff --git a/homemanager/neovim/lua/plugins/spec/vimtpipeline.lua b/homemanager/neovim/lua/plugins/spec/vimtpipeline.lua new file mode 100644 index 0000000..2ebf312 --- /dev/null +++ b/homemanager/neovim/lua/plugins/spec/vimtpipeline.lua @@ -0,0 +1,8 @@ +return { + 'vimpostor/vim-tpipeline', + config = function() + vim.g.tpipeline_autoembed = 1 + vim.g.tpipeline_restore = 1 + vim.g.tpipeline_clearstl = 1 + end +} diff --git a/homemanager/tmux.nix b/homemanager/tmux.nix index b88d31a..2d4e64f 100644 --- a/homemanager/tmux.nix +++ b/homemanager/tmux.nix @@ -26,10 +26,17 @@ in set-option -g mode-keys vi set -g mouse on set -g status on + + set -g focus-events on + set -g status-style bg=default + set -g status-right '#(cat #{socket_path}-\#{session_id}-vimbridge-R)' + set -g status-left '#(cat #{socket_path}-\#{session_id}-vimbridge)' + set -g status-left-length 99 + set -g status-right-length 99 + set -g status-justify absolute-centre ''; programs.tmux.plugins = [ - pkgs.tmuxPlugins.nord { plugin = pkgs.tmuxPlugins.resurrect; extraConfig = "set -g @resurrect-strategy-nvim 'session'";