From 716fbe0f2efd69db95c2227068d39a15460d144f Mon Sep 17 00:00:00 2001 From: Fabio Scotto di Santolo Date: Wed, 5 Jun 2024 09:22:06 +0200 Subject: [PATCH] Update fish configurations and add others (Neovim, Ranger, Alacritty) --- .gitmodules | 3 + alacritty/alacritty.toml | 163 ++++++++++++++++++ fastfetch/config-compact.jsonc | 72 ++++++++ fastfetch/config.jsonc | 137 +++++++++++++++ fish/completions/exercism.fish | 0 fish/completions/fisher.fish | 0 fish/completions/fzf_configure_bindings.fish | 0 fish/completions/sdk.fish | 0 fish/conf.d/done.fish | 0 fish/conf.d/fzf.fish | 0 fish/conf.d/rustup.fish | 2 +- fish/conf.d/sdk.fish | 0 fish/config.fish | 6 +- fish/fish_plugins | 0 fish/fish_variables | 2 +- fish/functions/__bass.py | 0 fish/functions/__sdkman-noexport-init.sh | 0 .../_fzf_configure_bindings_help.fish | 0 fish/functions/_fzf_extract_var_info.fish | 0 fish/functions/_fzf_preview_changed_file.fish | 0 fish/functions/_fzf_preview_file.fish | 0 fish/functions/_fzf_report_diff_type.fish | 0 fish/functions/_fzf_report_file_type.fish | 0 fish/functions/_fzf_search_directory.fish | 0 fish/functions/_fzf_search_git_log.fish | 0 fish/functions/_fzf_search_git_status.fish | 0 fish/functions/_fzf_search_history.fish | 0 fish/functions/_fzf_search_processes.fish | 0 fish/functions/_fzf_search_variables.fish | 0 fish/functions/_fzf_wrapper.fish | 0 fish/functions/bass.fish | 0 fish/functions/fisher.fish | 0 fish/functions/fzf_configure_bindings.fish | 0 fish/functions/sdk.fish | 0 nvim | 1 + 35 files changed, 381 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 100644 alacritty/alacritty.toml create mode 100644 fastfetch/config-compact.jsonc create mode 100644 fastfetch/config.jsonc mode change 100644 => 100755 fish/completions/exercism.fish mode change 100644 => 100755 fish/completions/fisher.fish mode change 100644 => 100755 fish/completions/fzf_configure_bindings.fish mode change 100644 => 100755 fish/completions/sdk.fish mode change 100644 => 100755 fish/conf.d/done.fish mode change 100644 => 100755 fish/conf.d/fzf.fish mode change 100644 => 100755 fish/conf.d/rustup.fish mode change 100644 => 100755 fish/conf.d/sdk.fish mode change 100644 => 100755 fish/config.fish mode change 100644 => 100755 fish/fish_plugins mode change 100644 => 100755 fish/fish_variables mode change 100644 => 100755 fish/functions/__bass.py mode change 100644 => 100755 fish/functions/__sdkman-noexport-init.sh mode change 100644 => 100755 fish/functions/_fzf_configure_bindings_help.fish mode change 100644 => 100755 fish/functions/_fzf_extract_var_info.fish mode change 100644 => 100755 fish/functions/_fzf_preview_changed_file.fish mode change 100644 => 100755 fish/functions/_fzf_preview_file.fish mode change 100644 => 100755 fish/functions/_fzf_report_diff_type.fish mode change 100644 => 100755 fish/functions/_fzf_report_file_type.fish mode change 100644 => 100755 fish/functions/_fzf_search_directory.fish mode change 100644 => 100755 fish/functions/_fzf_search_git_log.fish mode change 100644 => 100755 fish/functions/_fzf_search_git_status.fish mode change 100644 => 100755 fish/functions/_fzf_search_history.fish mode change 100644 => 100755 fish/functions/_fzf_search_processes.fish mode change 100644 => 100755 fish/functions/_fzf_search_variables.fish mode change 100644 => 100755 fish/functions/_fzf_wrapper.fish mode change 100644 => 100755 fish/functions/bass.fish mode change 100644 => 100755 fish/functions/fisher.fish mode change 100644 => 100755 fish/functions/fzf_configure_bindings.fish mode change 100644 => 100755 fish/functions/sdk.fish create mode 160000 nvim diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e4358b2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "nvim"] + path = nvim + url = https://github.com/S4NKALP/nvim.git diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml new file mode 100644 index 0000000..d7bc705 --- /dev/null +++ b/alacritty/alacritty.toml @@ -0,0 +1,163 @@ +live_config_reload = true +working_directory = "None" + +[env] +TERM = "xterm-256color" +WINIT_X11_SCALE_FACTOR = "1" + +[window] +dynamic_padding = true +decorations = "full" +title = "Alacritty@CachyOS" +opacity = 0.95 +decorations_theme_variant = "Dark" + +[window.dimensions] +columns = 100 +lines = 30 + +[window.class] +instance = "Alacritty" +general = "Alacritty" + +[scrolling] +history = 10000 +multiplier = 3 + +[colors] +draw_bold_text_with_bright_colors = true + +[colors.primary] +background = "0x272822" +foreground = "0xF8F8F2" + +[colors.normal] +black = "0x272822" +red = "0xF92672" +green = "0xA6E22E" +yellow = "0xF4BF75" +blue = "0x66D9EF" +magenta = "0xAE81FF" +cyan = "0xA1EFE4" +white = "0xF8F8F2" + +[colors.bright] +black = "0x75715E" +red = "0xF92672" +green = "0xA6E22E" +yellow = "0xF4BF75" +blue = "0x66D9EF" +magenta = "0xAE81FF" +cyan = "0xA1EFE4" +white = "0xF9F8F5" + +[font] +size = 12 + +[font.normal] +family = "RobotoMono Nerd Font " +style = "Regular" + +[font.bold] +family = "RobotoMono Nerd Font" +style = "Bold" + +[font.italic] +family = "RobotoMono Nerd Font" +style = "Italic" + +[font.bold_italic] +family = "RobotoMono Nerd Font" +style = "Bold Italic" + +[selection] +semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" +save_to_clipboard = true + +[cursor] +style = "Block" +vi_mode_style = "None" +unfocused_hollow = true +thickness = 0.15 + +[mouse] +hide_when_typing = true + +[[mouse.bindings]] +mouse = "Middle" +action = "PasteSelection" + +[keyboard] +[[keyboard.bindings]] +key = "Paste" +action = "Paste" + +[[keyboard.bindings]] +key = "Copy" +action = "Copy" + +[[keyboard.bindings]] +key = "L" +mods = "Control" +action = "ClearLogNotice" + +[[keyboard.bindings]] +key = "L" +mods = "Control" +mode = "~Vi" +chars = "\f" + +[[keyboard.bindings]] +key = "PageUp" +mods = "Shift" +mode = "~Alt" +action = "ScrollPageUp" + +[[keyboard.bindings]] +key = "PageDown" +mods = "Shift" +mode = "~Alt" +action = "ScrollPageDown" + +[[keyboard.bindings]] +key = "Home" +mods = "Shift" +mode = "~Alt" +action = "ScrollToTop" + +[[keyboard.bindings]] +key = "End" +mods = "Shift" +mode = "~Alt" +action = "ScrollToBottom" + +[[keyboard.bindings]] +key = "V" +mods = "Control|Shift" +action = "Paste" + +[[keyboard.bindings]] +key = "C" +mods = "Control|Shift" +action = "Copy" + +[[keyboard.bindings]] +key = "F" +mods = "Control|Shift" +action = "SearchForward" + +[[keyboard.bindings]] +key = "B" +mods = "Control|Shift" +action = "SearchBackward" + +[[keyboard.bindings]] +key = "C" +mods = "Control|Shift" +mode = "Vi" +action = "ClearSelection" + +[[keyboard.bindings]] +key = "Key0" +mods = "Control" +action = "ResetFontSize" diff --git a/fastfetch/config-compact.jsonc b/fastfetch/config-compact.jsonc new file mode 100644 index 0000000..f8b1e12 --- /dev/null +++ b/fastfetch/config-compact.jsonc @@ -0,0 +1,72 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "padding": { + "top": 2 + }, + "type": "small" + }, + "display": { + "separator": " -> " + }, + "modules": [ + "break", + { + "type": "title", + "keyWidth": 10, + "format": " {6}{7}{8}" + }, + { + "type": "custom", + "format": " ╭───────────────────────╮" + }, + { + "type": "kernel", + "key": " ", + "keyColor": "yellow" + }, + { + "type": "wm", + "key": " ", + "keyColor": "blue" + }, + { + "type": "shell", + "key": " ", + "keyColor": "yellow" + }, + { + "type": "terminal", + "key": " ", + "keyColor": "blue" + }, + /* + { + "type": "packages", + "key": "󰏖 ", + "keyColor": "yellow" + }, + */ + { + "type": "memory", + "key": "󰍛 ", + "keyColor": "magenta", + // format: used / total + "format": "{1} / {2}" + }, + { + "type": "uptime", + "key": "󰔛 ", + "keyColor": "green" + }, + { + "type": "custom", + "format": " ╰───────────────────────╯" + }, + { + "type": "custom", + "format": " \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m \u001b[37m \u001b[90m " + }, + "break", + ] +} diff --git a/fastfetch/config.jsonc b/fastfetch/config.jsonc new file mode 100644 index 0000000..8dbe3d8 --- /dev/null +++ b/fastfetch/config.jsonc @@ -0,0 +1,137 @@ +// Load with --load-config examples/2.jsonc +// Note that you must replace the image path to an existing image to display it. + +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "padding": { + "top": 2 + } + }, + "display": { + "separator": " 󰑃 " + }, + "modules": [ + { + "type": "custom", + "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐" + }, + { + "type": "title", + "keyWidth": 10, + "format": " {6}{7}{8}" + }, + { + "type": "custom", + "format": "\u001b[90m└────────────────────────────────────────────────────────────┘" + }, + { + "type": "custom", + "format": "\u001b[90m \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m \u001b[37m \u001b[38m \u001b[39m  \u001b[38m \u001b[37m \u001b[36m \u001b[35m \u001b[34m \u001b[33m \u001b[32m \u001b[31m \u001b[90m " + }, + { + "type": "custom", + "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐" + }, + { + "type": "os", + "key": " DISTRO", + "keyColor": "yellow" + }, + { + "type": "kernel", + "key": "│ ├", + "keyColor": "yellow" + }, + { + "type": "packages", + "key": "│ ├󰏖", + "keyColor": "yellow" + }, + { + "type": "shell", + "key": "│ └", + "keyColor": "yellow" + }, + { + "type": "wm", + "key": " DE/WM", + "keyColor": "blue" + }, + { + "type": "wmtheme", + "key": "│ ├󰉼", + "keyColor": "blue" + }, + { + "type": "icons", + "key": "│ ├󰀻", + "keyColor": "blue" + }, + { + "type": "terminal", + "key": "│ ├", + "keyColor": "blue" + }, + { + "type": "wallpaper", + "key": "│ └󰸉", + "keyColor": "blue" + }, + { + "type": "host", + "key": "󰌢 SYSTEM", + "keyColor": "green" + }, + { + "type": "cpu", + "key": "│ ├󰻠", + "keyColor": "green" + }, + { + "type": "gpu", + "key": "│ ├󰻑", + "keyColor": "green" + }, + { + "type": "display", + "key": "│ ├󰍹", + "keyColor": "green", + "compactType": "original-with-refresh-rate" + }, + { + "type": "memory", + "key": "│ ├󰾆", + "keyColor": "green" + }, + { + "type": "swap", + "key": "│ ├󰓡", + "keyColor": "green" + }, + { + "type": "uptime", + "key": "│ ├󰅐", + "keyColor": "green" + }, + { + "type": "display", + "key": "│ └󰍹", + "keyColor": "green" + }, + { + "type": "sound", + "key": " AUDIO", + "keyColor": "cyan" + }, + { + "type": "custom", + "format": "\u001b[90m└────────────────────────────────────────────────────────────┘" + }, + { + "type": "custom", + "format": "\u001b[90m \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m \u001b[37m \u001b[38m \u001b[39m  \u001b[38m \u001b[37m \u001b[36m \u001b[35m \u001b[34m \u001b[33m \u001b[32m \u001b[31m \u001b[90m " + }, + "break", + ] +} diff --git a/fish/completions/exercism.fish b/fish/completions/exercism.fish old mode 100644 new mode 100755 diff --git a/fish/completions/fisher.fish b/fish/completions/fisher.fish old mode 100644 new mode 100755 diff --git a/fish/completions/fzf_configure_bindings.fish b/fish/completions/fzf_configure_bindings.fish old mode 100644 new mode 100755 diff --git a/fish/completions/sdk.fish b/fish/completions/sdk.fish old mode 100644 new mode 100755 diff --git a/fish/conf.d/done.fish b/fish/conf.d/done.fish old mode 100644 new mode 100755 diff --git a/fish/conf.d/fzf.fish b/fish/conf.d/fzf.fish old mode 100644 new mode 100755 diff --git a/fish/conf.d/rustup.fish b/fish/conf.d/rustup.fish old mode 100644 new mode 100755 index e4cb363..e45daf6 --- a/fish/conf.d/rustup.fish +++ b/fish/conf.d/rustup.fish @@ -1 +1 @@ -source "$HOME/.cargo/env.fish" +#source "$HOME/.cargo/env.fish" diff --git a/fish/conf.d/sdk.fish b/fish/conf.d/sdk.fish old mode 100644 new mode 100755 diff --git a/fish/config.fish b/fish/config.fish old mode 100644 new mode 100755 index 8169b12..fd03e81 --- a/fish/config.fish +++ b/fish/config.fish @@ -2,7 +2,7 @@ # Hide welcome message & ensure we are reporting fish as shell set fish_greeting set VIRTUAL_ENV_DISABLE_PROMPT "1" -set -xU MANPAGER "sh -c 'col -bx | batcat -l man -p'" +set -xU MANPAGER "sh -c 'col -bx | bat -l man -p'" set -xU MANROFFOPT "-c" set -x SHELL /usr/bin/fish @@ -31,7 +31,7 @@ end ## Starship prompt if status --is-interactive - source ("/usr/local/bin/starship" init fish --print-full-init | psub) + source ("/usr/bin/starship" init fish --print-full-init | psub) end ## Advanced command-not-found hook @@ -111,7 +111,7 @@ alias lt 'eza -aT --color=always --group-directories-first --icons' # tree listi alias l. 'eza -ald --color=always --group-directories-first --icons .*' # show only dotfiles # Replace some more things with better alternatives -alias cat 'batcat --style header --style snip --style changes --style header' +alias cat 'bat --style header --style snip --style changes --style header' # Common use alias .. 'cd ..' diff --git a/fish/fish_plugins b/fish/fish_plugins old mode 100644 new mode 100755 diff --git a/fish/fish_variables b/fish/fish_variables old mode 100644 new mode 100755 index b7d5ed8..d99d057 --- a/fish/fish_variables +++ b/fish/fish_variables @@ -2,7 +2,7 @@ # VERSION: 3.0 SETUVAR --export GOBIN:/home/fscotto/\x2elocal/share/go/bin SETUVAR --export GOPATH:/home/fscotto/\x2elocal/share/go -SETUVAR --export MANPAGER:sh\x20\x2dc\x20\x27col\x20\x2dbx\x20\x7c\x20batcat\x20\x2dl\x20man\x20\x2dp\x27 +SETUVAR --export MANPAGER:sh\x20\x2dc\x20\x27col\x20\x2dbx\x20\x7c\x20bat\x20\x2dl\x20man\x20\x2dp\x27 SETUVAR --export MANROFFOPT:\x2dc SETUVAR __done_min_cmd_duration:10000 SETUVAR __done_notification_urgency_level:low diff --git a/fish/functions/__bass.py b/fish/functions/__bass.py old mode 100644 new mode 100755 diff --git a/fish/functions/__sdkman-noexport-init.sh b/fish/functions/__sdkman-noexport-init.sh old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_configure_bindings_help.fish b/fish/functions/_fzf_configure_bindings_help.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_extract_var_info.fish b/fish/functions/_fzf_extract_var_info.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_preview_changed_file.fish b/fish/functions/_fzf_preview_changed_file.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_preview_file.fish b/fish/functions/_fzf_preview_file.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_report_diff_type.fish b/fish/functions/_fzf_report_diff_type.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_report_file_type.fish b/fish/functions/_fzf_report_file_type.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_search_directory.fish b/fish/functions/_fzf_search_directory.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_search_git_log.fish b/fish/functions/_fzf_search_git_log.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_search_git_status.fish b/fish/functions/_fzf_search_git_status.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_search_history.fish b/fish/functions/_fzf_search_history.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_search_processes.fish b/fish/functions/_fzf_search_processes.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_search_variables.fish b/fish/functions/_fzf_search_variables.fish old mode 100644 new mode 100755 diff --git a/fish/functions/_fzf_wrapper.fish b/fish/functions/_fzf_wrapper.fish old mode 100644 new mode 100755 diff --git a/fish/functions/bass.fish b/fish/functions/bass.fish old mode 100644 new mode 100755 diff --git a/fish/functions/fisher.fish b/fish/functions/fisher.fish old mode 100644 new mode 100755 diff --git a/fish/functions/fzf_configure_bindings.fish b/fish/functions/fzf_configure_bindings.fish old mode 100644 new mode 100755 diff --git a/fish/functions/sdk.fish b/fish/functions/sdk.fish old mode 100644 new mode 100755 diff --git a/nvim b/nvim new file mode 160000 index 0000000..1403e0b --- /dev/null +++ b/nvim @@ -0,0 +1 @@ +Subproject commit 1403e0b2159a443d22d463f134ad8eaccf1362fa