refactor(treewide): format with alejandra

This commit is contained in:
ooks-io 2024-07-29 15:00:38 +12:00
parent 7fefb94400
commit 61cef505da
216 changed files with 5995 additions and 3969 deletions

View file

@ -1,13 +1,14 @@
{ config, lib, pkgs, ... }:
let
{
config,
lib,
pkgs,
...
}: let
inherit (config.colorscheme) palette;
inherit (lib) mkIf;
cfg = config.ooknet.multiplexer.tmux;
console = config.ooknet.console;
in
{
in {
config = mkIf (cfg.enable || console.multiplexer == "tmux") {
programs.tmux = {
enable = true;
@ -22,39 +23,43 @@ in
plugin = tmuxPlugins.mode-indicator;
}
];
extraConfig = /* sh */ ''
# General Settings
set -g set-clipboard on
#Appearance
set -g status-position top
set -g status-style "fg=#${palette.base05} bg=#${palette.base00}"
#Windows
set -g status-justify "centre"
setw -g window-status-current-format "#[bg=#${palette.base0B},fg=#${palette.base00},bold] #W "
setw -g window-status-format "#[bg=#${palette.base03},fg=#${palette.base05}] #W "
#Left
set -g status-left " #{tmux_mode_indicator} #[bg=#${palette.base0B},fg=#${palette.base00}] #S"
set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}'
#Move to Pane
bind -n M-Left select-pane -L
bind -n M-h select-pane -L
bind -n M-Right select-pane -R
bind -n M-l select-pane -R
bind -n M-Up select-pane -U
bind -n M-k select-pane -U
bind -n M-Down select-pane -D
bind -n M-j select-pane -D
#Split Pane
bind -n M-- split-window -h
bind -n M-= split-window -v
#Resize Pane
bind -n C-M-Up resize-pane -U 5
bind -n C-M-Down resize-pane -D 5
bind -n C-M-Left resize-pane -L 5
bind -n C-M-Right resize-pane -R 5
#Move to Window
bind -n M-1
'';
extraConfig =
/*
sh
*/
''
# General Settings
set -g set-clipboard on
#Appearance
set -g status-position top
set -g status-style "fg=#${palette.base05} bg=#${palette.base00}"
#Windows
set -g status-justify "centre"
setw -g window-status-current-format "#[bg=#${palette.base0B},fg=#${palette.base00},bold] #W "
setw -g window-status-format "#[bg=#${palette.base03},fg=#${palette.base05}] #W "
#Left
set -g status-left " #{tmux_mode_indicator} #[bg=#${palette.base0B},fg=#${palette.base00}] #S"
set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}'
#Move to Pane
bind -n M-Left select-pane -L
bind -n M-h select-pane -L
bind -n M-Right select-pane -R
bind -n M-l select-pane -R
bind -n M-Up select-pane -U
bind -n M-k select-pane -U
bind -n M-Down select-pane -D
bind -n M-j select-pane -D
#Split Pane
bind -n M-- split-window -h
bind -n M-= split-window -v
#Resize Pane
bind -n C-M-Up resize-pane -U 5
bind -n C-M-Down resize-pane -D 5
bind -n C-M-Left resize-pane -L 5
bind -n C-M-Right resize-pane -R 5
#Move to Window
bind -n M-1
'';
};
};
}

View file

