From c84dd0b0f51d9fede26182e92d5ed6ad2b3b8135 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Wed, 31 Jan 2024 08:21:21 +0100 Subject: [PATCH 1/5] switch to glow --- .config/glow/glow.yml | 10 ++++++++++ .config/lf/preview/preview | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .config/glow/glow.yml diff --git a/.config/glow/glow.yml b/.config/glow/glow.yml new file mode 100644 index 00000000..16b1e69f --- /dev/null +++ b/.config/glow/glow.yml @@ -0,0 +1,10 @@ +# style name or JSON path (default "auto") +style: "auto" +# show local files only; no network (TUI-mode only) +local: true +# mouse support (TUI-mode only) +mouse: false +# use pager to display markdown +pager: false +# word-wrap at width +width: 80 diff --git a/.config/lf/preview/preview b/.config/lf/preview/preview index 87ff1b71..392b8758 100755 --- a/.config/lf/preview/preview +++ b/.config/lf/preview/preview @@ -86,7 +86,7 @@ mimetest() { image/*) image "$f" "$w" "$h" "$x" "$y" ;; video/*) video "$f" "$w" "$h" "$x" "$y" ;; *opendocument*) run odt2txt "$f" ;; - */markdown) run mdcat "$f" ;; + */markdown) run glow "$f" --width "$w";; */html) run lynx -dump "$f" ;; *) return 1 ;; esac From 95fe0c0aed2e6231d674c1b2a869f1e64d8e922e Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Wed, 31 Jan 2024 10:53:02 +0100 Subject: [PATCH 2/5] glow theming --- .config/glow/glow.yml | 2 +- .config/glow/style.json | 215 +++++++++++++++++++++++++++++++++++++ .config/lf/preview/preview | 2 +- 3 files changed, 217 insertions(+), 2 deletions(-) create mode 100644 .config/glow/style.json diff --git a/.config/glow/glow.yml b/.config/glow/glow.yml index 16b1e69f..2a6ad278 100644 --- a/.config/glow/glow.yml +++ b/.config/glow/glow.yml @@ -1,5 +1,5 @@ # style name or JSON path (default "auto") -style: "auto" +style: /home/luca/.config/glow/style.json # show local files only; no network (TUI-mode only) local: true # mouse support (TUI-mode only) diff --git a/.config/glow/style.json b/.config/glow/style.json new file mode 100644 index 00000000..8e8b5d6d --- /dev/null +++ b/.config/glow/style.json @@ -0,0 +1,215 @@ +{ + "document": { + "block_prefix": "\n", + "block_suffix": "\n", + "color": "#c8d3f5", + "margin": 2 + }, + "block_quote": { + "indent": 1, + "indent_token": "│ ", + "color": "#4e5579" + }, + "paragraph": {}, + "list": { + "level_indent": 2, + "color": "#9abdf5" + }, + "heading": { + "color": "#4fd6be", + "bold": true + }, + "h1": { + "prefix": "▋ ", + "color": "#89ddff", + "bold": true, + "block_suffix": "\n" + }, + "h2": { + "prefix": "▌ ", + "color": "#61bdf2", + "bold": true + }, + "h3": { + "prefix": "┃ ", + "color": "#82aaff", + "bold": true + + }, + "h4": { + "prefix": "│ ", + "color": "#6d91de", + "bold": true + + }, + "h5": { + "prefix": "┆ ", + "color": "#9aa5ce", + "bold": true + + }, + "h6": { + "prefix": "┊ ", + "color": "#61bdf2" + }, + "text": { + "color": "#c8d3f5" + }, + "strikethrough": { + "crossed_out": true + }, + "emph": { + "italic": true + }, + "strong": { + "bold": true + }, + "hr": { + "color": "#444b6a", + "format": "\n--------\n" + }, + "item": { + "color": "#9abdf5", + "block_prefix": "• " + }, + "enumeration": { + "color": "#9abdf5", + "block_prefix": ". " + }, + "task": { + "color": "#9abdf5", + "ticked": "[✓] ", + "unticked": "[ ] " + }, + "link": { + "color": "#4fd6be", + "block_prefix": "(", + "block_suffix": ")", + "conceal": true, + "underline": true + }, + "link_text": { + "color": "#4fd6be", + "block_prefix": "[", + "block_suffix": "]", + "underline": true + }, + "image": { + "color": "#4fd6be", + "underline": true + }, + "image_text": { + "color": "#4fd6be", + "format": "Image: {{.text}} →" + }, + "code": { + "color": "#c8d3f5" + }, + "code_block": { + "color": "244", + "margin": 2, + "chroma": { + "text": { + "color": "#89ddff" + }, + "error": { + "color": "#c53b53", + "underline": true + }, + "comment": { + "color": "#636da6" + }, + "comment_preproc": { + "color": "#4fd6be" + }, + "keyword": { + "color": "#c099ff" + }, + "keyword_reserved": { + "color": "#c099ff" + }, + "keyword_namespace": { + "color": "#0db9d7" + }, + "keyword_type": { + "color": "#c099ff" + }, + "operator": { + "color": "#89ddff" + }, + "punctuation": { + "color": "#ba3c97" + }, + "name": { + "style": "italic" + }, + "name_builtin": { + "color": "#65bcff" + }, + "name_tag": { + "color": "#ff757f" + }, + "name_attribute": { + "color": "#c099ff" + }, + "name_class": { + "color": "#0db9d7" + }, + "name_constant": { + "color": "#c099ff" + }, + "name_decorator": { + "color": "#82aaff" + }, + "name_exception": { + "color": "#7dcfff", + "italic": true + }, + "name_function": { + "color": "#82aaff" + }, + "name_other": { + "color": "#636da6" + }, + "literal": {}, + "literal_number": { + "color": "#ff966c" + }, + "literal_date": {}, + "literal_string": { + "color": "#4fd6be" + }, + "literal_string_escape": { + "color": "#89ddff" + }, + "generic_deleted": { + "color": "#e26a75" + }, + "generic_emph": { + "italic": true + }, + "generic_inserted": { + "color": "#b8db87" + }, + "generic_strong": { + "bold": true + }, + "generic_subheading": {}, + "background": { + "background_color": "#222436" + } + } + }, + "table": { + "center_separator": "┼", + "column_separator": "│", + "row_separator": "─" + }, + "definition_list": {}, + "definition_term": {}, + "definition_description": { + "block_prefix": "\n🠶 " + }, + "html_block": {}, + "html_span": {} +} diff --git a/.config/lf/preview/preview b/.config/lf/preview/preview index 392b8758..749a1b99 100755 --- a/.config/lf/preview/preview +++ b/.config/lf/preview/preview @@ -86,7 +86,7 @@ mimetest() { image/*) image "$f" "$w" "$h" "$x" "$y" ;; video/*) video "$f" "$w" "$h" "$x" "$y" ;; *opendocument*) run odt2txt "$f" ;; - */markdown) run glow "$f" --width "$w";; + */markdown) run glow -s "$XDG_CONFIG_HOME/glow/style.json" "$f" --width "$w";; */html) run lynx -dump "$f" ;; *) return 1 ;; esac From b9eb44cd009703d70bab9038c098541e02c18578 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Wed, 31 Jan 2024 10:53:35 +0100 Subject: [PATCH 3/5] fzf theming --- .config/zsh/.zprofile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 680c0aa8..8fdfdef9 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -15,7 +15,12 @@ export LC_ALL=de_DE.UTF-8 # Settings export VIRTUAL_ENV_DISABLE_PROMPT=1 -export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" +export FZF_DEFAULT_OPTS="\ + --layout=reverse --height 40%\ + --color=fg:#c0caf5,bg:,hl:#ff9e64 \ + --color=fg+:#c0caf5,bg+:,hl+:#ff9e64 \ + --color=info:#7aa2f7,prompt:#7dcfff,pointer:#7dcfff \ + --color=marker:#9ece6a,spinner:#9ece6a,header:#9ece6a" export LESS=-R export LESS_TERMCAP_mb="$(printf '%b' '')" export LESS_TERMCAP_md="$(printf '%b' '')" From c54673924939336636e887cc4c1bd3114a311d1f Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Wed, 31 Jan 2024 11:13:34 +0100 Subject: [PATCH 4/5] update lazygit keybind for lf --- .config/lf/lfrc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.config/lf/lfrc b/.config/lf/lfrc index a1e8b346..5e6480e5 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -28,9 +28,7 @@ cmd trash &{{ }} cmd lazygit ${{ - clear - dir="$(realpath $PWD)" - env PWD=$(realpath $PWD) lazygit + cd "$(dirname "$(realpath "$f")")" && lazygit }} # y (select for copy) and P to paste soft-link From 96a3b69cf6395b1271b14a90daca37926e42d82f Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Wed, 31 Jan 2024 16:30:28 +0100 Subject: [PATCH 5/5] rename sysact -> dmenusys --- .local/bin/{sysact => dmenusys} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .local/bin/{sysact => dmenusys} (100%) diff --git a/.local/bin/sysact b/.local/bin/dmenusys similarity index 100% rename from .local/bin/sysact rename to .local/bin/dmenusys