From 13eecb746e91a002f8da5f3e5b7d8bddaec13d6d Mon Sep 17 00:00:00 2001 From: Aleksander Cynarski Date: Sun, 6 Apr 2025 18:47:40 +0200 Subject: [PATCH] feat: wezTerm session_manager --- .config/wezterm/modules/mappings.lua | 6 ++++- .config/wezterm/wezterm.lua | 15 ++++++++++-- .gitconfig | 35 +++++++++++++++++----------- tools/Nabu | 1 - 4 files changed, 39 insertions(+), 18 deletions(-) delete mode 160000 tools/Nabu diff --git a/.config/wezterm/modules/mappings.lua b/.config/wezterm/modules/mappings.lua index 84fc60f..7d27acf 100644 --- a/.config/wezterm/modules/mappings.lua +++ b/.config/wezterm/modules/mappings.lua @@ -54,8 +54,12 @@ return { mods = "LEADER", action = act.SplitHorizontal({ domain = "CurrentPaneDomain" }), }, - }, + -- session manager + { key = "s", mods = "LEADER", action = act({ EmitEvent = "save_session" }) }, + { key = "l", mods = "LEADER", action = act({ EmitEvent = "load_session" }) }, + { key = "r", mods = "LEADER", action = act({ EmitEvent = "restore_session" }) }, + }, key_tables = { resize_pane = { { key = "LeftArrow", action = act.AdjustPaneSize({ "Left", 5 }) }, diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index ececda5..30fe161 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -1,5 +1,6 @@ local wezterm = require("wezterm") local mappings = require("modules.mappings") +local session_manager = require("wezterm-session-manager/session-manager") -- Show which key table is active in the status area wezterm.on("update-right-status", function(window, pane) @@ -10,9 +11,19 @@ wezterm.on("update-right-status", function(window, pane) window:set_right_status(name or "") end) +wezterm.on("save_session", function(window) + session_manager.save_state(window) +end) +wezterm.on("load_session", function(window) + session_manager.load_state(window) +end) +wezterm.on("restore_session", function(window) + session_manager.restore_state(window) +end) + return { default_cursor_style = "BlinkingBlock", - color_scheme = "Poimandres", + color_scheme = "Catppuccin Mocha", colors = { cursor_bg = "#A6ACCD", cursor_border = "#A6ACCD", @@ -26,7 +37,7 @@ return { -- tab bar use_fancy_tab_bar = true, tab_bar_at_bottom = false, - hide_tab_bar_if_only_one_tab = true, + hide_tab_bar_if_only_one_tab = false, tab_max_width = 999999, window_padding = { left = 7, diff --git a/.gitconfig b/.gitconfig index 4007476..44c73f6 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,4 @@ -# This is Git's per-user configuration file. [user] -# Please adapt and uncomment the following lines: name = Aleksander Cynarski email = aleksander@cynarski.pl @@ -13,18 +11,27 @@ reflog = delta show = delta -# Delta settings -# [delta] -# features = side-by-side line-numbers decorations -# syntax-theme = Dracula -# plus-style = syntax "#003800" -# minus-style = syntax "#3f0001" - [delta] - plus-style = "syntax #012800" - minus-style = "syntax #340001" - syntax-theme = Monokai Extended - navigate = true - side-by-side = true + plus-style = "syntax #012800" + minus-style = "syntax #340001" + syntax-theme = Monokai Extended + navigate = true + side-by-side = true +[pretty] + slim = "%C(red)%h%C(yellow)%d%C(reset) %s %C(green)(%cd) %C(bold blue)<%an>%C(reset)" +[alias] + lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all + lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all + ; lg = !"git lg2" + tree = "forest --pretty=format:\"%C(red)%h %C(magenta)(%ar) %C(blue)%an %C(reset)%s\" --style=15 --reverse" + lg = log --graph --pretty=slim --abbrev-commit --date=relative + ; lg date: sorted by date and with absolute dates + lgd = log --graph --pretty=slim --abbrev-commit --date=local --date-order + ; lg upstream: also show upstream branch + lgu = !git lg $( git rev-parse --symbolic @{u} ) HEAD + ; lg date, upstream + lgdu = !git lgd $( git rev-parse --symbolic @{u} ) HEAD + ; lg me: my commits from all branches, by date + lgme = !git lgd --author=\"$( git config --get user.name )\" --all diff --git a/tools/Nabu b/tools/Nabu deleted file mode 160000 index f4ed446..0000000 --- a/tools/Nabu +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f4ed4460aa7cb2f9247c34265b91c5c6ac081bc2