@ -1,13 +1,16 @@
{ osConfig, lib, config, pkgs, ... }:
let
{
osConfig,
lib,
config,
pkgs,
...
}: let
inherit (config.colorscheme) palette;
inherit (lib) mkIf;
inherit (config.ooknet) console;
inherit (osConfig.ooknet.host) admin;
cfg = config.ooknet.multiplexer.zellij;
console = config.ooknet.console;
admin = osConfig.ooknet.host.admin;
in
{
in {
config = mkIf (cfg.enable || console.multiplexer == "zellij") {
programs.zellij = {
enable = true;
@ -16,6 +19,7 @@ in
default_shell = "${admin.shell}";
default_layout = "default";
pane_frames = false;
scrollback_editor = "${console.editor}";
themes = {
"${config.colorscheme.slug}" = {
fg = "#${palette.base05}";
@ -35,29 +39,160 @@ in
};
# Layouts
# Default layout
xdg.configFile."zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix { inherit pkgs config; };
# Layout for bash scripts
xdg.configFile."zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix { inherit pkgs config; };
# Layout for configuring my flake
xdg.configFile."zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix { inherit pkgs config; };
xdg.configFile = {
# Default layout
"zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix {inherit pkgs config;};
# Layout for bash scripts
"zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix {inherit pkgs config;};
# Layout for configuring my flake
"zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix {inherit pkgs config;};
# Additional keybinds
"zellij/config.kdl".text =
# kdl
''
keybinds clear-defaults=true {
shared_except "locked" {
bind "Alt 1" { GoToTab 1; }
bind "Alt 2" { GoToTab 2; }
bind "Alt 3" { GoToTab 3; }
bind "Alt 4" { GoToTab 4; }
bind "Alt 5" { GoToTab 5; }
bind "Alt 6" { GoToTab 6; }
bind "Alt 7" { GoToTab 7; }
bind "Alt 8" { GoToTab 8; }
bind "Alt 9" { GoToTab 9; }
bind "Alt -" { Resize "Decrease" ; }
bind "Alt =" { Resize "Increase" ; }
}
# Additional keybinds
xdg.configFile."zellij/config.kdl".text = /* kdl */ ''
keybinds {
shared_except "locked" {
bind "Alt 1" { GoToTab 1; }
bind "Alt 2" { GoToTab 2; }
bind "Alt 3" { GoToTab 3; }
bind "Alt 4" { GoToTab 4; }
bind "Alt 5" { GoToTab 5; }
bind "Alt 6" { GoToTab 6; }
bind "Alt 7" { GoToTab 7; }
bind "Alt 8" { GoToTab 8; }
bind "Alt 9" { GoToTab 9; }
locked {
bind "Alt g" { SwitchToMode "Normal" ; }
}
resize {
bind "Alt r" { SwitchToMode "Normal" ; }
bind "h" "Left" { Resize "Increase Left" ; }
bind "j" "Down" { Resize "Increase Down" ; }
bind "k" "Up" { Resize "Increase Up" ; }
bind "l" "Right" { Resize "Increase Right" ; }
}
pane {
bind "Alt p" { SwitchToMode "Normal" ; }
bind "c" { Clear ; }
bind "e" { TogglePaneEmbedOrFloating ; SwitchToMode "Normal" ; }
bind "f" { ToggleFocusFullscreen ; SwitchToMode "Normal" ; }
bind "j" "Down" { NewPane "Down" ; SwitchToMode "Normal" ; }
bind "l" "Right" { NewPane "Right" ; SwitchToMode "Normal" ; }
bind "n" { NewPane ; SwitchToMode "Normal" ; }
bind "p" { SwitchFocus ; SwitchToMode "Normal" ; }
bind "r" { SwitchToMode "RenamePane" ; PaneNameInput 0 ; }
bind "w" { ToggleFloatingPanes ; SwitchToMode "Normal" ; }
bind "x" { CloseFocus ; SwitchToMode "Normal" ; }
bind "z" { TogglePaneFrames ; SwitchToMode "Normal" ; }
}
move {
bind "Alt m" { SwitchToMode "Normal"; }
bind "h" "Left" { MovePane "Left" ; }
bind "j" "Down" { MovePane "Down" ; }
bind "k" "Up" { MovePane "Up" ; }
bind "l" "Right" { MovePane "Right" ; }
}
tab {
bind "Alt t" { SwitchToMode "Normal" ; }
bind "b" { BreakPane; SwitchToMode "Normal" ; }
bind "h" { MoveTab "Left" ; }
bind "l" { MoveTab "Right" ; }
bind "n" { NewTab ; SwitchToMode "Normal" ; }
bind "r" { SwitchToMode "RenameTab" ; TabNameInput 0 ; }
bind "x" { CloseTab ; SwitchToMode "Normal" ; }
bind "1" { GoToTab 1 ; SwitchToMode "Normal" ; }
bind "2" { GoToTab 2 ; SwitchToMode "Normal" ; }
bind "3" { GoToTab 3 ; SwitchToMode "Normal" ; }
bind "4" { GoToTab 4 ; SwitchToMode "Normal" ; }
bind "5" { GoToTab 5 ; SwitchToMode "Normal" ; }
bind "6" { GoToTab 6 ; SwitchToMode "Normal" ; }
bind "7" { GoToTab 7 ; SwitchToMode "Normal" ; }
bind "8" { GoToTab 8 ; SwitchToMode "Normal" ; }
bind "9" { GoToTab 9 ; SwitchToMode "Normal" ; }
}
scroll {
bind "Alt s" { SwitchToMode "Normal" ; }
bind "e" { EditScrollback; SwitchToMode "Normal" ; }
bind "d" { HalfPageScrollDown ; }
bind "u" { HalfPageScrollUp ; }
bind "j" "Down" { ScrollDown ; }
bind "k" "Up" { ScrollUp ; }
bind "Home" { ScrollToTop ; SwitchToMode "Normal" ; }
bind "End" { ScrollToBottom ; SwitchToMode "Normal" ; }
bind "PageDown" { PageScrollDown ; }
bind "PageUp" { PageScrollUp ; }
bind "s" { SwitchToMode "EnterSearch" ; SearchInput 0 ; }
}
search {
bind "Alt s" { SwitchToMode "Normal" ; }
bind "n" { Search "down" ; }
bind "p" { Search "up" ; }
bind "c" { SearchToggleOption "CaseSensitivity" ; }
bind "w" { SearchToggleOption "Wrap" ; }
bind "o" { SearchToggleOption "WholeWord" ; }
}
entersearch {
bind "Alt c" "Esc" { SwitchToMode "Scroll" ; }
bind "Enter" { SwitchToMode "Search" ; }
}
renametab {
bind "Alt c" { SwitchToMode "Normal" ; }
bind "Esc" { UndoRenameTab ; SwitchToMode "Tab" ; }
}
renamepane {
bind "Alt c" { SwitchToMode "Normal"; }
bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
}
session {
bind "Alt o" { SwitchToMode "Normal" ; }
bind "d" { Detach ; }
bind "w" {
LaunchOrFocusPlugin "session-manager" {
floating true
move_to_focused_tab true
};
SwitchToMode "Normal"
}
}
shared_except "locked" {
bind "Alt g" { SwitchToMode "Locked" ; }
bind "Alt q" { Quit ; }
bind "Alt h" "Alt Left" { MoveFocusOrTab "Left" ; }
bind "Alt l" "Alt Right" { MoveFocusOrTab "Right" ; }
bind "Alt j" "Alt Down" { MoveFocus "Down" ; }
bind "Alt k" "Alt Up" { MoveFocus "Up" ; }
bind "Alt [" { PreviousSwapLayout ; }
bind "Alt ]" { NextSwapLayout ; }
}
shared_except "normal" "locked" {
bind "Enter" "Esc" { SwitchToMode "Normal" ; }
}
shared_except "pane" "locked" {
bind "Alt p" { SwitchToMode "Pane" ; }
}
shared_except "resize" "locked" {
bind "Alt r" { SwitchToMode "Resize" ; }
}
shared_except "scroll" "locked" {
bind "Alt s" { SwitchToMode "Scroll" ; }
}
shared_except "session" "locked" {
bind "Alt o" { SwitchToMode "Session" ; }
}
shared_except "tab" "locked" {
bind "Alt t" { SwitchToMode "Tab" ; }
}
shared_except "move" "locked" {
bind "Alt m" { SwitchToMode "Move" ; }
}
}
}
'';
'';
};
};
}

View file

@ -1,60 +1,64 @@
{ pkgs, config, ... }:
let
inherit (config.colorscheme) palette;
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=#${palette.base0D},bold] {tabs}"
format_space ""
pkgs,
config,
...
}: let
inherit (config.colorscheme) palette;
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=#${palette.base0D},bold] {tabs}"
format_space ""
border_enabled "true"
border_char ""
border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom"
border_enabled "true"
border_char ""
border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom"
hide_frame_for_single_pane "true"
hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] "
mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " "
tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10"
command_git_branch_rendermode "static"
command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10"
command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
}
}
}
children
}
tab name="terminal" focus=true {
pane name="term" focus=true
children
}
}
'';
tab name="terminal" focus=true {
pane name="term" focus=true
}
}
'';
}

View file

@ -1,66 +1,70 @@
{ pkgs, config, ... }:
let
inherit (config.colorscheme) palette;
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=#${palette.base0D},bold] {tabs}"
format_space ""
pkgs,
config,
...
}: let
inherit (config.colorscheme) palette;
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=#${palette.base0D},bold] {tabs}"
format_space ""
border_enabled "true"
border_char ""
border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom"
border_enabled "true"
border_char ""
border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom"
hide_frame_for_single_pane "true"
hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] "
mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " "
tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10"
command_git_branch_rendermode "static"
command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10"
command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
}
}
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"
}
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"
}
}
'';
'';
}

View file

@ -1,64 +1,68 @@
{ pkgs, config, ... }:
let
inherit (config.colorscheme) palette;
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=#${palette.base0D},bold] {tabs}"
format_space ""
pkgs,
config,
...
}: let
inherit (config.colorscheme) palette;
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=#${palette.base0D},bold] {tabs}"
format_space ""
border_enabled "true"
border_char ""
border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom"
border_enabled "true"
border_char ""
border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom"
hide_frame_for_single_pane "true"
hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] "
mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " "
tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10"
command_git_branch_rendermode "static"
command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10"
command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
}
}
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"
}
}
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"
}
}
'';
'';
}