From 512774da029da29f807412c8fea09675e2d7d2f8 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Tue, 21 Jan 2025 13:38:57 +1100 Subject: [PATCH] zellij: remove old layout configuration --- .../zellij/layouts/defaultLayout.nix | 63 ------------- .../zellij/layouts/flakeLayout.nix | 88 ------------------- .../zellij/layouts/scriptLayout.nix | 69 --------------- modules/home/workstation/media/music.nix | 6 -- 4 files changed, 226 deletions(-) delete mode 100644 modules/home/console/tools/multiplexer/zellij/layouts/defaultLayout.nix delete mode 100644 modules/home/console/tools/multiplexer/zellij/layouts/flakeLayout.nix delete mode 100644 modules/home/console/tools/multiplexer/zellij/layouts/scriptLayout.nix diff --git a/modules/home/console/tools/multiplexer/zellij/layouts/defaultLayout.nix b/modules/home/console/tools/multiplexer/zellij/layouts/defaultLayout.nix deleted file mode 100644 index 10d842a..0000000 --- a/modules/home/console/tools/multiplexer/zellij/layouts/defaultLayout.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - pkgs, - osConfig, - hozen, - ... -}: let - inherit (hozen) color; -in { - text = - # kdl - '' - layout { - default_tab_template { - pane size=2 borderless=true { - plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { - format_left "{mode}" - format_right "{session} {command_git_branch} {datetime}" - format_center "#[fg=#${color.base0D},bold] {tabs}" - format_space "" - - border_enabled "true" - border_char "─" - border_format "#[fg=#${color.base05}]{char}" - border_position "bottom" - - hide_frame_for_single_pane "true" - - mode_normal "#[fg=#${color.base0D}] " - mode_tmux "#[fg=#${color.base0E}] " - mode_pane "#[fg=#${color.base08}] " - mode_tab "#[fg=#${color.base08}] " - mode_rename_tab "#[fg=#${color.base08}] " - mode_rename_pane "#[fg=#${color.base08}] " - mode_session "#[fg=#${color.base08}] " - mode_locked "#[fg=#${color.base05}] " - mode_move "#[fg=#${color.base0B}] " - mode_resize "#[fg=#${color.base0B}] " - mode_prompt "#[fg=#${color.base0A}] " - mode_search "#[fg=#${color.base0A}] " - mode_enter_search "#[fg=#${color.base0A}] " - - tab_normal "#[bg=#${color.base01}] {name} " - tab_active "#[bg=#${color.base02}] {name} " - tab_separator " " - - command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=#${color.base0C}] {stdout} " - command_git_branch_interval "10" - command_git_branch_rendermode "static" - - datetime "#[fg=#${color.base05},bold] {format} " - datetime_format "%I:%M %p" - datetime_timezone "${osConfig.time.timeZone}" - } - } - children - } - tab name="terminal" focus=true { - pane name="term" focus=true - } - } - ''; -} diff --git a/modules/home/console/tools/multiplexer/zellij/layouts/flakeLayout.nix b/modules/home/console/tools/multiplexer/zellij/layouts/flakeLayout.nix deleted file mode 100644 index d563a58..0000000 --- a/modules/home/console/tools/multiplexer/zellij/layouts/flakeLayout.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - pkgs, - hozen, - osConfig, - ook, - ... -}: let - inherit (hozen) color; - inherit (ook.lib.generators) mkZellijLayout; -in { - text = mkZellijLayout { - zjstatusFile = "${inputs'.zjstatus.packages.default}/bin/zjstatus.wasm"; - icon = ""; - timeZone = "${osConfig.time.timeZone}"; - tabs = '' - tab name="terminal" focus=true { - pane name="term" cwd="$FLAKE" focus=true - } - tab name="editor" { - pane name="edit" edit="$FLAKE" - } - tab name="git" { - pane name="git" cwd="$FLAKE" command="lazygit" - } - ''; - }; - /* - kdl - */ - '' - layout { - default_tab_template { - pane size=2 borderless=true { - plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { - format_left "{mode}" - format_right "{session} {command_git_branch} {datetime}" - format_center "#[fg=#${color.base0D},bold] {tabs}" - format_space "" - - border_enabled "true" - border_char "─" - border_format "#[fg=#${color.base05}]{char}" - border_position "bottom" - - hide_frame_for_single_pane "true" - - mode_normal "#[fg=#${color.base0D}] " - mode_tmux "#[fg=#${color.base0E}] " - mode_pane "#[fg=#${color.base08}] " - mode_tab "#[fg=#${color.base08}] " - mode_rename_tab "#[fg=#${color.base08}] " - mode_rename_pane "#[fg=#${color.base08}] " - mode_session "#[fg=#${color.base08}] " - mode_locked "#[fg=#${color.base05}] " - mode_move "#[fg=#${color.base0B}] " - mode_resize "#[fg=#${color.base0B}] " - mode_prompt "#[fg=#${color.base0A}] " - mode_search "#[fg=#${color.base0A}] " - mode_enter_search "#[fg=#${color.base0A}] " - - tab_normal "#[bg=#${color.base01}] {name} " - tab_active "#[bg=#${color.base02}] {name} " - tab_separator " " - - command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=#${color.base0C}] {stdout} " - command_git_branch_interval "10" - command_git_branch_rendermode "static" - - datetime "#[fg=#${color.base05},bold] {format} " - datetime_format "%I:%M %p" - datetime_timezone "${osConfig.time.timeZone}" - } - } - children - } - tab name="terminal" focus=true { - pane name="term" cwd="$FLAKE" focus=true - } - tab name="editor" { - pane name="edit" edit="$FLAKE" - } - tab name="git" { - pane name="git" cwd="$FLAKE" command="lazygit" - } - } - ''; -} diff --git a/modules/home/console/tools/multiplexer/zellij/layouts/scriptLayout.nix b/modules/home/console/tools/multiplexer/zellij/layouts/scriptLayout.nix deleted file mode 100644 index 835b8ee..0000000 --- a/modules/home/console/tools/multiplexer/zellij/layouts/scriptLayout.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - pkgs, - hozen, - osConfig, - ... -}: let - inherit (hozen) color; -in { - text = - /* - kdl - */ - '' - layout { - default_tab_template { - pane size=2 borderless=true { - plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { - format_left "{mode}" - format_right "{session} {command_git_branch} {datetime}" - format_center "#[fg=#${color.base0D},bold] {tabs}" - format_space "" - - border_enabled "true" - border_char "─" - border_format "#[fg=#${color.base05}]{char}" - border_position "bottom" - - hide_frame_for_single_pane "true" - - mode_normal "#[fg=#${color.base0D}] " - mode_tmux "#[fg=#${color.base0E}] " - mode_pane "#[fg=#${color.base08}] " - mode_tab "#[fg=#${color.base08}] " - mode_rename_tab "#[fg=#${color.base08}] " - mode_rename_pane "#[fg=#${color.base08}] " - mode_session "#[fg=#${color.base08}] " - mode_locked "#[fg=#${color.base05}] " - mode_move "#[fg=#${color.base0B}] " - mode_resize "#[fg=#${color.base0B}] " - mode_prompt "#[fg=#${color.base0A}] " - mode_search "#[fg=#${color.base0A}] " - mode_enter_search "#[fg=#${color.base0A}] " - - tab_normal "#[bg=#${color.base01}] {name} " - tab_active "#[bg=#${color.base02}] {name} " - tab_separator " " - - command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=#${color.base0C}] {stdout} " - command_git_branch_interval "10" - command_git_branch_rendermode "static" - - datetime "#[fg=#${color.base05},bold] {format} " - datetime_format "%I:%M %p" - datetime_timezone "${osConfig.time.timeZone}" - } - } - children - } - tab name="edit" focus=true { - pane edit="./" name="edit" focus=true size="85%" borderless=true - pane name="term" focus=false size="15%" borderless=false - } - tab name="git" focus=false { - pane name="git" focus=false command="lazygit" - } - } - ''; -} diff --git a/modules/home/workstation/media/music.nix b/modules/home/workstation/media/music.nix index 1855058..85ec603 100644 --- a/modules/home/workstation/media/music.nix +++ b/modules/home/workstation/media/music.nix @@ -10,8 +10,6 @@ inherit (lib) mkIf getExe elem; inherit (builtins) attrValues; inherit (osConfig.networking) hostName; - inherit (osConfig.ooknet.console.tools) zellij; - inherit (osConfig.ooknet.console) multiplexer; inherit (osConfig.ooknet.workstation) profiles; inherit (osConfig.age.secrets) spotify_key; inherit (config.ooknet) binds; @@ -111,9 +109,5 @@ in { } ''; }; - - home.shellAliases = mkIf (zellij.enable || multiplexer == "zellij") { - zjm = "zellij --layout music"; - }; }; }