From f8eff459a21c70fb1cdf04b5a6214035b98646fe Mon Sep 17 00:00:00 2001 From: "kujiu (@uberwald)" Date: Mon, 11 Sep 2023 00:44:45 +0200 Subject: [PATCH] Add Lazygit + Lazydocker --- README.rst | 1 + common/.config/lazydocker/config.yml | 21 ++++++++++++++++++ common/.config/lazygit/config.yml | 30 ++++++++++++++++++++++++++ common/.config/tmux/nightfox_tmux.tmux | 3 +++ common/.config/tmux/tmux.conf | 3 ++- desktop/.config/aerc/aerc.conf | 2 +- desktop/.config/pms/pms.conf | 8 +++---- desktop/.config/tmuxinator/chat.yml | 8 +++---- desktop/.config/toot/settings.toml | 2 +- desktop/.elinks/elinks.conf | 29 +++++++++++++++++++++++++ 10 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 common/.config/lazydocker/config.yml create mode 100644 common/.config/lazygit/config.yml diff --git a/README.rst b/README.rst index f71fce4..5cceb74 100644 --- a/README.rst +++ b/README.rst @@ -20,6 +20,7 @@ Some configurations for these tools: - nvimpager (pager based on neovim) - konsole - elinks and browsh +- tmux and tmuxinator - pms You need to install: diff --git a/common/.config/lazydocker/config.yml b/common/.config/lazydocker/config.yml new file mode 100644 index 0000000..425f563 --- /dev/null +++ b/common/.config/lazydocker/config.yml @@ -0,0 +1,21 @@ +gui: + language: 'auto' # one of 'auto' | 'en' | 'pl' | 'nl' | 'de' | 'tr' + theme: + activeBorderColor: + - "#71839b" + - bold + inactiveBorderColor: + - "#738091" + selectedLineBgColor: + - "#3c5372" + optionsTextColor: + - "#dfdfe0" + screenMode: "fullscreen" # one of 'normal' | 'half' | 'fullscreen' +stats: + graphs: + - caption: CPU (%) + statPath: DerivedStats.CPUPercentage + color: "#719cd6" + - caption: Memory (%) + statPath: DerivedStats.MemoryPercentage + color: "#81b29a" diff --git a/common/.config/lazygit/config.yml b/common/.config/lazygit/config.yml new file mode 100644 index 0000000..6bc3384 --- /dev/null +++ b/common/.config/lazygit/config.yml @@ -0,0 +1,30 @@ +gui: + # stuff relating to the UI + windowSize: 'full' # one of 'normal' | 'half' | 'full' default is 'normal' + timeFormat: '02/01/06' # https://pkg.go.dev/time#Time.Format + shortTimeFormat: '15:04' + theme: + activeBorderColor: + - "#71839b" + - bold + inactiveBorderColor: + - "#738091" + searchingActiveBorderColor: + - "#d6d6d7" + - bold + optionsTextColor: + - "#dfdfe0" + selectedLineBgColor: + - "#3c5372" # set to `default` to have no background colour + selectedRangeBgColor: + - "#3c5372" + cherryPickedCommitBgColor: + - "#9d79d6" + cherryPickedCommitFgColor: + - "#131a24" + unstagedChangesColor: + - "#719cd6" + defaultFgColor: + - "#cdcecf" + border: 'single' # one of 'single' | 'double' | 'rounded' | 'hidden' + animateExplosion: true # shows an explosion animation when nuking the working tree diff --git a/common/.config/tmux/nightfox_tmux.tmux b/common/.config/tmux/nightfox_tmux.tmux index 9e873b5..0b89cf8 100644 --- a/common/.config/tmux/nightfox_tmux.tmux +++ b/common/.config/tmux/nightfox_tmux.tmux @@ -76,3 +76,6 @@ set -g window-status-bell-style "NONE" set -g window-status-format "#{?window_bell_flag,$WINDOW_BELL_FORMAT,$WINDOW_ACTIVITY_FORMAT_COND}" set -g window-status-current-format "#[fg=$BG0,bg=$ORANGE,nobold,nounderscore,noitalics]#[bold]#I#W#F#[fg=$ORANGE,bg=$BG0,nobold,nounderscore,noitalics]" + +set -g popup-style "fg=$FG1,bg=$SEL0" +set -g popup-border-style "fg=$BG4,bg=$SEL0" diff --git a/common/.config/tmux/tmux.conf b/common/.config/tmux/tmux.conf index 1884dae..58e0af0 100644 --- a/common/.config/tmux/tmux.conf +++ b/common/.config/tmux/tmux.conf @@ -16,9 +16,10 @@ set -g status-position top bind-key a send-prefix set -g display-time 1000 -set -g default-terminal xterm-direct +set -g default-terminal tmux-direct set -g mode-keys vi set -g status-keys vi +set -g set-titles off set-option -g allow-rename off set-window-option -g monitor-activity on diff --git a/desktop/.config/aerc/aerc.conf b/desktop/.config/aerc/aerc.conf index f20ee8f..171a7fa 100644 --- a/desktop/.config/aerc/aerc.conf +++ b/desktop/.config/aerc/aerc.conf @@ -41,7 +41,7 @@ pgp-provider=gpg # Set the $TERM environment variable used for the embedded terminal. # # Default: xterm-256color -term=xterm-direct +term=tmux-direct # Display OSC8 strings in the embedded terminal # diff --git a/desktop/.config/pms/pms.conf b/desktop/.config/pms/pms.conf index e2d3d3c..c0c7061 100644 --- a/desktop/.config/pms/pms.conf +++ b/desktop/.config/pms/pms.conf @@ -31,7 +31,7 @@ style listTitle @dfdfe0 bold style listTotal @719cd6 style mute @c94f6d style shortName @9d79d6 bold -style state default +style state @cdcecf style switches @f4a261 style tagMissing @c94f6d style topbar @cdcecf @@ -39,12 +39,12 @@ style version @738091 style volume @81b29a # Other styles -style commandText default +style commandText @cdcecf style errorText @131a24 @c94f6d bold -style readout default +style readout @cdcecf style searchText @d67ad2 bold style sequenceText @dbc074 -style statusbar default +style statusbar @cdcecf style visualText @dbc074 # Unbind some default keys diff --git a/desktop/.config/tmuxinator/chat.yml b/desktop/.config/tmuxinator/chat.yml index 9815474..c20a24d 100644 --- a/desktop/.config/tmuxinator/chat.yml +++ b/desktop/.config/tmuxinator/chat.yml @@ -1,11 +1,11 @@ name: chat windows: - - news: TERM=xterm-256color newsboat - - xmpp: TERM=xterm-256color poezio - - mail1: aerc + - news: TERM=tmux-256color newsboat + - xmpp: TERM=tmux-256color poezio + - mail1: TERM=xterm-direct aerc - mail2: neomutt - toot: toot tui - cal: ikhal - - music: pms + - music: TERM=xterm-direct pms - other: diff --git a/desktop/.config/toot/settings.toml b/desktop/.config/toot/settings.toml index 7af2d83..8e7ab8c 100644 --- a/desktop/.config/toot/settings.toml +++ b/desktop/.config/toot/settings.toml @@ -52,7 +52,7 @@ visibility_private = ["", "", "", "#dbc074", ""] visibility_direct = ["", "", "", "#f4a261", ""] # Styles -bold = ["", "", "", ",bold", ""] +bold = ["", "", "", "#cdcecf,bold", ""] dim = ["", "", "", "#d6d6d7", ""] highlight = ["", "", "", "#81b29a,italics", ""] success = ["", "", "", "#81b29a", ""] diff --git a/desktop/.elinks/elinks.conf b/desktop/.elinks/elinks.conf index 60d5f8e..233ed6e 100644 --- a/desktop/.elinks/elinks.conf +++ b/desktop/.elinks/elinks.conf @@ -2307,6 +2307,35 @@ ## terminal.xterm-direct.type set terminal.xterm-direct.type = 2 + ## terminal.tmux-direct + # Options specific to this terminal type (according to $TERM value). + + ## terminal.tmux-direct.charset + set terminal.tmux-direct.charset = "System" + ## terminal.tmux-direct.underline [0|1] + set terminal.tmux-direct.underline = 1 + ## terminal.tmux-direct.italic [0|1] + set terminal.tmux-direct.italic = 1 + ## terminal.tmux-direct.transparency [0|1] + set terminal.tmux-direct.transparency = 1 + ## terminal.tmux-direct.colors + #TODO: Must be changed to 4 when supported + set terminal.tmux-direct.colors = 3 + ## terminal.tmux-direct.block_cursor [0|1] + set terminal.tmux-direct.block_cursor = 0 + ## terminal.tmux-direct.restrict_852 [0|1] + set terminal.tmux-direct.restrict_852 = 0 + ## terminal.tmux-direct.combine [0|1] + set terminal.tmux-direct.combine = 0 + ## terminal.tmux-direct.utf_8_io [0|1] + set terminal.tmux-direct.utf_8_io = 1 + ## terminal.tmux-direct.m11_hack [0|1] + set terminal.tmux-direct.m11_hack = 0 + ## terminal.tmux-direct.latin1_title [0|1] + set terminal.tmux-direct.latin1_title = 0 + ## terminal.tmux-direct.type + set terminal.tmux-direct.type = 2 + ## terminal.konsole-direct.charset set terminal.konsole-direct.charset = "System" ## terminal.konsole-direct.underline [0|1]