ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(treewide): format with alejandra

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

24
home/modules/console/editor/helix/default.nix
View file

@ -1,17 +1,19 @@
{ inputs, config, pkgs, lib, ... }:
let
{
inputs,
config,
pkgs,
lib,
...
}: let
inherit (config) colorscheme;
inherit (lib) mkIf;
cfg = config.ooknet.editor.helix;
console = config.ooknet.console;
in
{
in {
imports = [
./languages.nix
];
config = mkIf (cfg.enable || console.editor == "helix") {
programs.helix = {
enable = true;
@ -49,9 +51,9 @@ in
select = "underline";
};
statusline = {
left = [ "mode" "spinner" ];
center = [ "file-name" ];
right = [ "diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type" ];
left = ["mode" "spinner"];
center = ["file-name"];
right = ["diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type"];
};
lsp = {
display-messages = true;
@ -64,7 +66,7 @@ in
W = ":set whitespace.render none";
};
};
themes = import ./theme.nix { inherit colorscheme; };
themes = import ./theme.nix {inherit colorscheme;};
};
};
}

13
home/modules/console/editor/helix/languages.nix
View file

@ -1,12 +1,13 @@
{ pkgs, lib, config, ... }:
let
{
pkgs,
lib,
config,
...
}: let
inherit (lib) mkIf getExe;
cfg = config.ooknet.editor.helix;
console = config.ooknet.console;
in
{
in {
config = mkIf (cfg.enable || console.editor == "helix") {
programs.helix.languages = {
language = let

145
home/modules/console/editor/helix/theme.nix
View file

@ -1,19 +1,21 @@
{ colorscheme }: {
{colorscheme}: {
"${colorscheme.slug}" = {
palette = builtins.mapAttrs (_name: value: "#${value}") colorscheme.colors; # Add leading '#'
"attributes" = "base09";
"comment" = { fg = "base03"; modifiers = [ "italic" ]; };
"comment" = {
fg = "base03";
modifiers = ["italic"];
};
"constant" = "base09";
"constant.character.escape" = "base0C";
"constant.numeric" = "base09";
"constructor" = "base0D";
"debug" = "base03";
"diagnostic" = { modifiers = [ "underlined" ]; };
"diagnostic.error" = { underline = { style = "curl"; }; };
"diagnostic.hint" = { underline = { style = "curl"; }; };
"diagnostic.info" = { underline = { style = "curl"; }; };
"diagnostic.warning" = { underline = { style = "curl"; }; };
"diagnostic" = {modifiers = ["underlined"];};
"diagnostic.error" = {underline = {style = "curl";};};
"diagnostic.hint" = {underline = {style = "curl";};};
"diagnostic.info" = {underline = {style = "curl";};};
"diagnostic.warning" = {underline = {style = "curl";};};
"diff.delta" = "base09";
"diff.minus" = "base08";
"diff.plus" = "base0B";
@ -23,49 +25,114 @@
"info" = "base0D";
"keyword" = "base0E";
"label" = "base0E";
"markup.bold" = { fg = "base0A"; modifiers = [ "bold" ]; };
"markup.bold" = {
fg = "base0A";
modifiers = ["bold"];
};
"markup.heading" = "base0D";
"markup.italic" = { fg = "base0E"; modifiers = [ "italic" ]; };
"markup.italic" = {
fg = "base0E";
modifiers = ["italic"];
};
"markup.link.text" = "base08";
"markup.link.url" = { fg = "base09"; modifiers = [ "underlined" ]; };
"markup.link.url" = {
fg = "base09";
modifiers = ["underlined"];
};
"markup.list" = "base08";
"markup.quote" = "base0C";
"markup.raw" = "base0B";
"markup.strikethrough" = { modifiers = [ "crossed_out" ]; };
"markup.strikethrough" = {modifiers = ["crossed_out"];};
"namespace" = "base0E";
"operator" = "base05";
"special" = "base0D";
"string" = "base0B";
"type" = "base0A";
"ui.background" = { bg = "base00"; };
"ui.bufferline" = { fg = "base04"; bg = "base00"; };
"ui.bufferline.active" = { fg = "base00"; bg = "base03"; modifiers = [ "bold" ]; };
"ui.cursor" = { fg = "base04"; modifiers = [ "reversed" ]; };
"ui.cursor.insert" = { fg = "base0A"; modifiers = [ "underlined" ]; };
"ui.cursor.match" = { fg = "base0A"; modifiers = [ "underlined" ]; };
"ui.cursor.select" = { fg = "base0A"; modifiers = [ "underlined" ]; };
"ui.cursorline.primary" = { fg = "base05"; bg = "base01"; };
"ui.gutter" = { bg = "base00"; };
"ui.help" = { fg = "base06"; bg = "base01"; };
"ui.linenr" = { fg = "base03"; bg = "base00"; };
"ui.linenr.selected" = { fg = "base04"; bg = "base01"; modifiers = [ "bold" ]; };
"ui.menu" = { fg = "base05"; bg = "base01"; };
"ui.menu.scroll" = { fg = "base03"; bg = "base01"; };
"ui.menu.selected" = { fg = "base01"; bg = "base04"; };
"ui.popup" = { bg = "base01"; };
"ui.selection" = { bg = "base02"; };
"ui.selection.primary" = { bg = "base02"; };
"ui.statusline" = { fg = "base0B"; bg = "base02"; };
"ui.statusline.inactive" = { bg = "base01"; fg = "base02"; };
"ui.statusline.insert" = { fg = "base00"; bg = "base0B"; };
"ui.statusline.normal" = { fg = "base00"; bg = "base04"; };
"ui.statusline.select" = { fg = "base00"; bg = "base0E"; };
"ui.background" = {bg = "base00";};
"ui.bufferline" = {
fg = "base04";
bg = "base00";
};
"ui.bufferline.active" = {
fg = "base00";
bg = "base03";
modifiers = ["bold"];
};
"ui.cursor" = {
fg = "base04";
modifiers = ["reversed"];
};
"ui.cursor.insert" = {
fg = "base0A";
modifiers = ["underlined"];
};
"ui.cursor.match" = {
fg = "base0A";
modifiers = ["underlined"];
};
"ui.cursor.select" = {
fg = "base0A";
modifiers = ["underlined"];
};
"ui.cursorline.primary" = {
fg = "base05";
bg = "base01";
};
"ui.gutter" = {bg = "base00";};
"ui.help" = {
fg = "base06";
bg = "base01";
};
"ui.linenr" = {
fg = "base03";
bg = "base00";
};
"ui.linenr.selected" = {
fg = "base04";
bg = "base01";
modifiers = ["bold"];
};
"ui.menu" = {
fg = "base05";
bg = "base01";
};
"ui.menu.scroll" = {
fg = "base03";
bg = "base01";
};
"ui.menu.selected" = {
fg = "base01";
bg = "base04";
};
"ui.popup" = {bg = "base01";};
"ui.selection" = {bg = "base02";};
"ui.selection.primary" = {bg = "base02";};
"ui.statusline" = {
fg = "base0B";
bg = "base02";
};
"ui.statusline.inactive" = {
bg = "base01";
fg = "base02";
};
"ui.statusline.insert" = {
fg = "base00";
bg = "base0B";
};
"ui.statusline.normal" = {
fg = "base00";
bg = "base04";
};
"ui.statusline.select" = {
fg = "base00";
bg = "base0E";
};
"ui.text" = "base05";
"ui.text.focus" = "base05";
"ui.virtual.indent-guide" = { fg = "base03"; };
"ui.virtual.ruler" = { bg = "base01"; };
"ui.virtual.whitespace" = { fg = "base01"; };
"ui.window" = { bg = "base01"; };
"ui.virtual.indent-guide" = {fg = "base03";};
"ui.virtual.ruler" = {bg = "base01";};
"ui.virtual.whitespace" = {fg = "base01";};
"ui.window" = {bg = "base01";};
"variable" = "base08";
"variable.other.member" = "base08";
"warning" = "base09";

27
home/modules/console/editor/nvim/default.nix
View file

@ -1,16 +1,19 @@
{ config, lib, inputs, pkgs, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.editor.nvim;
console = config.ooknet.console;
ookvim = inputs.ookvim.packages.${pkgs.system}.default;
in
{
config,
lib,
inputs,
pkgs,
...
}: let
inherit (lib) mkIf;
inherit (config.ooknet) console;
cfg = config.ooknet.editor.nvim;
ookvim = inputs.ooks-vim.packages.${pkgs.system}.ooks-vim;
in {
config = mkIf (cfg.enable || console.editor == "nvim") {
home.packages = [ ookvim ];
home.packages = [ookvim];
home.sessionVariables.EDITOR = mkIf (console.editor == "nvim") "nvim";
};
}

83
home/modules/console/multiplexer/tmux/default.nix
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
'';
};
};
}

193
home/modules/console/multiplexer/zellij/default.nix
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" ; }
}
}
}
'';
'';
};
};
}

