diff options
Diffstat (limited to 'mac/.config')
| -rw-r--r-- | mac/.config/git/attributes | 186 | ||||
| -rw-r--r-- | mac/.config/htop/htoprc | 86 | ||||
| -rw-r--r-- | mac/.config/kitty/kitty.conf | 10 | ||||
| -rw-r--r-- | mac/.config/shell/profile | 7 | ||||
| -rw-r--r-- | mac/.config/yazi/keymap-default.toml | 2 |
5 files changed, 151 insertions, 140 deletions
diff --git a/mac/.config/git/attributes b/mac/.config/git/attributes index 70700a1..03b6667 100644 --- a/mac/.config/git/attributes +++ b/mac/.config/git/attributes @@ -1,95 +1,95 @@ -# Common settings that generally should always be used with your language specific settings - -# Auto detect text files and perform LF normalization -* text=auto eol=lf - +# # Common settings that generally should always be used with your language specific settings # -# The above will handle all files NOT found below +# # Auto detect text files and perform LF normalization +# * text=auto eol=lf # - -# Documents -*.bibtex text diff=bibtex -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain -*.md text diff=markdown -*.mdx text diff=markdown -*.tex text diff=tex -*.adoc text -*.textile text -*.mustache text -*.csv text eol=crlf -*.tab text -*.tsv text -*.txt text -*.sql text eol=lf -*.epub diff=astextplain - -# Graphics -*.png binary -*.jpg binary -*.jpeg binary -*.gif binary -*.tif binary -*.tiff binary -*.ico binary -# SVG treated as text by default. -# *.svg text -# If you want to treat it as binary, -# use the following line instead. -*.svg binary -*.eps binary - -# Scripts -*.bash text eol=lf -*.fish text eol=lf -*.ksh text eol=lf -*.sh text eol=lf -*.zsh text eol=lf -# These are explicitly windows files and should use crlf -# *.bat text eol=crlf -# *.cmd text eol=crlf -# *.ps1 text eol=crlf - -# Serialisation -*.json text -*.toml text -*.xml text -*.yaml text -*.yml text - -# Archives -*.7z binary -*.bz binary -*.bz2 binary -*.bzip2 binary -*.gz binary -*.lz binary -*.lzma binary -*.rar binary -*.tar binary -*.taz binary -*.tbz binary -*.tbz2 binary -*.tgz binary -*.tlz binary -*.txz binary -*.xz binary -*.Z binary -*.zip binary -*.zst binary - -# Text files where line endings should be preserved -*.patch -text - -# Exclude files from exporting -.gitattributes export-ignore -.gitignore export-ignore -.gitkeep export-ignore +# # +# # The above will handle all files NOT found below +# # +# +# # Documents +# *.bibtex text diff=bibtex +# *.doc diff=astextplain +# *.DOC diff=astextplain +# *.docx diff=astextplain +# *.DOCX diff=astextplain +# *.dot diff=astextplain +# *.DOT diff=astextplain +# *.pdf diff=astextplain +# *.PDF diff=astextplain +# *.rtf diff=astextplain +# *.RTF diff=astextplain +# *.md text diff=markdown +# *.mdx text diff=markdown +# *.tex text diff=tex +# *.adoc text +# *.textile text +# *.mustache text +# *.csv text eol=crlf +# *.tab text +# *.tsv text +# *.txt text +# *.sql text eol=lf +# *.epub diff=astextplain +# +# # Graphics +# *.png binary +# *.jpg binary +# *.jpeg binary +# *.gif binary +# *.tif binary +# *.tiff binary +# *.ico binary +# # SVG treated as text by default. +# # *.svg text +# # If you want to treat it as binary, +# # use the following line instead. +# *.svg binary +# *.eps binary +# +# # Scripts +# *.bash text eol=lf +# *.fish text eol=lf +# *.ksh text eol=lf +# *.sh text eol=lf +# *.zsh text eol=lf +# # These are explicitly windows files and should use crlf +# # *.bat text eol=crlf +# # *.cmd text eol=crlf +# # *.ps1 text eol=crlf +# +# # Serialisation +# *.json text +# *.toml text +# *.xml text +# *.yaml text +# *.yml text +# +# # Archives +# *.7z binary +# *.bz binary +# *.bz2 binary +# *.bzip2 binary +# *.gz binary +# *.lz binary +# *.lzma binary +# *.rar binary +# *.tar binary +# *.taz binary +# *.tbz binary +# *.tbz2 binary +# *.tgz binary +# *.tlz binary +# *.txz binary +# *.xz binary +# *.Z binary +# *.zip binary +# *.zst binary +# +# # Text files where line endings should be preserved +# *.patch -text +# +# # Exclude files from exporting +# .gitattributes export-ignore +# .gitignore export-ignore +# .gitkeep export-ignore diff --git a/mac/.config/htop/htoprc b/mac/.config/htop/htoprc index 8666417..efd1fd9 100644 --- a/mac/.config/htop/htoprc +++ b/mac/.config/htop/htoprc @@ -1,53 +1,61 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -.all_branches_collapsed=0 -.sort_direction=-1 -.sort_key=PERCENT_CPU -.tree_sort_direction=1 -.tree_sort_key=PID -.tree_view=0 -.tree_view_always_by_pid=0 -account_guest_in_cpu_meter=0 -all_branches_collapsed=0 -color_scheme=5 -column_meter_modes_0=1 1 1 2 2 2 1 -column_meter_modes_1= -column_meters_0=LeftCPUs Memory Swap Uptime LoadAverage Tasks RightCPUs -column_meters_1= +htop_version=3.3.0-dev config_reader_min_version=3 -cpu_count_from_one=0 -delay=15 -detailed_cpu_time=0 -enable_mouse=1 -fields=0 48 17 18 38 39 2 46 46 47 49 1 -find_comm_in_cmdline=1 -header_layout=two_50_50 -header_margin=1 -hide_function_bar=0 +fields=0 48 17 18 38 39 2 46 47 49 1 hide_kernel_threads=1 -hide_running_in_container=0 hide_userland_threads=0 +hide_running_in_container=0 +shadow_other_users=1 +show_thread_names=0 +show_program_path=1 highlight_base_name=1 -highlight_changes=1 -highlight_changes_delay_secs=1 highlight_deleted_exe=1 +shadow_distribution_path_prefix=0 highlight_megabytes=1 highlight_threads=1 -htop_version=3.3.0-dev -screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command +highlight_changes=1 +highlight_changes_delay_secs=1 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +header_margin=1 screen_tabs=1 -shadow_distribution_path_prefix=0 -shadow_other_users=1 -show_cpu_frequency=1 +detailed_cpu_time=0 +cpu_count_from_one=0 show_cpu_usage=1 -show_merged_command=0 -show_program_path=1 -show_thread_names=0 +show_cpu_frequency=1 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=5 +enable_mouse=1 +delay=15 +hide_function_bar=0 +header_layout=two_50_50 +column_meters_0=LeftCPUs2 Memory Swap +column_meter_modes_0=1 1 1 +column_meters_1=RightCPUs2 Tasks LoadAverage Uptime +column_meter_modes_1=1 2 2 2 +tree_view=0 +sort_key=47 +tree_sort_key=0 sort_direction=-1 -sort_key=46 -strip_exe_from_cmdline=1 tree_sort_direction=1 -tree_sort_key=0 -tree_view=0 tree_view_always_by_pid=0 -update_process_names=0 +all_branches_collapsed=0 +screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command +.sort_key=PERCENT_MEM +.tree_sort_key=PID +.tree_view=0 +.tree_view_always_by_pid=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 +screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command +.sort_key=PID +.tree_sort_key=PID +.tree_view=0 +.tree_view_always_by_pid=0 +.sort_direction=1 +.tree_sort_direction=1 +.all_branches_collapsed=0 diff --git a/mac/.config/kitty/kitty.conf b/mac/.config/kitty/kitty.conf index 1be69e0..bcbba11 100644 --- a/mac/.config/kitty/kitty.conf +++ b/mac/.config/kitty/kitty.conf @@ -1171,7 +1171,7 @@ background_image_layout cscaled #: When background image is scaled, whether linear interpolation #: should be used. -# dynamic_background_opacity no +dynamic_background_opacity yes #: Allow changing of the background_opacity dynamically, using either #: keyboard shortcuts (increase_background_opacity and @@ -2299,19 +2299,19 @@ map cmd+w no_op #: Increase background opacity -# map kitty_mod+a>m set_background_opacity +0.1 +map kitty_mod+a>m set_background_opacity +0.05 #: Decrease background opacity -# map kitty_mod+a>l set_background_opacity -0.1 +map kitty_mod+a>l set_background_opacity -0.05 #: Make background fully opaque -# map kitty_mod+a>1 set_background_opacity 1 +map kitty_mod+a>1 set_background_opacity 1 #: Reset background opacity -# map kitty_mod+a>d set_background_opacity default +map kitty_mod+a>d set_background_opacity default #: Reset the terminal diff --git a/mac/.config/shell/profile b/mac/.config/shell/profile index 546aafe..8e5e3ff 100644 --- a/mac/.config/shell/profile +++ b/mac/.config/shell/profile @@ -10,8 +10,11 @@ export LC_CTYPE=ko_KR.UTF-8 export BROWSER=$(command -v librewolf || command -v firefox || command -v qutebrowser) export EDITOR="nvim" export EDITOR2="vim" -# export FILE_MANAGER="lf $(lf -version)" -export FILE_MANAGER="yazi $(yazi --version)" +if command -v lf >/dev/null 2>&1; then + export FILE_MANAGER="lf $(lf -version)" +elif command -v yazi >/dev/null 2>&1; then + export FILE_MANAGER="yazi $(yazi --version)" +fi export KEYTIMEOUT=10 export SUDO_EDITOR=$EDITOR # export SUDO_ASKPASS="$HOME/.local/bin/dmenupass" diff --git a/mac/.config/yazi/keymap-default.toml b/mac/.config/yazi/keymap-default.toml index 6b7acad..dd78bc1 100644 --- a/mac/.config/yazi/keymap-default.toml +++ b/mac/.config/yazi/keymap-default.toml @@ -190,7 +190,7 @@ run = "plugin chmod" desc = "Chmod on selected files" [[mgr.prepend_keymap]] -on = "<C-d>" +on = [ "g", "f"] run = "plugin diff" desc = "Diff the selected with the hovered file" |