mirror of
https://github.com/Swarsel/.dotfiles.git
synced 2025-12-06 09:07:21 +01:00
feat: add zellij again
This commit is contained in:
Leon Schwarzäugl
parent
5b591ba10b
commit
f2267de522
GPG key ID:
26A54C31F2A4FD84
10 changed files with 564 additions and 658 deletions
|
|
@ -2420,7 +2420,7 @@ This app checks for different apps that I keep around in the scratchpad for quic
|
|||
STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true)
|
||||
CHECK=$(swaymsg -t get_tree | grep kittyterm || true)
|
||||
if [ "$CHECK" == "" ]; then
|
||||
exec kitty -T kittyterm &
|
||||
exec kitty -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm &
|
||||
sleep 1
|
||||
fi
|
||||
if [ "$STR" == "" ]; then
|
||||
|
|
@ -2467,6 +2467,28 @@ This app checks for different apps that I keep around in the scratchpad for quic
|
|||
|
||||
#+end_src
|
||||
|
||||
**** swarselzellij
|
||||
|
||||
#+begin_src shell :tangle scripts/swarselzellij.sh
|
||||
KITTIES=$(($(pgrep -P 1 kitty | wc -l) - 1))
|
||||
|
||||
if [[ $KITTIES -lt 1 ]]; then
|
||||
exec kitty -o confirm_os_window_close=0 zellij attach --create main
|
||||
else
|
||||
exec kitty -o confirm_os_window_close=0 zellij attach --create "temp $KITTIES"
|
||||
fi
|
||||
#+end_src
|
||||
|
||||
#+begin_src nix :tangle pkgs/swarselzellij/default.nix
|
||||
{ self, name, writeShellApplication, kitty }:
|
||||
writeShellApplication {
|
||||
inherit name;
|
||||
runtimeInputs = [ kitty ];
|
||||
text = builtins.readFile "${self}/scripts/${name}.sh";
|
||||
}
|
||||
|
||||
#+end_src
|
||||
|
||||
**** waybarupdate
|
||||
:PROPERTIES:
|
||||
:CUSTOM_ID: h:f93f66f9-6b8b-478e-b139-b2f382c1f25e
|
||||
|
|
@ -8584,6 +8606,7 @@ This is just a separate container for derivations defined in [[#h:64a5cc16-6b16-
|
|||
fhs
|
||||
swarsel-bootstrap
|
||||
swarsel-displaypower
|
||||
swarselzellij
|
||||
];
|
||||
}
|
||||
#+end_src
|
||||
|
|
@ -9329,205 +9352,21 @@ Here we set some aliases (some of them should be shellApplications instead) as w
|
|||
:CUSTOM_ID: h:00de4901-631c-4b4c-86ce-d9d6e62ed8c7
|
||||
:END:
|
||||
#+begin_src nix :tangle profiles/home/common/zellij.nix
|
||||
_:
|
||||
# { pkgs, config, ... }:
|
||||
# let
|
||||
# inherit (config.lib.stylix) colors;
|
||||
# sesh = pkgs.writeScriptBin "sesh" ''
|
||||
# #! /usr/bin/env sh
|
||||
|
||||
# # Taken from https://github.com/zellij-org/zellij/issues/884#issuecomment-1851136980
|
||||
# # select a directory using zoxide
|
||||
# ZOXIDE_RESULT=$(zoxide query --interactive)
|
||||
# # checks whether a directory has been selected
|
||||
# if [[ -z "$ZOXIDE_RESULT" ]]; then
|
||||
# # if there was no directory, select returns without executing
|
||||
# exit 0
|
||||
# fi
|
||||
# # extracts the directory name from the absolute path
|
||||
# SESSION_TITLE=$(echo "$ZOXIDE_RESULT" | sed 's#.*/##')
|
||||
|
||||
# # get the list of sessions
|
||||
# SESSION_LIST=$(zellij list-sessions -n | awk '{print $1}')
|
||||
|
||||
# # checks if SESSION_TITLE is in the session list
|
||||
# if echo "$SESSION_LIST" | grep -q "^$SESSION_TITLE$"; then
|
||||
# # if so, attach to existing session
|
||||
# zellij attach "$SESSION_TITLE"
|
||||
# else
|
||||
# # if not, create a new session
|
||||
# echo "Creating new session $SESSION_TITLE and CD $ZOXIDE_RESULT"
|
||||
# cd $ZOXIDE_RESULT
|
||||
# zellij attach -c "$SESSION_TITLE"
|
||||
# fi
|
||||
# '';
|
||||
|
||||
# in
|
||||
{ self, config, pkgs, ... }:
|
||||
{
|
||||
|
||||
programs.zellij = {
|
||||
enable = true;
|
||||
};
|
||||
home.packages = [
|
||||
# pkgs.tmate
|
||||
# sesh
|
||||
|
||||
home.packages = with pkgs; [
|
||||
zjstatus
|
||||
];
|
||||
# xdg.configFile."zellij/config.kdl".source = ../../../programs/zellij/config.kdl;
|
||||
# xdg.configFile."zellij/layouts/default.kdl".text = ''
|
||||
# layout {
|
||||
# swap_tiled_layout name="vertical" {
|
||||
# tab max_panes=5 {
|
||||
# pane split_direction="vertical" {
|
||||
# pane
|
||||
# pane { children; }
|
||||
# }
|
||||
# }
|
||||
# tab max_panes=8 {
|
||||
# pane split_direction="vertical" {
|
||||
# pane { children; }
|
||||
# pane { pane; pane; pane; pane; }
|
||||
# }
|
||||
# }
|
||||
# tab max_panes=12 {
|
||||
# pane split_direction="vertical" {
|
||||
# pane { children; }
|
||||
# pane { pane; pane; pane; pane; }
|
||||
# pane { pane; pane; pane; pane; }
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
|
||||
# swap_tiled_layout name="horizontal" {
|
||||
# tab max_panes=5 {
|
||||
# pane
|
||||
# pane
|
||||
# }
|
||||
# tab max_panes=8 {
|
||||
# pane {
|
||||
# pane split_direction="vertical" { children; }
|
||||
# pane split_direction="vertical" { pane; pane; pane; pane; }
|
||||
# }
|
||||
# }
|
||||
# tab max_panes=12 {
|
||||
# pane {
|
||||
# pane split_direction="vertical" { children; }
|
||||
# pane split_direction="vertical" { pane; pane; pane; pane; }
|
||||
# pane split_direction="vertical" { pane; pane; pane; pane; }
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
|
||||
# swap_tiled_layout name="stacked" {
|
||||
# tab min_panes=5 {
|
||||
# pane split_direction="vertical" {
|
||||
# pane
|
||||
# pane stacked=true { children; }
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
|
||||
# swap_floating_layout name="staggered" {
|
||||
# floating_panes
|
||||
# }
|
||||
|
||||
# swap_floating_layout name="enlarged" {
|
||||
# floating_panes max_panes=10 {
|
||||
# pane { x "5%"; y 1; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 2; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 3; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 4; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 5; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 6; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 7; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 8; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 9; width "90%"; height "90%"; }
|
||||
# pane focus=true { x 10; y 10; width "90%"; height "90%"; }
|
||||
# }
|
||||
# }
|
||||
|
||||
# swap_floating_layout name="spread" {
|
||||
# floating_panes max_panes=1 {
|
||||
# pane {y "50%"; x "50%"; }
|
||||
# }
|
||||
# floating_panes max_panes=2 {
|
||||
# pane { x "1%"; y "25%"; width "45%"; }
|
||||
# pane { x "50%"; y "25%"; width "45%"; }
|
||||
# }
|
||||
# floating_panes max_panes=3 {
|
||||
# pane focus=true { y "55%"; width "45%"; height "45%"; }
|
||||
# pane { x "1%"; y "1%"; width "45%"; }
|
||||
# pane { x "50%"; y "1%"; width "45%"; }
|
||||
# }
|
||||
# floating_panes max_panes=4 {
|
||||
# pane { x "1%"; y "55%"; width "45%"; height "45%"; }
|
||||
# pane focus=true { x "50%"; y "55%"; width "45%"; height "45%"; }
|
||||
# pane { x "1%"; y "1%"; width "45%"; height "45%"; }
|
||||
# pane { x "50%"; y "1%"; width "45%"; height "45%"; }
|
||||
# }
|
||||
# }
|
||||
|
||||
# default_tab_template {
|
||||
# pane size=2 borderless=true {
|
||||
# plugin location="file://${pkgs.zjstatus}/bin/zjstatus.wasm" {
|
||||
# format_left "{mode}#[bg=#${colors.base00}] {tabs}"
|
||||
# format_center ""
|
||||
# format_right "#[bg=#${colors.base00},fg=#${colors.base0D}]#[bg=#${colors.base0D},fg=#${colors.base01},bold] #[bg=#${colors.base02},fg=#${colors.base05},bold] {session} #[bg=#${colors.base03},fg=#${colors.base05},bold]"
|
||||
# format_space ""
|
||||
# format_hide_on_overlength "true"
|
||||
# format_precedence "crl"
|
||||
|
||||
# border_enabled "false"
|
||||
# border_char "─"
|
||||
# border_format "#[fg=#6C7086]{char}"
|
||||
# border_position "top"
|
||||
|
||||
# mode_normal "#[bg=#${colors.base0B},fg=#${colors.base02},bold] NORMAL#[bg=#${colors.base03},fg=#${colors.base0B}]█"
|
||||
# mode_locked "#[bg=#${colors.base04},fg=#${colors.base02},bold] LOCKED #[bg=#${colors.base03},fg=#${colors.base04}]█"
|
||||
# mode_resize "#[bg=#${colors.base08},fg=#${colors.base02},bold] RESIZE#[bg=#${colors.base03},fg=#${colors.base08}]█"
|
||||
# mode_pane "#[bg=#${colors.base0D},fg=#${colors.base02},bold] PANE#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_tab "#[bg=#${colors.base07},fg=#${colors.base02},bold] TAB#[bg=#${colors.base03},fg=#${colors.base07}]█"
|
||||
# mode_scroll "#[bg=#${colors.base0A},fg=#${colors.base02},bold] SCROLL#[bg=#${colors.base03},fg=#${colors.base0A}]█"
|
||||
# mode_enter_search "#[bg=#${colors.base0D},fg=#${colors.base02},bold] ENT-SEARCH#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_search "#[bg=#${colors.base0D},fg=#${colors.base02},bold] SEARCHARCH#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_rename_tab "#[bg=#${colors.base07},fg=#${colors.base02},bold] RENAME-TAB#[bg=#${colors.base03},fg=#${colors.base07}]█"
|
||||
# mode_rename_pane "#[bg=#${colors.base0D},fg=#${colors.base02},bold] RENAME-PANE#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_session "#[bg=#${colors.base0E},fg=#${colors.base02},bold] SESSION#[bg=#${colors.base03},fg=#${colors.base0E}]█"
|
||||
# mode_move "#[bg=#${colors.base0F},fg=#${colors.base02},bold] MOVE#[bg=#${colors.base03},fg=#${colors.base0F}]█"
|
||||
# mode_prompt "#[bg=#${colors.base0D},fg=#${colors.base02},bold] PROMPT#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_tmux "#[bg=#${colors.base09},fg=#${colors.base02},bold] TMUX#[bg=#${colors.base03},fg=#${colors.base09}]█"
|
||||
|
||||
# // formatting for inactive tabs
|
||||
# tab_normal "#[bg=#${colors.base03},fg=#${colors.base0D}]█#[bg=#${colors.base0D},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{floating_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
# tab_normal_fullscreen "#[bg=#${colors.base03},fg=#${colors.base0D}]█#[bg=#${colors.base0D},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{fullscreen_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
# tab_normal_sync "#[bg=#${colors.base03},fg=#${colors.base0D}]█#[bg=#${colors.base0D},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{sync_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
|
||||
# // formatting for the current active tab
|
||||
# tab_active "#[bg=#${colors.base03},fg=#${colors.base09}]█#[bg=#${colors.base09},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{floating_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
# tab_active_fullscreen "#[bg=#${colors.base03},fg=#${colors.base09}]█#[bg=#${colors.base09},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{fullscreen_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
# tab_active_sync "#[bg=#${colors.base03},fg=#${colors.base09}]█#[bg=#${colors.base09},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{sync_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
|
||||
# // separator between the tabs
|
||||
# tab_separator "#[bg=#${colors.base00}] "
|
||||
|
||||
# // indicators
|
||||
# tab_sync_indicator " "
|
||||
# tab_fullscreen_indicator " "
|
||||
# tab_floating_indicator " "
|
||||
|
||||
# command_git_branch_command "git rev-parse --abbrev-ref HEAD"
|
||||
# command_git_branch_format "#[fg=blue] {stdout} "
|
||||
# command_git_branch_interval "10"
|
||||
# command_git_branch_rendermode "static"
|
||||
|
||||
# datetime "#[fg=#6C7086,bold] {format} "
|
||||
# datetime_format "%A, %d %b %Y %H:%M"
|
||||
# datetime_timezone "Europe/London"
|
||||
# }
|
||||
# }
|
||||
# children
|
||||
# }
|
||||
# }
|
||||
# '';
|
||||
|
||||
xdg.configFile = {
|
||||
"zellij/config.kdl".text = import "${self}/programs/zellij/config.kdl.nix" { inherit config; };
|
||||
"zellij/layouts/default.kdl".text = import "${self}/programs/zellij/layouts/default.kdl.nix" { inherit config pkgs; };
|
||||
};
|
||||
|
||||
}
|
||||
#+end_src
|
||||
|
|
@ -10597,7 +10436,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
|
|||
wrapperFeatures.gtk = true;
|
||||
config = rec {
|
||||
modifier = "Mod4";
|
||||
terminal = "kitty";
|
||||
# terminal = "kitty";
|
||||
menu = "fuzzel";
|
||||
bars = [{
|
||||
command = "waybar";
|
||||
|
|
@ -10684,7 +10523,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
|
|||
"${modifier}+Ctrl+Shift+r" = "exec swarsel-displaypower";
|
||||
"${modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
|
||||
"${modifier}+r" = "mode resize";
|
||||
"${modifier}+Return" = "exec kitty";
|
||||
"${modifier}+Return" = "exec swarselzellij";
|
||||
"${modifier}+Print" = "exec screenshare";
|
||||
# "XF86AudioRaiseVolume" = "exec pa 5%";
|
||||
"XF86AudioRaiseVolume" = "exec pamixer -i 5";
|
||||
|
|
@ -10713,7 +10552,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
|
|||
input = config.swarselsystems.standardinputs;
|
||||
workspaceOutputAssign = workplaceOutputs;
|
||||
startup = config.swarselsystems.startup ++ [
|
||||
{ command = "kitty -T kittyterm"; }
|
||||
{ command = "kitty -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm"; }
|
||||
{ command = "sleep 60; kitty -T spotifytui -o confirm_os_window_close=0 spotify_player"; }
|
||||
];
|
||||
window = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue