From 7e48b724e5718123af9cf20c0b6851e7b9e226b4 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 5 Aug 2025 09:19:37 +0200 Subject: [PATCH 1/4] fixes `mup` command --- Justfile | 2 +- flake.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Justfile b/Justfile index 32a5b9c..05e7029 100644 --- a/Justfile +++ b/Justfile @@ -29,7 +29,7 @@ mre: darwin-rebuild switch --flake . mup: - darwin-rebuild switch --recreate-lock-file --flake . && brew upgrade --cask --greedy + darwin-rebuild switch --recreate-lock-file --flake . # dnsc-deck dre: diff --git a/flake.lock b/flake.lock index f4579c7..25b42e9 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754337839, + "narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "856df6f6922845abd4fd958ce21febc07ca2fa45", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1754174776, - "narHash": "sha256-Sp3FRM6xNwNtGzYH/HByjzJYHSQvwsW+lDMMZNF43PQ=", + "lastModified": 1754365350, + "narHash": "sha256-NLWIkn1qM0wxtZu/2NXRaujWJ4Y1PSZlc7h0y6pOzOQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "e6e2f43a62b7dbc8aa8b1adb7101b0d8b9395445", + "rev": "c5d7e957397ecb7d48b99c928611c6e780db1b56", "type": "github" }, "original": { @@ -125,16 +125,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -153,11 +153,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754151594, - "narHash": "sha256-S30TWshtDmNlU30u842RidFUraKj1f2dd4nrKRHm3gE=", + "lastModified": 1754278406, + "narHash": "sha256-jvIQTMN5EzoOP5RaGztpVese8a3wqy0M/h6tNzycW28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7b6929d8b900de3142638310f8bc40cff4f2c507", + "rev": "6a489c9482ca676ce23c0bcd7f2e1795383325fa", "type": "github" }, "original": { From bd0612511d5596f094fe02cacc1d0fa19e3464bb Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 12 Aug 2025 15:03:11 +0200 Subject: [PATCH 2/4] updates wezterm config --- modules/wezterm/config/helpers.lua | 6 ++++++ modules/wezterm/config/keybindings.lua | 7 +------ modules/wezterm/config/tab_bar.lua | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/wezterm/config/helpers.lua b/modules/wezterm/config/helpers.lua index 265cc4d..82d6d76 100644 --- a/modules/wezterm/config/helpers.lua +++ b/modules/wezterm/config/helpers.lua @@ -52,4 +52,10 @@ function M.move_pane(key, direction) } end +function M.get_zoom_state(active_pane) + local zoom_state = active_pane:is_zoomed() and "[Z] " or "" + + return zoom_state +end + return M diff --git a/modules/wezterm/config/keybindings.lua b/modules/wezterm/config/keybindings.lua index d659f16..4f45797 100644 --- a/modules/wezterm/config/keybindings.lua +++ b/modules/wezterm/config/keybindings.lua @@ -17,12 +17,7 @@ function M.apply_to_config(config) { key = "-", mods = "LEADER", - action = wezterm.action.SplitVertical({ domain = "CurrentPaneDomain" }), - }, - { - key = "-", - mods = "LEADER", - action = wezterm.action.SplitVertical({ domain = "CurrentPaneDomain" }), + action = wezterm.action.SplitPane({ direction = "Down", size = { Percent = 30 } }), }, { key = "x", diff --git a/modules/wezterm/config/tab_bar.lua b/modules/wezterm/config/tab_bar.lua index 9aaab81..cc62ea6 100644 --- a/modules/wezterm/config/tab_bar.lua +++ b/modules/wezterm/config/tab_bar.lua @@ -5,9 +5,12 @@ local helpers = require("helpers") local M = {} local function get_elements(for_window) + local active_pane = for_window:active_pane() + return { { Background = { Color = theme.colors().tab_bar.background } }, { Foreground = { Color = theme.colors().tab_bar.inactive_tab.fg_color } }, + { Text = helpers.get_zoom_state(active_pane) }, { Text = "h:" .. wezterm.hostname() .. " " }, { Text = "upgrades:" .. helpers.get_outdated_packages() .. " " }, { Text = "bat:" .. helpers.get_primary_battery_state() .. " " }, From 192ae592bc7a5c1b5f9ac04f9b58268ef70724d3 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 12 Aug 2025 15:06:43 +0200 Subject: [PATCH 3/4] updates tab_bar --- modules/wezterm/config/helpers.lua | 6 ++++-- modules/wezterm/config/tab_bar.lua | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/wezterm/config/helpers.lua b/modules/wezterm/config/helpers.lua index 82d6d76..fd504ca 100644 --- a/modules/wezterm/config/helpers.lua +++ b/modules/wezterm/config/helpers.lua @@ -53,9 +53,11 @@ function M.move_pane(key, direction) end function M.get_zoom_state(active_pane) - local zoom_state = active_pane:is_zoomed() and "[Z] " or "" + if active_pane.is_zoomed then + return "[Z]" + end - return zoom_state + return "" end return M diff --git a/modules/wezterm/config/tab_bar.lua b/modules/wezterm/config/tab_bar.lua index cc62ea6..fa4411e 100644 --- a/modules/wezterm/config/tab_bar.lua +++ b/modules/wezterm/config/tab_bar.lua @@ -10,7 +10,7 @@ local function get_elements(for_window) return { { Background = { Color = theme.colors().tab_bar.background } }, { Foreground = { Color = theme.colors().tab_bar.inactive_tab.fg_color } }, - { Text = helpers.get_zoom_state(active_pane) }, + { Text = helpers.get_zoom_state(active_pane) .. " " }, { Text = "h:" .. wezterm.hostname() .. " " }, { Text = "upgrades:" .. helpers.get_outdated_packages() .. " " }, { Text = "bat:" .. helpers.get_primary_battery_state() .. " " }, From 63a0fc9af6ab592249300a809e112ffe8ad45732 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 12 Aug 2025 15:34:06 +0200 Subject: [PATCH 4/4] adds zoom status to tab bar --- modules/wezterm/config/helpers.lua | 17 +++++++++++++++-- modules/wezterm/config/tab_bar.lua | 4 +--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/modules/wezterm/config/helpers.lua b/modules/wezterm/config/helpers.lua index fd504ca..f9729c2 100644 --- a/modules/wezterm/config/helpers.lua +++ b/modules/wezterm/config/helpers.lua @@ -52,8 +52,21 @@ function M.move_pane(key, direction) } end -function M.get_zoom_state(active_pane) - if active_pane.is_zoomed then +function M.get_is_zoomed(for_window) + local tab = for_window:active_tab() + local panes_info = tab:panes_with_info() + + for _, pane_info in ipairs(panes_info) do + if pane_info.is_active then + return pane_info.is_zoomed + end + end +end + +function M.get_zoomed_status(for_window) + local is_zoomed = M.get_is_zoomed(for_window) + + if is_zoomed then return "[Z]" end diff --git a/modules/wezterm/config/tab_bar.lua b/modules/wezterm/config/tab_bar.lua index fa4411e..ef65593 100644 --- a/modules/wezterm/config/tab_bar.lua +++ b/modules/wezterm/config/tab_bar.lua @@ -5,17 +5,15 @@ local helpers = require("helpers") local M = {} local function get_elements(for_window) - local active_pane = for_window:active_pane() - return { { Background = { Color = theme.colors().tab_bar.background } }, { Foreground = { Color = theme.colors().tab_bar.inactive_tab.fg_color } }, - { Text = helpers.get_zoom_state(active_pane) .. " " }, { Text = "h:" .. wezterm.hostname() .. " " }, { Text = "upgrades:" .. helpers.get_outdated_packages() .. " " }, { Text = "bat:" .. helpers.get_primary_battery_state() .. " " }, { Background = { Color = theme.colors().tab_bar.active_tab.bg_color } }, { Foreground = { Color = theme.colors().tab_bar.active_tab.fg_color } }, + { Text = helpers.get_zoomed_status(for_window) .. " " }, { Text = " session >> " .. for_window:active_workspace() .. " " }, } end