104
home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix
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
}
}
'';
}

114
home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix
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"
}
}
'';
'';
}

112
home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix
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"
}
}
'';
'';
}

13
home/modules/console/shell/bash/default.nix
View file

@ -1,12 +1,13 @@
{ config, lib, osConfig, ... }:
let
{
config,
lib,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.shell.bash;
admin = osConfig.ooknet.host.admin;
in
{
in {
config = mkIf (cfg.enable || admin.shell == "bash") {
programs.bash.enable = true;
};

16
home/modules/console/shell/fish/aliases.nix
View file

@ -1,14 +1,16 @@
{ lib, config, osConfig, pkgs, ... }:
let
{
lib,
config,
osConfig,
pkgs,
...
}: let
inherit (lib) mkIf getExe;
inherit (pkgs) bat eza dust nh;
cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin;
in
{
in {
config = mkIf (cfg.enable || admin.shell == "fish") {
programs.fish = {
shellAliases = {

20
home/modules/console/shell/fish/binds.nix
View file

@ -1,16 +1,18 @@
{ lib, config, osConfig, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin;
in
{
lib,
config,
osConfig,
...
}: let
inherit (lib) mkIf;
inherit (osConfig.ooknet.host) admin;
cfg = config.ooknet.shell.fish;
in {
config = mkIf (cfg.enable || admin.shell == "fish") {
programs.fish.functions = {
fish_user_key_bindings = ''
bind --preset -M insert \cf fe
bind --preset -M insert \cf $EDITOR $FLAKE
bind --preset -M insert \ec fzf_cd_widget
'';
};

22
home/modules/console/shell/fish/default.nix
View file

@ -1,12 +1,14 @@
{ lib, config, osConfig, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin;
in
{
lib,
config,
osConfig,
...
}: let
inherit (lib) mkIf;
inherit (osConfig.ooknet.host) admin;
cfg = config.ooknet.shell.fish;
in {
imports = [
./plugins.nix
./binds.nix
@ -27,7 +29,8 @@ in
set fish_cursor_insert line blink
set fish_cursor_replace_one underscore blink
set fish_cursor_visual block
'' +
''
+
# Use terminal colors
''
set -U fish_color_autosuggestion brblack
@ -60,4 +63,3 @@ in
};
};
}

15
home/modules/console/shell/fish/plugins.nix
View file

@ -1,12 +1,14 @@
{ lib, config, pkgs, osConfig, ... }:
let
{
lib,
config,
pkgs,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin;
in
{
in {
config = mkIf (cfg.enable || admin.shell == "fish") {
programs.fish = {
plugins = [
@ -26,4 +28,3 @@ in
};
};
}

15
home/modules/console/shell/zsh/default.nix
View file

@ -1,16 +1,17 @@
{ lib, config, osConfig, ... }:
let
{
lib,
config,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.shell.zsh;
admin = osConfig.ooknet.host.admin;
in
{
in {
imports = [
./plugins.nix
];
config = mkIf (cfg.enable || admin.shell == "zsh") {
programs.zsh = {
enable = true;

14
home/modules/console/shell/zsh/plugins.nix
View file

@ -1,12 +1,14 @@
{ lib, pkgs, config, osConfig, ... }:
let
{
lib,
pkgs,
config,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.shell.zsh;
admin = osConfig.ooknet.host.admin;
in
{
in {
config = mkIf (cfg.enable || admin.shell == "zsh") {
programs.zsh.plugins = [
{

13
home/modules/console/tools/bat.nix
View file

@ -1,11 +1,12 @@
{ lib, config, pkgs, ... }:
let
{
lib,
config,
pkgs,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.bat;
in
{
in {
config = mkIf cfg.enable {
programs.bat = {
enable = true;

12
home/modules/console/tools/btop.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }:
let
{
lib,
config,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.btop;
in
{
in {
config = mkIf cfg.enable {
programs.btop = {
enable = true;

12
home/modules/console/tools/direnv.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }:
let
{
lib,
config,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.direnv;
in
{
in {
config = mkIf cfg.enable {
programs.direnv = {
enable = true;

12
home/modules/console/tools/eza.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }:
let
{
lib,
config,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.eza;
in
{
in {
config = mkIf cfg.enable {
programs.eza = {
enable = true;

15
home/modules/console/tools/ffmpeg.nix
View file

@ -1,12 +1,13 @@
{ lib, config, pkgs, ... }:
let
{
lib,
config,
pkgs,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.ffmpeg;
in
{
in {
config = mkIf cfg.enable {
home.packages = [ pkgs.ffmpeg ];
home.packages = [pkgs.ffmpeg];
};
}

13
home/modules/console/tools/fzf.nix
View file

@ -1,12 +1,13 @@
{ lib, config, osConfig, ... }:
let
{
lib,
config,
osConfig,
...
}: let
inherit (lib) mkIf;
admin = osConfig.ooknet.host.admin;
cfg = config.ooknet.tools.fzf;
in
{
in {
config = mkIf cfg.enable {
programs.fzf = {
enable = true;

25
home/modules/console/tools/git.nix
View file

@ -1,26 +1,27 @@
{ pkgs, config, lib, osConfig, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.tools.git;
admin = osConfig.ooknet.host.admin;
in
{
{
pkgs,
config,
lib,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.git;
admin = osConfig.ooknet.host.admin;
in {
config = mkIf cfg.enable {
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
userName = admin.gitName;
userEmail = admin.gitEmail;
ignores = [ ".direnv" "result" ];
ignores = [".direnv" "result"];
lfs.enable = true;
};
home.packages = with pkgs; [
lazygit
gh
];
};
}

15
home/modules/console/tools/nixIndex.nix
View file

@ -1,12 +1,13 @@
{ lib, config, inputs, ... }:
let
{
lib,
config,
inputs,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.nixIndex;
in
{
imports = [ inputs.nix-index-db.hmModules.nix-index ];
in {
imports = [inputs.nix-index-db.hmModules.nix-index];
config = mkIf cfg.enable {
programs = {
nix-index = {

15
home/modules/console/tools/sourcegraph.nix
View file

@ -1,12 +1,13 @@
{ lib, config, pkgs, ... }:
let
{
lib,
config,
pkgs,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.sourcegraph;
in
{
in {
config = mkIf cfg.enable {
home.packages = [ pkgs.src-cli ];
home.packages = [pkgs.src-cli];
};
}

13
home/modules/console/tools/ssh.nix
View file

@ -1,11 +1,12 @@
{ lib, config, osConfig, ... }:
let
{
lib,
config,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = config.ooknet.tools.ssh;
in
{
in {
config = mkIf cfg.enable {
programs.ssh = {
enable = true;

13
home/modules/console/tools/starship.nix
View file

@ -1,11 +1,11 @@
{ config, lib, ... }:
let
{
config,
lib,
...
}: let
cfg = config.ooknet.tools.starship;
inherit (lib) concatStrings mkIf;
in
{
in {
config = mkIf cfg.enable {
programs.starship = {
enable = true;
@ -73,4 +73,3 @@ in
};
};
}

19
home/modules/console/tools/utils.nix
View file

@ -1,14 +1,15 @@
{ pkgs, lib, config, ... }:
let
cfg = config.ooknet.tools.utils;
in
{
pkgs,
lib,
config,
...
}: let
cfg = config.ooknet.tools.utils;
in {
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
bc # Calculator
# file utility
duf
du-dust
@ -19,7 +20,7 @@ in
zip
unzip
unrar
# file transfer
wget
httpie # Better curl
@ -31,7 +32,7 @@ in
gum
# audio ctrl
pamixer
diffsitter # Better diff
jq # JSON pretty printer and manipulator
tldr # Community maintained help pages