From d22ce20dcfaefda1835a2d5be731bce76c78610b Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Tue, 25 Jun 2024 19:47:40 +0200 Subject: [PATCH] broot: fixings --- .config/broot/conf.hjson | 236 +----------------- .../broot/skins/catppuccin-macchiato.hjson | 171 ------------- .config/broot/skins/catppuccin-mocha.hjson | 171 ------------- .config/broot/skins/dark-blue.hjson | 116 --------- .config/broot/skins/dark-gruvbox.hjson | 88 ------- .config/broot/skins/dark-orange.hjson | 111 -------- .../skins/{white.hjson => dieter-light.hjson} | 12 +- .config/broot/skins/native-16.hjson | 132 ---------- .config/broot/skins/solarized-dark.hjson | 66 ----- .config/broot/skins/solarized-light.hjson | 118 --------- .config/broot/verbs.hjson | 11 +- .config/fish/config.fish | 3 +- .config/wezterm/wezterm.lua | 2 +- .gitconfig | 2 +- 14 files changed, 28 insertions(+), 1211 deletions(-) delete mode 100644 .config/broot/skins/catppuccin-macchiato.hjson delete mode 100644 .config/broot/skins/catppuccin-mocha.hjson delete mode 100644 .config/broot/skins/dark-blue.hjson delete mode 100644 .config/broot/skins/dark-gruvbox.hjson delete mode 100644 .config/broot/skins/dark-orange.hjson rename .config/broot/skins/{white.hjson => dieter-light.hjson} (91%) delete mode 100644 .config/broot/skins/native-16.hjson delete mode 100644 .config/broot/skins/solarized-dark.hjson delete mode 100644 .config/broot/skins/solarized-light.hjson diff --git a/.config/broot/conf.hjson b/.config/broot/conf.hjson index 9e91548..c74318c 100644 --- a/.config/broot/conf.hjson +++ b/.config/broot/conf.hjson @@ -1,114 +1,7 @@ -############################################################### -# This configuration file lets you -# - define new commands -# - change the shortcut or triggering keys of built-in verbs -# - change the colors -# - set default values for flags -# - set special behaviors on specific paths -# - and more... -# -# Configuration documentation is available at -# https://dystroy.org/broot -# -# This file's format is Hjson ( https://hjson.github.io/ ). Some -# properties are commented out. To enable them, remove the `#`. -# -############################################################### - -############################################################### -# Default flags -# You can set up flags you want broot to start with by -# default, for example `default_flags="-ihp"` if you usually want -# to see hidden and gitignored files and the permissions (then -# if you don't want the hidden files at a specific launch, -# you can launch broot with `br -H`). -# A popular flag is the `g` one which displays git related info. -# -# default_flags: - -############################################################### -# Terminal's title -# If you want the terminal's title to be updated when you change -# directory, set a terminal_title pattern by uncommenting one of -# the examples below and tuning it to your taste. -# -# terminal_title: "[broot] {git-name}" -# terminal_title: "{file} 🐄" -# terminal_title: "-= {file-name} =-" - -############################################################### -# Date/Time format -# If you want to change the format for date/time, uncomment the -# following line and change it according to -# https://docs.rs/chrono/0.4.11/chrono/format/strftime/index.html -# -# date_time_format: %Y/%m/%d %R - -############################################################### -# uncomment to activate modal mode -# -# (you really should read https://dystroy.org/broot/modal/ -# before as it may not suit everybody even among vim users) -# -# You may start either in 'command' mode, or in 'input' mode -# -# modal: true -# initial_mode: command - -############################################################### -# Whether to mark the selected line with a triangle -# show_selection_mark: true - -############################################################### -# Column order -# cols_order, if specified, must be a permutation of the following -# array. You should keep the name column at the end as it has a -# variable length. -# -# cols_order: [ -# mark -# git -# size -# permission -# date -# count -# branch -# name -# ] - -############################################################### -# True Colors -# If this parameter isn't set, broot tries to automatically -# determine whether true colors (24 bits) are available. -# As this process is unreliable, you may uncomment this setting -# and set it to false or true if you notice the colors in -# previewed images are too off. -# -# true_colors: false - -############################################################### -# Icons -# If you want to display icons in broot, uncomment this line -# (see https://dystroy.org/broot/icons for installation and -# troubleshooting) -# -# icon_theme: vscode +true_colors: true icon_theme: nerdfont -############################################################### -# Special paths -# If some paths must be handled specially, uncomment (and change -# this section as per the examples) -# Setting "list":"never" on a dir prevents broot from looking at its -# children when searching, unless the dir is the selected root. -# Setting "sum":"never" on a dir prevents broot from looking at its -# children when computing the total size and count of files. -# Setting "show":"always" makes a file visible even if its name -# starts with a dot. -# Setting "list":"always" may be useful on a link to a directory -# (they're otherwise not entered by broot unless selected) -# special_paths: { "/media" : { list: "never" @@ -124,137 +17,24 @@ special_paths: { # "~/my-link-I-want-to-explore": { "list": "always" } } -############################################################### -# Quit on last cancel -# You can usually cancel the last state change on escape. -# If you want the escape key to quit broot when there's nothing -# to cancel (for example when you just opened broot), uncomment -# this parameter -# -# quit_on_last_cancel: true - quit_on_last_cancel: true - -############################################################### -# Search modes -# -# broot allows many search modes. -# A search mode is defined by -# - the way to search: 'fuzzy', 'exact', 'regex', or 'tokens'. -# - where to search: file 'name', 'path', or file 'content' -# A search pattern may for example be "fuzzy path" (default), -# "regex content" or "exact path". -# -# The search mode is selected from its prefix. For example, if -# you type "abc", the default mode is "fuzzy path". If you type -# "/abc", the mode is "regex path". If you type "rn/abc", the mode -# is "regex name". -# -# This mapping may be modified. You may want to dedicate the -# empty prefix (the one which doesn't need a '/') to the -# search mode you use most often. The example below makes it -# easy to search on name rather than on the subpath. -# -# More information on -# https://dystroy.org/broot/input/#the-filtering-pattern -# -# search_modes: { -# : fuzzy name -# /: regex name -# } - -############################################################### -# File Extension Colors -# -# uncomment and modify the next section if you want to color -# file name depending on their extension -# -# ext_colors: { -# png: rgb(255, 128, 75) -# rs: yellow -# } - -############################################################### -# Max file size for content search -# -# Bigger files are ignored when searching their content. You -# can specify this size either in ISO units (eg 5GB) or in -# the old binary units (eg 44Kib) content_search_max_file_size: 10MB - -############################################################### -# Max Panels Count -# -# Change this if you sometimes want to have more than 2 panels -# open -# max_panels_count: 2 - -############################################################### -# Update work dir -# -# By default, broot process' work dir is kept in sync with the -# current's panel root. If you want to keep it unchanged, -# uncomment this setting -# -# update_work_dir: false - -############################################################### -# Kitty Keyboard extension -# -# If you want to use advanced keyboard shortcuts in Kitty -# compatible terminals (Kitty, Wezterm), set this to true. -# -# This makes it possible to use shortcuts like 'space-n', -# 'ctrl-alt-a-b', 'shift-space', etc. -# enable_kitty_keyboard: true - -############################################################### -# lines around matching line in filtered preview -# -# When searching the content of a file, you can have either -# only the matching lines displayed, or some of the surrounding -# ones too. -# lines_before_match_in_preview: 1 lines_after_match_in_preview: 1 -############################################################### -# Imports -# -# While it's possible to have all configuration in one file, -# it's more convenient to split it in several ones. -# Importing also allows to set a condition on the terminal's -# color, which makes it possible to have a different skin -# chosen when your terminal has a light background and when -# it has a light one. imports: [ - - # Verbs are better configured in verbs.hjson. But you - # can also add another files for your personal verbs verbs.hjson - # This file contains the skin to use when the terminal - # is dark (or when this couldn't be determined) { - luma: [ - dark - unknown - ] - # (un)comment to choose your preferred skin - file: skins/dark-blue.hjson - //file: skins/catppuccin-macchiato.hjson - //file: skins/catppuccin-mocha.hjson - //file: skins/dark-gruvbox.hjson - //file: skins/dark-orange.hjson - //file: skins/solarized-dark.hjson + luma: dark + file: skins/dieter-dark.hjson } - - # This skin is imported when your terminal is light { - luma: light - # (un)comment to choose your preferred skin - //file: skins/solarized-light.hjson - file: skins/white.hjson + luma: [ + light + unknown + ] + file: skins/dieter-light.hjson } ] diff --git a/.config/broot/skins/catppuccin-macchiato.hjson b/.config/broot/skins/catppuccin-macchiato.hjson deleted file mode 100644 index 21a3bf1..0000000 --- a/.config/broot/skins/catppuccin-macchiato.hjson +++ /dev/null @@ -1,171 +0,0 @@ -############################################################### -# A skin for a terminal with a dark background -# This skin uses RGB values so won't work for some -# terminals. -# -# Created by Majixed -# Based on the catppuccin-mocha theme by A. Taha Baki -# -# Doc at https://dystroy.org/broot/skins/ -############################################################### - -skin: { - input: rgb(202, 211, 245) none - # fg:none bg:$surface2 - selected_line: none rgb(91, 96, 120) - # fg:$text bg:none - default: rgb(202, 211, 245) none - # fg:$overlay0 bg:none - tree: rgb(110, 115, 141) none - # fg:$sapphire bg:none - parent: rgb(125, 196, 228) none - file: none none -# -### PERMISSIONS -# - perm__: rgb(184, 192, 224) none - # $peach - perm_r: rgb(245, 169, 127) none - # $maroon - perm_w: rgb(238, 153, 160) none - # $green - perm_x: rgb(166, 218, 149) none - # $teal - owner: rgb(139, 213, 202) none - # $sky - group: rgb(145, 215, 227) none -# -### DATE -# - # $subtext1 - dates: rgb(184, 192, 224) none -# -### DIRECTORY -# - # $lavender - directory: rgb(183, 189, 248) none Bold - # $green - exe: rgb(166, 218, 149) none - # $yellow - link: rgb(238, 212, 159) none - # $subtext0 - pruning: rgb(165, 173, 203) none Italic -# -### PREVIEW -# - # fg:$text bg:$mantle - preview_title: rgb(202, 211, 245) rgb(30, 32, 48) - # fg:$text bg:$mantle - preview: rgb(202, 211, 245) rgb(30, 32, 48) - # fg:$overlay0 - preview_line_number: rgb(110, 115, 141) none - # fg:$overlay0 - preview_separator: rgb(110, 115, 141) none -# -### MATCH -# - char_match: rgb(238, 212, 159) rgb(73, 77, 100) Bold Italic - content_match: rgb(238, 212, 159) rgb(73, 77, 100) Bold Italic - preview_match: rgb(238, 212, 159) rgb(73, 77, 100) Bold Italic - - # children count - # fg:$yellow bg:none - count: rgb(238, 212, 159) none - sparse: rgb(237, 135, 150) none - content_extract: rgb(237, 135, 150) none Italic -# -### GIT -# - git_branch: rgb(245, 169, 127) none - git_insertions: rgb(245, 169, 127) none - git_deletions: rgb(245, 169, 127) none - git_status_current: rgb(245, 169, 127) none - git_status_modified: rgb(245, 169, 127) none - git_status_new: rgb(245, 169, 127) none Bold - git_status_ignored: rgb(245, 169, 127) none - git_status_conflicted: rgb(245, 169, 127) none - git_status_other: rgb(245, 169, 127) none - staging_area_title: rgb(245, 169, 127) none -# -### FLAG -# - flag_label: rgb(237, 135, 150) none - flag_value: rgb(237, 135, 150) none Bold -# -### STATUS -# - # fg:none #bg:$mantle - status_normal: none rgb(30, 32, 48) - # fg:$red bg:$mantle - status_italic: rgb(237, 135, 150) rgb(30, 32, 48) Italic - # fg:$maroon bg:$mantle - status_bold: rgb(238, 153, 160) rgb(30, 32, 48) Bold - # fg:$maroon bg:$mantle - status_ellipsis: rgb(238, 153, 160) rgb(30, 32, 48) Bold - # fg:$text bg:$red - status_error: rgb(202, 211, 245) rgb(237, 135, 150) - # fg:$maroon bg:$mantle - status_job: rgb(238, 153, 160) rgb(40, 38, 37) - # fg:$maroon bg:$mantle - status_code: rgb(238, 153, 160) rgb(30, 32, 48) Italic - # fg:$maroon bg:$mantle - mode_command_mark: rgb(238, 153, 160) rgb(30, 32, 48) Bold -# -### HELP -# - # fg:$text - help_paragraph: rgb(202, 211, 245) none - # fg:$red - help_headers: rgb(237, 135, 150) none Bold - # fg:$peach - help_bold: rgb(245, 169, 127) none Bold - # fg:$yellow - help_italic: rgb(238, 212, 159) none Italic - # fg:green bg:$surface0 - help_code: rgb(166, 218, 149) rgb(54, 58, 79) - # fg:$overlay0 - help_table_border: rgb(110, 115, 141) none -# -### HEX -# - # fg:$text - hex_null: rgb(202, 211, 245) none - # fg:$peach - hex_ascii_graphic: rgb(245, 169, 127) none - # fg:$green - hex_ascii_whitespace: rgb(166, 218, 149) none - # fg: teal - hex_ascii_other: rgb(139, 213, 202) none - # fg: red - hex_non_ascii: rgb(237, 135, 150) none - - # fg:$text bg:$red - file_error: rgb(243, 60, 44) none -# -### PURPOSE -# - purpose_normal: none none - purpose_italic: rgb(169, 90, 127) none Italic - purpose_bold: rgb(169, 90, 127) none Bold - purpose_ellipsis: none none -# -### SCROLLBAR -# - # fg:$surface0 - scrollbar_track: rgb(54, 58, 79) none - # fg:$surface1 - scrollbar_thumb: rgb(91, 96, 120) none -# -### GOODTOBAD -# - good_to_bad_0: rgb(166, 218, 149) none - good_to_bad_1: rgb(139, 213, 202) none - good_to_bad_2: rgb(145, 215, 227) none - good_to_bad_3: rgb(125, 196, 228) none - good_to_bad_4: rgb(138, 173, 244) none - good_to_bad_5: rgb(183, 189, 248) none - good_to_bad_6: rgb(198, 160, 246) none - good_to_bad_7: rgb(245, 169, 127) none - good_to_bad_8: rgb(238, 153, 160) none - good_to_bad_9: rgb(237, 135, 150) none -} diff --git a/.config/broot/skins/catppuccin-mocha.hjson b/.config/broot/skins/catppuccin-mocha.hjson deleted file mode 100644 index 6ac1b92..0000000 --- a/.config/broot/skins/catppuccin-mocha.hjson +++ /dev/null @@ -1,171 +0,0 @@ -############################################################### -# A skin for a terminal with a dark background -# This skin uses RGB values so won't work for some -# terminals. -# -# Created by A. Taha Baki -# Based on the built-in gruvbox theme. -# -# Doc at https://dystroy.org/broot/skins/ -############################################################### - -skin: { - input: rgb(205, 214, 244) none - # fg:none bg:$surface2 - selected_line: none rgb(88, 91, 112) - # fg:$text bg:none - default: rgb(205, 214, 244) none - # fg:$overlay0 bg:none - tree: rgb(108, 112, 134) none - # fg:$sapphire bg:none - parent: rgb(116, 199, 236) none - file: none none -# -### PERMISSIONS -# - perm__: rgb(186, 194, 222) none - # $peach - perm_r: rgb(250, 179, 135) none - # $maroon - perm_w: rgb(235, 160, 172) none - # $green - perm_x: rgb(166, 227, 161) none - # $teal - owner: rgb(148, 226, 213) none - # $sky - group: rgb(137, 220, 235) none -# -### DATE -# - # $subtext1 - dates: rgb(186, 194, 222) none -# -### DIRECTORY -# - # $lavender - directory: rgb(180, 190, 254) none Bold - # $green - exe: rgb(166, 227, 161) none - # $yellow - link: rgb(249, 226, 175) none - # $subtext0 - pruning: rgb(166, 173, 200) none Italic -# -### PREVIEW -# - # fg:$text bg:$mantle - preview_title: rgb(205, 214, 244) rgb(24, 24, 37) - # fg:$text bg:$mantle - preview: rgb(205, 214, 244) rgb(24, 24, 37) - # fg:$overlay0 - preview_line_number: rgb(108, 112, 134) none - # fg:$overlay0 - preview_separator: rgb(108, 112, 134) none -# -### MATCH -# - char_match: rgb(249, 226, 175) rgb(69, 71, 90) Bold Italic - content_match: rgb(249, 226, 175) rgb(69, 71, 90) Bold Italic - preview_match: rgb(249, 226, 175) rgb(69, 71, 90) Bold Italic - - # children count - # fg:$yellow bg:none - count: rgb(249, 226, 175) none - sparse: rgb(243, 139, 168) none - content_extract: rgb(243, 139, 168) none Italic -# -### GIT -# - git_branch: rgb(250, 179, 135) none - git_insertions: rgb(250, 179, 135) none - git_deletions: rgb(250, 179, 135) none - git_status_current: rgb(250, 179, 135) none - git_status_modified: rgb(250, 179, 135) none - git_status_new: rgb(250, 179, 135) none Bold - git_status_ignored: rgb(250, 179, 135) none - git_status_conflicted: rgb(250, 179, 135) none - git_status_other: rgb(250, 179, 135) none - staging_area_title: rgb(250, 179, 135) none -# -### FLAG -# - flag_label: rgb(243, 139, 168) none - flag_value: rgb(243, 139, 168) none Bold -# -### STATUS -# - # fg:none #bg:$mantle - status_normal: none rgb(24, 24, 37) - # fg:$red bg:$mantle - status_italic: rgb(243, 139, 168) rgb(24, 24, 37) Italic - # fg:$maroon bg:$mantle - status_bold: rgb(235, 160, 172) rgb(24, 24, 37) Bold - # fg:$maroon bg:$mantle - status_ellipsis: rgb(235, 160, 172) rgb(24, 24, 37) Bold - # fg:$text bg:$red - status_error: rgb(205, 214, 244) rgb(243, 139, 168) - # fg:$maroon bg:$mantle - status_job: rgb(235, 160, 172) rgb(40, 38, 37) - # fg:$maroon bg:$mantle - status_code: rgb(235, 160, 172) rgb(24, 24, 37) Italic - # fg:$maroon bg:$mantle - mode_command_mark: rgb(235, 160, 172) rgb(24, 24, 37) Bold -# -### HELP -# - # fg:$text - help_paragraph: rgb(205, 214, 244) none - # fg:$red - help_headers: rgb(243, 139, 168) none Bold - # fg:$peach - help_bold: rgb(250, 179, 135) none Bold - # fg:$yellow - help_italic: rgb(249, 226, 175) none Italic - # fg:green bg:$surface0 - help_code: rgb(166, 227, 161) rgb(49, 50, 68) - # fg:$overlay0 - help_table_border: rgb(108, 112, 134) none -# -### HEX -# - # fg:$text - hex_null: rgb(205, 214, 244) none - # fg:$peach - hex_ascii_graphic: rgb(250, 179, 135) none - # fg:$green - hex_ascii_whitespace: rgb(166, 227, 161) none - # fg: teal - hex_ascii_other: rgb(148, 226, 213) none - # fg: red - hex_non_ascii: rgb(243, 139, 168) none - - # fg:$text bg:$red - file_error: rgb(251, 73, 52) none -# -### PURPOSE -# - purpose_normal: none none - purpose_italic: rgb(177, 98, 134) none Italic - purpose_bold: rgb(177, 98, 134) none Bold - purpose_ellipsis: none none -# -### SCROLLBAR -# - # fg:$surface0 - scrollbar_track: rgb(49, 50, 68) none - # fg:$surface1 - scrollbar_thumb: rgb(88, 91, 112) none -# -### GOODTOBAD -# - good_to_bad_0: rgb(166, 227, 161) none - good_to_bad_1: rgb(148, 226, 213) none - good_to_bad_2: rgb(137, 220, 235) none - good_to_bad_3: rgb(116, 199, 236) none - good_to_bad_4: rgb(137, 180, 250) none - good_to_bad_5: rgb(180, 190, 254) none - good_to_bad_6: rgb(203, 166, 247) none - good_to_bad_7: rgb(250, 179, 135) none - good_to_bad_8: rgb(235, 160, 172) none - good_to_bad_9: rgb(243, 139, 168) none -} diff --git a/.config/broot/skins/dark-blue.hjson b/.config/broot/skins/dark-blue.hjson deleted file mode 100644 index 7dbc7f4..0000000 --- a/.config/broot/skins/dark-blue.hjson +++ /dev/null @@ -1,116 +0,0 @@ -############################################################### -# A skin for a terminal with a dark background -# -# To create your own skin, copy this file, change the entries -# and import your skin file from the main conf file (look -# for "imports") -# -# Doc at https://dystroy.org/broot/skins/ -############################################################### - -############################################################### -# Skin -# If you want to change the colors of broot, -# uncomment the following block and start messing -# with the various values. -# A skin entry value is made of two parts separated with a '/': -# The first one is the skin for the active panel. -# The second one, optional, is the skin for non active panels. -# You may find explanations and other skins on -# https://dystroy.org/broot/skins -############################################################### -skin: { - default: gray(22) none / gray(20) none - tree: gray(8) None / gray(4) None - parent: gray(18) None / gray(13) None - file: gray(22) None / gray(15) None - directory: ansi(110) None bold / ansi(110) None - exe: Cyan None - link: Magenta None - pruning: gray(12) None Italic - perm__: gray(5) None - perm_r: ansi(94) None - perm_w: ansi(132) None - perm_x: ansi(65) None - owner: ansi(138) None - group: ansi(131) None - count: ansi(138) gray(4) - dates: ansi(66) None - sparse: ansi(214) None - content_extract: ansi(29) None - content_match: ansi(34) None - device_id_major: ansi(138) None - device_id_sep: ansi(102) None - device_id_minor: ansi(138) None - git_branch: ansi(178) None - git_insertions: ansi(28) None - git_deletions: ansi(160) None - git_status_current: gray(5) None - git_status_modified: ansi(28) None - git_status_new: ansi(94) None bold - git_status_ignored: gray(17) None - git_status_conflicted: ansi(88) None - git_status_other: ansi(88) None - selected_line: None gray(6) / None gray(4) - char_match: Green None - file_error: Red None - flag_label: gray(15) gray(2) - flag_value: ansi(178) gray(2) bold - input: White gray(2) / gray(15) None - status_error: gray(22) ansi(124) - status_job: ansi(220) gray(5) - status_normal: gray(20) gray(4) / gray(2) gray(2) - status_italic: ansi(178) gray(4) / gray(2) gray(2) - status_bold: ansi(178) gray(4) bold / gray(2) gray(2) - status_code: ansi(229) gray(4) / gray(2) gray(2) - status_ellipsis: gray(19) gray(1) / gray(2) gray(2) - purpose_normal: gray(20) gray(2) - purpose_italic: ansi(178) gray(2) - purpose_bold: ansi(178) gray(2) bold - purpose_ellipsis: gray(20) gray(2) - scrollbar_track: gray(7) None / gray(4) None - scrollbar_thumb: gray(22) None / gray(14) None - help_paragraph: gray(20) None - help_bold: ansi(178) None bold - help_italic: ansi(229) None - help_code: gray(21) gray(3) - help_headers: ansi(178) None - help_table_border: ansi(239) None - preview: gray(20) gray(1) / gray(18) gray(2) - preview_title: gray(23) gray(2) / gray(21) gray(2) - preview_line_number: gray(12) gray(3) - preview_separator: gray(5) None - preview_match: None ansi(29) - hex_null: gray(8) None - hex_ascii_graphic: gray(18) None - hex_ascii_whitespace: ansi(143) None - hex_ascii_other: ansi(215) None - hex_non_ascii: ansi(167) None - staging_area_title: gray(22) gray(2) / gray(20) gray(3) - mode_command_mark: gray(5) ansi(204) bold - good_to_bad_0: ansi(28) - good_to_bad_1: ansi(29) - good_to_bad_2: ansi(29) - good_to_bad_3: ansi(29) - good_to_bad_4: ansi(29) - good_to_bad_5: ansi(100) - good_to_bad_6: ansi(136) - good_to_bad_7: ansi(172) - good_to_bad_8: ansi(166) - good_to_bad_9: ansi(196) -} - -############################################################### -# Syntax Theme -# -# If you want to choose the theme used for preview, uncomment -# one of the following lines: -# -# syntax_theme: GitHub -# syntax_theme: SolarizedDark -# syntax_theme: SolarizedLight -syntax_theme: MochaDark -# syntax_theme: MochaDark -# syntax_theme: OceanDark -# syntax_theme: OceanLight - diff --git a/.config/broot/skins/dark-gruvbox.hjson b/.config/broot/skins/dark-gruvbox.hjson deleted file mode 100644 index e62d583..0000000 --- a/.config/broot/skins/dark-gruvbox.hjson +++ /dev/null @@ -1,88 +0,0 @@ -############################################################### -# A skin for a terminal with a dark background -# This skin uses RGB values so won't work for some -# terminals. -# -# -# (initially contributed by @basbebe) -# -# Doc at https://dystroy.org/broot/skins/ -############################################################### - -skin: { - default: rgb(235, 219, 178) none / rgb(189, 174, 147) none - tree: rgb(70, 70, 80) None / rgb(60, 60, 60) None - parent: rgb(235, 219, 178) none / rgb(189, 174, 147) none Italic - file: None None / None None Italic - directory: rgb(131, 165, 152) None Bold / rgb(131, 165, 152) None - exe: rgb(184, 187, 38) None - link: rgb(104, 157, 106) None - pruning: rgb(124, 111, 100) None Italic - perm__: None None - perm_r: rgb(215, 153, 33) None - perm_w: rgb(204, 36, 29) None - perm_x: rgb(152, 151, 26) None - owner: rgb(215, 153, 33) None Bold - group: rgb(215, 153, 33) None - count: rgb(69, 133, 136) rgb(50, 48, 47) - dates: rgb(168, 153, 132) None - sparse: rgb(250, 189,47) None - content_extract: ansi(29) None Italic - content_match: ansi(34) None Bold - git_branch: rgb(251, 241, 199) None - git_insertions: rgb(152, 151, 26) None - git_deletions: rgb(190, 15, 23) None - git_status_current: rgb(60, 56, 54) None - git_status_modified: rgb(152, 151, 26) None - git_status_new: rgb(104, 187, 38) None Bold - git_status_ignored: rgb(213, 196, 161) None - git_status_conflicted: rgb(204, 36, 29) None - git_status_other: rgb(204, 36, 29) None - selected_line: None rgb(60, 56, 54) / None rgb(50, 48, 47) - char_match: rgb(250, 189, 47) None - file_error: rgb(251, 73, 52) None - flag_label: rgb(189, 174, 147) None - flag_value: rgb(211, 134, 155) None Bold - input: rgb(251, 241, 199) None / rgb(189, 174, 147) None Italic - status_error: rgb(213, 196, 161) rgb(204, 36, 29) - status_job: rgb(250, 189, 47) rgb(60, 56, 54) - status_normal: None rgb(40, 38, 37) / None None - status_italic: rgb(211, 134, 155) rgb(40, 38, 37) Italic / None None - status_bold: rgb(211, 134, 155) rgb(40, 38, 37) Bold / None None - status_code: rgb(251, 241, 199) rgb(40, 38, 37) / None None - status_ellipsis: rgb(251, 241, 199) rgb(40, 38, 37) Bold / None None - purpose_normal: None None - purpose_italic: rgb(177, 98, 134) None Italic - purpose_bold: rgb(177, 98, 134) None Bold - purpose_ellipsis: None None - scrollbar_track: rgb(80, 73, 69) None / rgb(50, 48, 47) None - scrollbar_thumb: rgb(213, 196, 161) None / rgb(102, 92, 84) None - help_paragraph: None None - help_bold: rgb(214, 93, 14) None Bold - help_italic: rgb(211, 134, 155) None Italic - help_code: rgb(142, 192, 124) rgb(50, 48, 47) - help_headers: rgb(254, 128, 25) None Bold - help_table_border: rgb(80, 73, 69) None - preview_title: rgb(235, 219, 178) rgb(40, 40, 40) / rgb(189, 174, 147) rgb(40, 40, 40) - preview: rgb(235, 219, 178) rgb(40, 40, 40) / rgb(235, 219, 178) rgb(40, 40, 40) - preview_line_number: rgb(124, 111, 100) None / rgb(124, 111, 100) rgb(40, 40, 40) - preview_separator: rgb(70, 70, 80) None / rgb(60, 60, 60) None - preview_match: None ansi(29) Bold - hex_null: rgb(189, 174, 147) None - hex_ascii_graphic: rgb(213, 196, 161) None - hex_ascii_whitespace: rgb(152, 151, 26) None - hex_ascii_other: rgb(254, 128, 25) None - hex_non_ascii: rgb(214, 93, 14) None - staging_area_title: rgb(235, 219, 178) rgb(40, 40, 40) / rgb(189, 174, 147) rgb(40, 40, 40) - mode_command_mark: gray(5) ansi(204) Bold - good_to_bad_0: ansi(28) - good_to_bad_1: ansi(29) - good_to_bad_2: ansi(29) - good_to_bad_3: ansi(29) - good_to_bad_4: ansi(29) - good_to_bad_5: ansi(100) - good_to_bad_6: ansi(136) - good_to_bad_7: ansi(172) - good_to_bad_8: ansi(166) - good_to_bad_9: ansi(196) -} diff --git a/.config/broot/skins/dark-orange.hjson b/.config/broot/skins/dark-orange.hjson deleted file mode 100644 index 8e2f845..0000000 --- a/.config/broot/skins/dark-orange.hjson +++ /dev/null @@ -1,111 +0,0 @@ -############################################################### -# A skin for a terminal with a dark background -# -# To create your own skin, copy this file, change the entries -# and import your skin file from the main conf file (look -# for "imports") -# -# Doc at https://dystroy.org/broot/skins/ -############################################################### - -############################################################### -# Skin -# If you want to change the colors of broot, -# uncomment the following bloc and start messing -# with the various values. -# A skin entry value is made of two parts separated with a '/': -# The first one is the skin for the active panel. -# The second one, optional, is the skin for non active panels. -# You may find explanations and other skins on -# https://dystroy.org/broot/skins -############################################################### -skin: { - default: none none / gray(20) none - tree: ansi(94) None / gray(3) None - parent: gray(18) None / gray(13) None - file: gray(20) None / gray(15) None - directory: ansi(208) None Bold / ansi(172) None bold - exe: Cyan None - link: Magenta None - pruning: gray(12) None Italic - perm__: gray(5) None - perm_r: ansi(94) None - perm_w: ansi(132) None - perm_x: ansi(65) None - owner: ansi(138) None - group: ansi(131) None - count: ansi(136) gray(3) - dates: ansi(66) None - sparse: ansi(214) None - content_extract: ansi(29) None - content_match: ansi(34) None - git_branch: ansi(229) None - git_insertions: ansi(28) None - git_deletions: ansi(160) None - git_status_current: gray(5) None - git_status_modified: ansi(28) None - git_status_new: ansi(94) None Bold - git_status_ignored: gray(17) None - git_status_conflicted: ansi(88) None - git_status_other: ansi(88) None - selected_line: None gray(5) / None gray(4) - char_match: Yellow None - file_error: Red None - flag_label: gray(15) None - flag_value: ansi(208) None Bold - input: White None / gray(15) gray(2) - status_error: gray(22) ansi(124) - status_job: ansi(220) gray(5) - status_normal: gray(20) gray(3) / gray(2) gray(2) - status_italic: ansi(208) gray(3) / gray(2) gray(2) - status_bold: ansi(208) gray(3) Bold / gray(2) gray(2) - status_code: ansi(229) gray(3) / gray(2) gray(2) - status_ellipsis: gray(19) gray(1) / gray(2) gray(2) - purpose_normal: gray(20) gray(2) - purpose_italic: ansi(178) gray(2) - purpose_bold: ansi(178) gray(2) Bold - purpose_ellipsis: gray(20) gray(2) - scrollbar_track: gray(7) None / gray(4) None - scrollbar_thumb: gray(22) None / gray(14) None - help_paragraph: gray(20) None - help_bold: ansi(208) None Bold - help_italic: ansi(166) None - help_code: gray(21) gray(3) - help_headers: ansi(208) None - help_table_border: ansi(239) None - preview: gray(20) gray(1) / gray(18) gray(2) - preview_line_number: gray(12) gray(3) - preview_separator: ansi(94) None / gray(3) None - preview_match: None ansi(29) - hex_null: gray(11) None - hex_ascii_graphic: gray(18) None - hex_ascii_whitespace: ansi(143) None - hex_ascii_other: ansi(215) None - hex_non_ascii: ansi(167) None - good_to_bad_0: ansi(28) - good_to_bad_1: ansi(29) - good_to_bad_2: ansi(29) - good_to_bad_3: ansi(29) - good_to_bad_4: ansi(29) - good_to_bad_5: ansi(100) - good_to_bad_6: ansi(136) - good_to_bad_7: ansi(172) - good_to_bad_8: ansi(166) - good_to_bad_9: ansi(196) -} - - -############################################################### -# Syntax Theme -# -# If you want to choose the theme used for preview, uncomment -# one of the following lines: -# -# syntax_theme: GitHub -# syntax_theme: SolarizedDark -# syntax_theme: SolarizedLight -syntax_theme: SolarizedDark -# syntax_theme: MochaDark -# syntax_theme: OceanDark -# syntax_theme: OceanLight - diff --git a/.config/broot/skins/white.hjson b/.config/broot/skins/dieter-light.hjson similarity index 91% rename from .config/broot/skins/white.hjson rename to .config/broot/skins/dieter-light.hjson index 908e648..ad61918 100644 --- a/.config/broot/skins/white.hjson +++ b/.config/broot/skins/dieter-light.hjson @@ -10,10 +10,10 @@ syntax_theme: base16-ocean.light skin: { - default: gray(1) None - tree: gray(7) None / gray(18) None - file: gray(3) None / gray(8) None - directory: ansi(25) None Bold / ansi(25) None + default: gray(0) None + tree: gray(20) None / gray(18) None + file: gray(1) None / gray(8) None + directory: gray(4) None Bold / ansi(4) None exe: ansi(130) None link: Magenta None pruning: gray(12) None Italic @@ -34,8 +34,8 @@ skin: { git_status_ignored: gray(17) None git_status_conflicted: ansi(88) None git_status_other: ansi(88) None - selected_line: None gray(19) / None gray(21) - char_match: ansi(22) None + selected_line: None gray(20) + char_match: None ansi(226) file_error: Red None flag_label: gray(9) None flag_value: ansi(166) None Bold diff --git a/.config/broot/skins/native-16.hjson b/.config/broot/skins/native-16.hjson deleted file mode 100644 index a220c10..0000000 --- a/.config/broot/skins/native-16.hjson +++ /dev/null @@ -1,132 +0,0 @@ -############################################################### -# 16 ANSI color theme. Colors in this theme are restricted from -# ANSI color 0 - 15. This will allow the theme to adapt to your -# terminal emulator's theme. Note that, for now, the preview -# mode does not yet support this theme because of syntect not -# having a 16 ansi color theme. -# -# More info at https://jeffkreeftmeijer.com/vim-16-color/ -# Doc at https://dystroy.org/broot/skins/ -############################################################### - -skin: { - directory: ansi(12) - file: ansi(7) - pruning: ansi(8) none italic - selected_line: none ansi(0) - tree: ansi(8) - - # Search - char_match: ansi(3) none underlined - parent: ansi(4) none bold - - # File properties - exe: ansi(2) - link: ansi(13) - sparse: ansi(12) - - # Prompt - input: ansi(6) - - # Status bar - status_bold: ansi(7) ansi(8) bold - status_code: ansi(10) ansi(8) - status_ellipsis: ansi(7) ansi(8) - status_error: ansi(7) ansi(8) - status_italic: ansi(7) ansi(8) italic - status_job: ansi(7) ansi(8) - status_normal: ansi(7) ansi(8) - - # Flag status - flag_label: ansi(6) - flag_value: ansi(14) none bold - - # Background - default: none none - - # Scrollbar - scrollbar_track: ansi(0) - scrollbar_thumb: ansi(3) - - # Git - git_branch: ansi(13) - git_deletions: ansi(1) - git_insertions: ansi(2) - git_status_conflicted: ansi(1) - git_status_current: ansi(6) - git_status_ignored: ansi(8) - git_status_modified: ansi(3) - git_status_new: ansi(2) none bold - git_status_other: ansi(5) - - # Staging area - staging_area_title: ansi(3) - - # Documentation - help_bold: ansi(7) none bold - help_code: ansi(4) - help_headers: ansi(3) - help_italic: ansi(7) none italic - help_paragraph: ansi(7) - help_table_border: ansi(8) - - # Device column - device_id_major: ansi(5) - device_id_minor: ansi(5) - device_id_sep: ansi(5) - - # Counts column - count: ansi(13) - - # Dates column - dates: ansi(6) - - # Permissions column - group: ansi(3) - owner: ansi(3) - perm__: ansi(8) - perm_r: ansi(3) - perm_w: ansi(1) - perm_x: ansi(2) - - # Hex preview - hex_null: ansi(8) - hex_ascii_graphic: ansi(2) - hex_ascii_whitespace: ansi(3) - hex_ascii_other: ansi(4) - hex_non_ascii: ansi(5) - - # Preview - # preview: none - # preview_line_number: none - # preview_match: none - # preview_title: none - - # Used for displaying errors - file_error: ansi(1) - - # Content searches - content_extract: ansi(7) - content_match: ansi(3) none underlined - - # Used in status line - purpose_bold: ansi(0) ansi(7) bold - purpose_ellipsis: ansi(0) - purpose_italic: ansi(0) ansi(7) italic - purpose_normal: ansi(0) - - # Modal indicator - mode_command_mark: ansi(7) ansi(4) - - # File system occupation - good_to_bad_0: ansi(2) - good_to_bad_1: ansi(2) - good_to_bad_2: ansi(2) - good_to_bad_3: ansi(2) - good_to_bad_4: ansi(2) - good_to_bad_5: ansi(1) - good_to_bad_6: ansi(1) - good_to_bad_7: ansi(1) - good_to_bad_8: ansi(1) - good_to_bad_9: ansi(1) -} diff --git a/.config/broot/skins/solarized-dark.hjson b/.config/broot/skins/solarized-dark.hjson deleted file mode 100644 index fdea579..0000000 --- a/.config/broot/skins/solarized-dark.hjson +++ /dev/null @@ -1,66 +0,0 @@ -// contributed by [@danieltrautmann](https://github.com/danieltrautmann) -// -// -// The Solarized Dark skin uses RGB values, so it might not work well with some -// terminals -// -// Doc at https://dystroy.org/broot/skins/ - -skin: { - default: "rgb(131, 148, 150) rgb(0, 43, 54) / rgb(131, 148, 150) rgb(7, 54, 66)" // base0 base03 / base01 base02 - tree: "rgb(88, 110, 117) none" // base01 default - file: "none none" // default default - directory: "rgb(38, 139, 210) none bold" // blue default bold - exe: "rgb(211, 1, 2) none" // red default - link: "rgb(211, 54, 130) none" // magenta default - pruning: "rgb(88, 110, 117) none italic" // base01 default italic - perm__: "rgb(88, 110, 117) none" // base01 default - perm_r: "none none" // default default - perm_w: "none none" // default default - perm_x: "none none" // default default - owner: "rgb(88, 110, 117) none" // base01 default - group: "rgb(88, 110, 117) none" // base01 default - sparse: "none none" // default default - git_branch: "rgb(147, 161, 161) none" // base1 default - git_insertions: "rgb(133, 153, 0) none" // green default - git_deletions: "rgb(211, 1, 2) none" // red default - git_status_current: "none none" // default default - git_status_modified: "rgb(181, 137, 0) none" // yellow default - git_status_new: "rgb(133, 153, 0) none" // green default - git_status_ignored: "rgb(88, 110, 117) none" // base01 default - git_status_conflicted: "rgb(211, 1, 2) none" // red default - git_status_other: "rgb(211, 1, 2) none" // red default - selected_line: "none rgb(7, 54, 66)" // default base02 - char_match: "rgb(133, 153, 0) none underlined" // green default underlined - file_error: "rgb(203, 75, 22) none italic" // orange default italic - flag_label: "none none" // default default - flag_value: "rgb(181, 137, 0) none bold" // yellow default bold - input: "none none" // default default - status_error: "rgb(203, 75, 22) rgb(7, 54, 66)" // orange base02 - status_job: "rgb(108, 113, 196) rgb(7, 54, 66) bold" // violet base02 bold - status_normal: "none rgb(7, 54, 66)" // default base02 - status_italic: "rgb(181, 137, 0) rgb(7, 54, 66)" // yellow base02 - status_bold: "rgb(147, 161, 161) rgb(7, 54, 66) bold" // base1 base02 bold - status_code: "rgb(108, 113, 196) rgb(7, 54, 66)" // violet base02 - status_ellipsis: "none rgb(7, 54, 66)" // default base02 - scrollbar_track: "rgb(7, 54, 66) none" // base02 default - scrollbar_thumb: "none none" // default default - help_paragraph: "none none" // default default - help_bold: "rgb(147, 161, 161) none bold" // base1 default bold - help_italic: "rgb(147, 161, 161) none italic" // base1 default italic - help_code: "rgb(147, 161, 161) rgb(7, 54, 66)" // base1 base02 - help_headers: "rgb(181, 137, 0) none" // yellow default - help_table_border: "none none" // default default - preview_title: "gray(20) rgb(0, 43, 54)" - staging_area_title: "gray(22) rgb(0, 43, 54)" - good_to_bad_0: "ansi(28)" // green - good_to_bad_1: "ansi(29)" - good_to_bad_2: "ansi(29)" - good_to_bad_3: "ansi(29)" - good_to_bad_4: "ansi(29)" - good_to_bad_5: "ansi(100)" - good_to_bad_6: "ansi(136)" - good_to_bad_7: "ansi(172)" - good_to_bad_8: "ansi(166)" - good_to_bad_9: "ansi(196)" // red -} diff --git a/.config/broot/skins/solarized-light.hjson b/.config/broot/skins/solarized-light.hjson deleted file mode 100644 index 6e19275..0000000 --- a/.config/broot/skins/solarized-light.hjson +++ /dev/null @@ -1,118 +0,0 @@ -// contributed by [@danieltrautmann](https://github.com/danieltrautmann) -// -// -// The Solarized Light skin uses RGB values, so it might not work well with some -// terminals -// -// If you prefer to keep the background the same as your terminal background, change -// the "default" entry to -// default: "none none / rgb(147, 161, 161) none" -// -// Doc at https://dystroy.org/broot/skins/ - -skin: { - // base00 default / base1 base2 - default: "rgb(101, 123, 131) none / rgb(147, 161, 161) none" - // base1 default - tree: "rgb(147, 161, 161) none" - // default default - file: "none none" - // blue default bold - directory: "rgb(38, 139, 210) none bold" - // red default - exe: "rgb(211, 1, 2) none" - // magenta default - link: "rgb(211, 54, 130) none" - // base1 default italic - pruning: "rgb(147, 161, 161) none italic" - // base1 default - perm__: "rgb(147, 161, 161) none" - // default default - perm_r: "none none" - // default default - perm_w: "none none" - // default default - perm_x: "none none" - // base1 default - owner: "rgb(147, 161, 161) none" - // base1 default - group: "rgb(147, 161, 161) none" - // default default - sparse: "none none" - // base01 default - git_branch: "rgb(88, 110, 117) none" - // green default - git_insertions: "rgb(133, 153, 0) none" - // red default - git_deletions: "rgb(211, 1, 2) none" - // default default - git_status_current: "none none" - // yellow default - git_status_modified: "rgb(181, 137, 0) none" - // green default - git_status_new: "rgb(133, 153, 0) none" - // base1 default - git_status_ignored: "rgb(147, 161, 161) none" - // red default - git_status_conflicted: "rgb(211, 1, 2) none" - // red default - git_status_other: "rgb(211, 1, 2) none" - // default base2 - selected_line: "none rgb(238, 232, 213)" - // green default underlined - char_match: "rgb(133, 153, 0) none underlined" - // orange default italic - file_error: "rgb(203, 75, 22) none italic" - // default default - flag_label: "none none" - // yellow default bold - flag_value: "rgb(181, 137, 0) none bold" - // default default - input: "none none" - // orange base2 - status_error: "rgb(203, 75, 22) rgb(238, 232, 213)" - // violet base2 bold - status_job: "rgb(108, 113, 196) rgb(238, 232, 213) bold" - // default base2 - status_normal: "none rgb(238, 232, 213)" - // yellow base2 - status_italic: "rgb(181, 137, 0) rgb(238, 232, 213)" - // base01 base2 bold - status_bold: "rgb(88, 110, 117) rgb(238, 232, 213) bold" - // violet base2 - status_code: "rgb(108, 113, 196) rgb(238, 232, 213)" - // default base2 - status_ellipsis: "none rgb(238, 232, 213)" - // base2 default - scrollbar_track: "rgb(238, 232, 213) none" - // default default - scrollbar_thumb: "none none" - // default default - help_paragraph: "none none" - // base01 default bold - help_bold: "rgb(88, 110, 117) none bold" - // base01 default italic - help_italic: "rgb(88, 110, 117) none italic" - // base01 base2 - help_code: "rgb(88, 110, 117) rgb(238, 232, 213)" - // yellow default - help_headers: "rgb(181, 137, 0) none" - // default default - help_table_border: "none none" - preview_title: "rgb(147, 161, 161) rgb(238, 232, 213)" - preview: "rgb(101, 123, 131) rgb(253, 246, 227) / rgb(147, 161, 161) rgb(238, 232, 213)" - preview_line_number: "rgb(147, 161, 161) rgb(238, 232, 213)" - preview_separator: "rgb(147, 161, 161) rgb(238, 232, 213)" - preview_match: "None ansi(29)" - staging_area_title: "gray(22) rgb(253, 246, 227)" - good_to_bad_0: ansi(28) - good_to_bad_1: ansi(29) - good_to_bad_2: ansi(29) - good_to_bad_3: ansi(29) - good_to_bad_4: ansi(29) - good_to_bad_5: ansi(100) - good_to_bad_6: ansi(136) - good_to_bad_7: ansi(172) - good_to_bad_8: ansi(166) - good_to_bad_9: ansi(196) -} diff --git a/.config/broot/verbs.hjson b/.config/broot/verbs.hjson index abf186a..da78ce8 100644 --- a/.config/broot/verbs.hjson +++ b/.config/broot/verbs.hjson @@ -8,6 +8,15 @@ ############################################################### verbs: [ + { + invocation: edit + key: enter + shortcut: e + execution: "wezterm-edit-helper {file}" + apply_to: text_file + leave_broot: true + } + { invocation: nvim key: enter @@ -19,7 +28,7 @@ verbs: [ { invocation: broot_home key: ctrl-7 - execution: broot $HOME + execution: br $HOME leave_broot: true } diff --git a/.config/fish/config.fish b/.config/fish/config.fish index cdfdf49..9e011ff 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -55,7 +55,8 @@ if status is-interactive function git_jump set _dir $(git rev-parse --show-toplevel 2>/dev/null || pwd) if [ "$_dir" = "$PWD" ] - set _dir $(br -f --conf ~/.config/broot/select.hjson) + #set _dir $(br -f --conf ~/.config/broot/select.hjson) + set _dir $(br -f --conf "$HOME/.config/broot/conf.hjson") end [ -n "$_dir" ] && pushd $_dir >>/dev/null commandline -f repaint diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index 59a8129..a5c8e1a 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -111,7 +111,7 @@ local function colors_for_appearance(appearance) else return { background = "#fefeff", - foreground = "#333333", + foreground = "#222222", cursor_bg = "#aa0000", cursor_fg = "#ffffff", cursor_border = "#ffffff", diff --git a/.gitconfig b/.gitconfig index e389b10..e001475 100644 --- a/.gitconfig +++ b/.gitconfig @@ -85,7 +85,7 @@ protocol = git diffFilter = delta --color-only --features=interactive [commit] -gpgsign = true +gpgsign = false verbose = true [credential]