From eaa0aaff65a2dbc105e467aeaa98c025c134559b Mon Sep 17 00:00:00 2001 From: punkfairie <23287005+punkfairie@users.noreply.github.com> Date: Sat, 10 Feb 2024 15:49:50 -0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20Midnight=20Commander;=20reorg?= =?UTF-8?q?anize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Moved smaller CLI tools to a group directory to reduce clutter, while still keeping general CLI tools seperated from the fish directory. --- bat/bat.config.fish | 8 - cli/.config/mc/ini.symlink | 144 ++++++++++++++++++ cli/.config/mc/panels.ini.symlink | 37 +++++ .../share/mc/skins/catppuccin.ini.symlink | 140 +++++++++++++++++ cli/bat.config.fish | 8 + {bat => cli/bat}/bat.conf | 0 .../bat}/themes/Catppuccin-frappe.tmTheme | 0 .../bat}/themes/Catppuccin-latte.tmTheme | 0 .../bat}/themes/Catppuccin-macchiato.tmTheme | 0 .../bat}/themes/Catppuccin-mocha.tmTheme | 0 {bat => cli}/install.fish | 6 +- 11 files changed, 333 insertions(+), 10 deletions(-) delete mode 100644 bat/bat.config.fish create mode 100644 cli/.config/mc/ini.symlink create mode 100644 cli/.config/mc/panels.ini.symlink create mode 100644 cli/.local/share/mc/skins/catppuccin.ini.symlink create mode 100644 cli/bat.config.fish rename {bat => cli/bat}/bat.conf (100%) rename {bat => cli/bat}/themes/Catppuccin-frappe.tmTheme (100%) rename {bat => cli/bat}/themes/Catppuccin-latte.tmTheme (100%) rename {bat => cli/bat}/themes/Catppuccin-macchiato.tmTheme (100%) rename {bat => cli/bat}/themes/Catppuccin-mocha.tmTheme (100%) rename {bat => cli}/install.fish (60%) diff --git a/bat/bat.config.fish b/bat/bat.config.fish deleted file mode 100644 index 0a5ec78..0000000 --- a/bat/bat.config.fish +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env fish - -set -gx BAT_CONFIG_PATH "$DOT/bat/bat.conf" -set -gx BAT_CONFIG_DIR "$DOT/bat" - -function cat --wraps cat - bat $argv -end diff --git a/cli/.config/mc/ini.symlink b/cli/.config/mc/ini.symlink new file mode 100644 index 0000000..3cc42e6 --- /dev/null +++ b/cli/.config/mc/ini.symlink @@ -0,0 +1,144 @@ +[Midnight-Commander] +verbose=true +shell_patterns=true +auto_save_setup=true +preallocate_space=false +auto_menu=false +use_internal_view=true +use_internal_edit=true +clear_before_exec=true +confirm_delete=true +confirm_overwrite=true +confirm_execute=false +confirm_history_cleanup=true +confirm_exit=false +confirm_directory_hotlist_delete=false +confirm_view_dir=false +safe_delete=false +safe_overwrite=false +use_8th_bit_as_meta=false +mouse_move_pages_viewer=true +mouse_close_dialog=false +fast_refresh=false +drop_menus=false +wrap_mode=true +old_esc_mode=true +cd_symlinks=true +show_all_if_ambiguous=false +use_file_to_guess_type=true +alternate_plus_minus=false +only_leading_plus_minus=true +show_output_starts_shell=false +xtree_mode=false +file_op_compute_totals=true +classic_progressbar=true +use_netrc=true +ftpfs_always_use_proxy=false +ftpfs_use_passive_connections=true +ftpfs_use_passive_connections_over_proxy=false +ftpfs_use_unix_list_options=true +ftpfs_first_cd_then_ls=true +ignore_ftp_chattr_errors=true +editor_fill_tabs_with_spaces=false +editor_return_does_auto_indent=true +editor_backspace_through_tabs=false +editor_fake_half_tabs=true +editor_option_save_position=true +editor_option_auto_para_formatting=false +editor_option_typewriter_wrap=false +editor_edit_confirm_save=true +editor_syntax_highlighting=true +editor_persistent_selections=true +editor_drop_selection_on_copy=true +editor_cursor_beyond_eol=false +editor_cursor_after_inserted_block=false +editor_visible_tabs=true +editor_visible_spaces=true +editor_line_state=false +editor_simple_statusbar=false +editor_check_new_line=false +editor_show_right_margin=false +editor_group_undo=false +editor_state_full_filename=false +editor_ask_filename_before_edit=false +nice_rotating_dash=true +shadows=true +mcview_remember_file_position=false +auto_fill_mkdir_name=true +copymove_persistent_attr=true +pause_after_run=1 +mouse_repeat_rate=100 +double_click_speed=250 +old_esc_mode_timeout=1000000 +max_dirt_limit=10 +num_history_items_recorded=60 +vfs_timeout=60 +ftpfs_directory_timeout=900 +ftpfs_retry_seconds=30 +shell_directory_timeout=900 +editor_tab_spacing=8 +editor_word_wrap_line_length=72 +editor_option_save_mode=0 +editor_backup_extension=~ +editor_filesize_threshold=64M +editor_stop_format_chars=-+*\\,.;:&> +mcview_eof= +skin=catppuccin + +[Layout] +output_lines=0 +left_panel_size=107 +top_panel_size=0 +message_visible=true +keybar_visible=true +xterm_title=true +command_prompt=true +menubar_visible=true +free_space=true +horizontal_split=false +vertical_equal=true +horizontal_equal=true + +[Misc] +timeformat_recent=%b %e %H:%M +timeformat_old=%b %e %Y +ftp_proxy_host=gate +ftpfs_password=anonymous@ +display_codepage=UTF-8 +source_codepage=Other_8_bit +autodetect_codeset= +clipboard_store= +clipboard_paste= + +[Colors] +base_color= +xterm-256color= +color_terminals= + +[Panels] +show_mini_info=true +kilobyte_si=false +mix_all_files=false +show_backups=true +show_dot_files=true +fast_reload=false +fast_reload_msg_shown=false +mark_moves_down=true +reverse_files_only=true +auto_save_setup_panels=false +navigate_with_arrows=false +panel_scroll_pages=true +panel_scroll_center=false +mouse_move_pages=true +filetype_mode=true +permission_mode=false +torben_fj_mode=false +quick_search_mode=2 +select_flags=6 +simple_swap=false + +[Panelize] +Find *.orig after patching=find . -name \\*.orig -print +Find SUID and SGID programs=find . \\( \\( -perm -04000 -a -perm /011 \\) -o \\( -perm -02000 -a -perm /01 \\) \\) -print +Modified git files=git ls-files --modified +Find rejects after patching=find . -name \\*.rej -print diff --git a/cli/.config/mc/panels.ini.symlink b/cli/.config/mc/panels.ini.symlink new file mode 100644 index 0000000..a03eff3 --- /dev/null +++ b/cli/.config/mc/panels.ini.symlink @@ -0,0 +1,37 @@ +[New Left Panel] +display=listing +reverse=false +case_sensitive=true +exec_first=false +sort_order=name +list_mode=full +brief_cols=2 +user_format=half type name | size | perm +user_status0=half type name | size | perm +user_status1=half type name | size | perm +user_status2=half type name | size | perm +user_status3=half type name | size | perm +user_mini_status=false +filter_flags=7 +list_format=full + +[New Right Panel] +display=listing +reverse=false +case_sensitive=true +exec_first=false +sort_order=name +list_mode=full +brief_cols=2 +user_format=half type name | size | perm +user_status0=half type name | size | perm +user_status1=half type name | size | perm +user_status2=half type name | size | perm +user_status3=half type name | size | perm +user_mini_status=false +filter_flags=7 +list_format=full + +[Dirs] +current_is_left=true +other_dir=/Users/marley/dotfiles diff --git a/cli/.local/share/mc/skins/catppuccin.ini.symlink b/cli/.local/share/mc/skins/catppuccin.ini.symlink new file mode 100644 index 0000000..4d16266 --- /dev/null +++ b/cli/.local/share/mc/skins/catppuccin.ini.symlink @@ -0,0 +1,140 @@ +[skin] + description = Catppuccin + +[Lines] + horiz = ─ + vert = │ + lefttop = ╭ + righttop = ╮ + leftbottom = ╰ + rightbottom = ╯ + topmiddle = ┬ + bottommiddle = ┴ + leftmiddle = ├ + rightmiddle = ┤ + cross = ┼ + dhoriz = ─ + dvert = │ + dlefttop = ╭ + drighttop = ╮ + dleftbottom = ╰ + drightbottom = ╯ + dtopmiddle = ┬ + dbottommiddle = ┴ + dleftmiddle = ├ + drightmiddle = ┤ + +[filehighlight] + directory = blue; + executable = red; + symlink = cyan; + hardlink = cyan; + stalelink = cyan; + device = brightgreen; + special = green; + core = red; + temp = brightgreen; + archive = red; + doc = yellow; + source = brightcyan; + media = brightgreen; + graph = cyan; + database = brightred; + +[core] + _default_ = magenta;default + selected = black;cyan + marked = black;cyan + markselect = black;blue + gauge = black;magenta + input = blue;black + inputmark = black;red + inputunchanged = red;black + commandlinemark = white;red + reverse = black;magenta + header = black;magenta + +[dialog] + _default_ = magenta;gray + dfocus = black;magenta + dhotnormal = gray;magenta + dhotfocus = gray;magenta + dtitle = magenta;gray + +[error] + _default_ = red;gray + errdfocus = black;red + errdhotnormal = red;black + errdhotfocus = yellow;red + errdtitle = gray;red + +[menu] + _default_ = white;black + menusel = black;cyan + menuhot = black;cyan + menuhotsel = cyan;black + menuinactive = white;black + +[help] + _default_ = magenta;gray + helpitalic = red;black;italic + helpbold = brightgreen;black;bold + helplink = blue;black + helpslink = gray;blue + helptitle = gray;magenta + +[editor] + _default_ = magenta;default + editbold = brightgreen;black + editmarked = black;cyan + editwhitespace = brightblue;black + editlinestate = white;black + bookmark = black;red + bookmarkfound = black;brightgreen + editrightmargin = brightblue;black + editframe = brightgreen; + editframeactive = white; + editframedrag = brightblue; + +[viewer] + _default_ = magenta;default + viewbold = green;black;bold + viewunderline = red;black + viewselected = blue;black + +[popupmenu] + _default_ = white;black + menusel = black;cyan + menutitle = white;black + +[buttonbar] + hotkey = black;cyan + button = white;black + +[statusbar] + _default_ = white;black + +[diffviewer] + added = black;green + changedline = black;cyan + changednew = red;cyan + changed = black;yellow + removed = black;red + error = red;white + +[widget-common] + sort-sign-up = ↑ + sort-sign-down = ↓ + +[widget-panel] + hiddenfiles-sign-show = • + hiddenfiles-sign-hide = ○ + history-prev-item-sign = « + history-next-item-sign = » + history-show-list-sign = ^ + filename-scroll-left-char = « + filename-scroll-right-char = » + +[widget-editor] + window-state-char = ↕ + window-close-char = ✕ diff --git a/cli/bat.config.fish b/cli/bat.config.fish new file mode 100644 index 0000000..45ef040 --- /dev/null +++ b/cli/bat.config.fish @@ -0,0 +1,8 @@ +#!/usr/bin/env fish + +set -gx BAT_CONFIG_PATH "$DOT/cli-tools/bat/bat.conf" +set -gx BAT_CONFIG_DIR "$DOT/cli-tools/bat" + +function cat --wraps cat + bat $argv +end diff --git a/bat/bat.conf b/cli/bat/bat.conf similarity index 100% rename from bat/bat.conf rename to cli/bat/bat.conf diff --git a/bat/themes/Catppuccin-frappe.tmTheme b/cli/bat/themes/Catppuccin-frappe.tmTheme similarity index 100% rename from bat/themes/Catppuccin-frappe.tmTheme rename to cli/bat/themes/Catppuccin-frappe.tmTheme diff --git a/bat/themes/Catppuccin-latte.tmTheme b/cli/bat/themes/Catppuccin-latte.tmTheme similarity index 100% rename from bat/themes/Catppuccin-latte.tmTheme rename to cli/bat/themes/Catppuccin-latte.tmTheme diff --git a/bat/themes/Catppuccin-macchiato.tmTheme b/cli/bat/themes/Catppuccin-macchiato.tmTheme similarity index 100% rename from bat/themes/Catppuccin-macchiato.tmTheme rename to cli/bat/themes/Catppuccin-macchiato.tmTheme diff --git a/bat/themes/Catppuccin-mocha.tmTheme b/cli/bat/themes/Catppuccin-mocha.tmTheme similarity index 100% rename from bat/themes/Catppuccin-mocha.tmTheme rename to cli/bat/themes/Catppuccin-mocha.tmTheme diff --git a/bat/install.fish b/cli/install.fish similarity index 60% rename from bat/install.fish rename to cli/install.fish index c3471cf..c92723d 100755 --- a/bat/install.fish +++ b/cli/install.fish @@ -5,7 +5,9 @@ source "$DOT/homebrew/brew_utils.fish" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -print_subtitle bat +print_subtitle "CLI Tools" + +brew_install "Midnight Commander" midnight-commander brew_install bat bat -execute "bat cache --build" "Rebuild cache" +execute "bat cache --build" "Rebuild bat cache"