update:hypr

fcitx5(local)/themes/catppuccin-mocha-flamingo/theme.conf

@@ -1,110 +0,0 @@
-# vim: ft=dosini
-[Metadata]
-Name=Catppuccin Mocha Flamingo
-Version=0.2
-Author=justTOBBI and Isabelinc
-Description=Catppuccin Mocha Flamingo Color Theme
-ScaleWithDPI=True
-
-[InputPanel]
-# 字体
-Font=Sarasa Gothic SC 14
-# 非选中候选字颜色
-# Blue
-NormalColor=#89b4fa
-# 选中候选字颜色
-# Flamingo
-HighlightCandidateColor=#f2cdcd
-# 高亮前景颜色(输入字符颜色)
-# Flamingo
-HighlightColor=#f2cdcd
-# 输入字符背景颜色
-# Surface 0
-HighlightBackgroundColor=#313244
-
-Spacing=3
-
-[InputPanel/TextMargin]
-# 候选字对左边距
-Left=10
-# 候选字对右边距
-Right=10
-# 候选字向上边距
-Top=6
-# 候选字向下边距
-Bottom=6
-
-[InputPanel/Background]
-# Surface 0
-Color=#313244
-# Surface 0
-BorderColor=#313244
-BorderWidth=2
-
-[InputPanel/Background/Margin]
-Left=2
-Right=2
-Top=2
-Bottom=2
-
-[InputPanel/Highlight]
-# Surface 0
-Color=#313244
-
-[InputPanel/Highlight/Margin]
-# 高亮区域左边距
-Left=10
-# 高亮区域右边距
-Right=10
-# 高亮区域上边距
-Top=7
-# 高亮区域下边距
-Bottom=7
-
-[Menu]
-Font=Sarasa Gothic SC 14
-# Text
-NormalColor=#cdd6f4
-Spacing=3
-
-[Menu/Background]
-# Surface 0
-Color=#313244
-
-[Menu/Background/Margin]
-Left=2
-Right=2
-Top=2
-Bottom=2
-
-[Menu/ContentMargin]
-Left=2
-Right=2
-Top=2
-Bottom=2
-
-[Menu/Highlight]
-# Pink
-Color=#f5c2e7
-
-[Menu/Highlight/Margin]
-Left=10
-Right=10
-Top=5
-Bottom=5
-
-[Menu/Separator]
-# Base
-Color=#1e1e2e
-
-[Menu/CheckBox]
-Image=radio.png
-
-[Menu/SubMenu]
-Image=arrow.png
-
-[Menu/TextMargin]
-Left=5
-Right=5
-Top=5
-Bottom=5

fcitx5/conf/cached_layouts

@@ -958,11 +958,6 @@ Description="Keyboard - Swedish - Swedish (Svdvorak)"
 Language=sv
 Label="se (svdvorak)"
 
-[keyboard-se-colemak]
-Description="Keyboard - Swedish - Swedish (Colemak)"
-Language=sv
-Label="se (colemak)"
-
 [keyboard-se-mac]
 Description="Keyboard - Swedish - Swedish (Macintosh)"
 Language=sv
@@ -3678,6 +3673,11 @@ Description="Keyboard - Japanese - Japanese (Kana)"
 Language=ja
 Label="jp (kana)"
 
+[keyboard-jp-kana86]
+Description="Keyboard - Japanese - Japanese (Kana 86)"
+Language=ja
+Label="jp (kana86)"
+
 [keyboard-jp-OADG109A]
 Description="Keyboard - Japanese - Japanese (OADG 109A)"
 Language=ja

fcitx5/conf/classicui.conf

@@ -1,35 +0,0 @@
-# Vertical Candidate List
-Vertical Candidate List=False
-# Use mouse wheel to go to prev or next page
-WheelForPaging=True
-# Font
-Font="Sarasa Gothic SC 14"
-# Menu Font
-MenuFont="Sarasa Gothic SC 14"
-# Tray Font
-TrayFont="Sarasa Gothic SC 12"
-# Tray Label Outline Color
-TrayOutlineColor=#000000
-# Tray Label Text Color
-TrayTextColor=#ffffff
-# Prefer Text Icon
-PreferTextIcon=False
-# Show Layout Name In Icon
-ShowLayoutNameInIcon=True
-# Use input method language to display text
-UseInputMethodLanguageToDisplayText=True
-# Theme
-Theme=catppuccin-mocha-flamingo
-# Dark Theme
-DarkTheme=catppuccin-mocha-flamingo
-# Follow system light/dark color scheme
-UseDarkTheme=True
-# Follow system accent color if it is supported by theme and desktop
-UseAccentColor=True
-# Use Per Screen DPI on X11
-PerScreenDPI=False
-# Force font DPI on Wayland
-ForceWaylandDPI=0
-# Enable fractional scale under Wayland
-EnableFractionalScale=True
-

fcitx5/conf/notifications.conf

@@ -1,3 +1,3 @@
-# Hidden Notifications
+[HiddenNotifications]
-HiddenNotifications=
+0=fcitx-rime-deploy
 

fcitx5/conf/pinyin.conf

@@ -0,0 +1,140 @@
+# Shuangpin Profile
+ShuangpinProfile=Ziranma
+# Show current shuangpin mode
+ShowShuangpinMode=True
+# Page size
+PageSize=7
+# Enable Spell
+SpellEnabled=True
+# Enable Symbols
+SymbolsEnabled=True
+# Enable Chaizi
+ChaiziEnabled=True
+# Enable Characters in Unicode CJK Extension B
+ExtBEnabled=True
+# Enable Cloud Pinyin
+CloudPinyinEnabled=False
+# Cloud Pinyin Index
+CloudPinyinIndex=2
+# Show animation when Cloud Pinyin is loading
+CloudPinyinAnimation=True
+# Always show Cloud Pinyin place holder
+KeepCloudPinyinPlaceHolder=False
+# Preedit Mode
+PreeditMode="Composing pinyin"
+# Fix embedded preedit cursor at the beginning of the preedit
+PreeditCursorPositionAtBeginning=True
+# Show complete pinyin in preedit
+PinyinInPreedit=False
+# Enable Prediction
+Prediction=False
+# Prediction Size
+PredictionSize=49
+# Action when switching input method
+SwitchInputMethodBehavior="Commit current preedit"
+# Select 2nd Candidate
+SecondCandidate=
+# Select 3rd Candidate
+ThirdCandidate=
+# Use Keypad as Selection key
+UseKeypadAsSelection=False
+# Use BackSpace to cancel the selection
+BackSpaceToUnselect=True
+# Number of Sentences
+Number of sentence=2
+# Prompt long word length when input length over (0 for disable)
+LongWordLengthLimit=4
+# Key to trigger quickphrase
+QuickPhraseKey=semicolon
+# Use V to trigger quickphrase
+VAsQuickphrase=True
+# FirstRun
+FirstRun=False
+
+[ForgetWord]
+0=Control+7
+
+[PrevPage]
+0=minus
+1=Up
+2=KP_Up
+3=Page_Up
+
+[NextPage]
+0=equal
+1=Down
+2=KP_Down
+3=Next
+
+[PrevCandidate]
+0=Shift+Tab
+
+[NextCandidate]
+0=Tab
+
+[CurrentCandidate]
+0=space
+1=KP_Space
+
+[CommitRawInput]
+0=Return
+1=KP_Enter
+2=Control+Return
+3=Control+KP_Enter
+4=Shift+Return
+5=Shift+KP_Enter
+6=Control+Shift+Return
+7=Control+Shift+KP_Enter
+
+[ChooseCharFromPhrase]
+0=bracketleft
+1=bracketright
+
+[FilterByStroke]
+0=grave
+
+[QuickPhraseTriggerRegex]
+0=.(/|@)$
+1=^(www|bbs|forum|mail|bbs)\\.
+2=^(http|https|ftp|telnet|mailto):
+
+[Fuzzy]
+# ue -> ve
+VE_UE=True
+# Common Typo
+NG_GN=True
+# Inner Segment (xian -> xi'an)
+Inner=True
+# Inner Segment for Short Pinyin (qie -> qi'e)
+InnerShort=True
+# Match partial finals (e -> en, eng, ei)
+PartialFinal=True
+# Match partial shuangpin if input length is longer than 4
+PartialSp=False
+# u <-> v
+V_U=False
+# an <-> ang
+AN_ANG=False
+# en <-> eng
+EN_ENG=False
+# ian <-> iang
+IAN_IANG=False
+# in <-> ing
+IN_ING=False
+# u <-> ou
+U_OU=False
+# uan <-> uang
+UAN_UANG=False
+# c <-> ch
+C_CH=False
+# f <-> h
+F_H=False
+# l <-> n
+L_N=False
+# s <-> sh
+S_SH=False
+# z <-> zh
+Z_ZH=False
+# Correction Layout
+Correction=None
+

fcitx5/conf/punctuation.conf

@@ -0,0 +1,10 @@
+# Half width punctuation after latin letter or number
+HalfWidthPuncAfterLetterOrNumber=True
+# Type paired punctuations together (e.g. Quote)
+TypePairedPunctuationsTogether=False
+# Enabled
+Enabled=True
+
+[Hotkey]
+0=Control+period
+

fcitx5/conf/rime.conf

@@ -0,0 +1,13 @@
+# Preedit Mode
+PreeditMode="Composing text"
+# Shared Input State
+InputState=All
+# Fix embedded preedit cursor at the beginning of the preedit
+PreeditCursorPositionAtBeginning=True
+# Action when switching input method
+SwitchInputMethodBehavior="Commit commit preview"
+# Deploy
+Deploy=
+# Synchronize
+Synchronize=
+

fcitx5/config

@@ -11,7 +11,7 @@ EnumerateSkipFirst=False
 ModifierOnlyKeyTimeout=250
 
 [Hotkey/TriggerKeys]
-0=Control+space
+0=Control+Shift+Shift_L
 1=Zenkaku_Hankaku
 2=Hangul
 

fish/cachyos-config.fish

@@ -0,0 +1,137 @@
+## Source from conf.d before our fish config
+source ~/.config/fish/conf.d/done.fish
+
+## Set values
+## Run fastfetch as welcome message
+function fish_greeting
+    fastfetch
+end
+
+# Format man pages
+set -x MANROFFOPT -c
+set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"
+
+# Set settings for https://github.com/franciscolourenco/done
+set -U __done_min_cmd_duration 10000
+set -U __done_notification_urgency_level low
+
+## Environment setup
+# Apply .profile: use this to put fish compatible .profile stuff in
+if test -f ~/.fish_profile
+    source ~/.fish_profile
+end
+
+# Add ~/.local/bin to PATH
+if test -d ~/.local/bin
+    if not contains -- ~/.local/bin $PATH
+        set -p PATH ~/.local/bin
+    end
+end
+
+# Add depot_tools to PATH
+if test -d ~/Applications/depot_tools
+    if not contains -- ~/Applications/depot_tools $PATH
+        set -p PATH ~/Applications/depot_tools
+    end
+end
+
+## Functions
+# Functions needed for !! and !$ https://github.com/oh-my-fish/plugin-bang-bang
+function __history_previous_command
+    switch (commandline -t)
+        case "!"
+            commandline -t $history[1]
+            commandline -f repaint
+        case "*"
+            commandline -i !
+    end
+end
+
+function __history_previous_command_arguments
+    switch (commandline -t)
+        case "!"
+            commandline -t ""
+            commandline -f history-token-search-backward
+        case "*"
+            commandline -i '$'
+    end
+end
+
+if [ "$fish_key_bindings" = fish_vi_key_bindings ]
+
+    bind -Minsert ! __history_previous_command
+    bind -Minsert '$' __history_previous_command_arguments
+else
+    bind ! __history_previous_command
+    bind '$' __history_previous_command_arguments
+end
+
+# Fish command history
+function history
+    builtin history --show-time='%F %T '
+end
+
+function backup --argument filename
+    cp $filename $filename.bak
+end
+
+# Copy DIR1 DIR2
+function copy
+    set count (count $argv | tr -d \n)
+    if test "$count" = 2; and test -d "$argv[1]"
+        set from (echo $argv[1] | trim-right /)
+        set to (echo $argv[2])
+        command cp -r $from $to
+    else
+        command cp $argv
+    end
+end
+
+## Useful aliases
+# Replace ls with eza
+alias ls='eza -al --color=always --group-directories-first --icons' # preferred listing
+alias la='eza -a --color=always --group-directories-first --icons' # all files and dirs
+alias ll='eza -l --color=always --group-directories-first --icons' # long format
+alias lt='eza -aT --color=always --group-directories-first --icons' # tree listing
+alias l.="eza -a | grep -e '^\.'" # show only dotfiles
+
+# Common use
+alias grubup="sudo grub-mkconfig -o /boot/grub/grub.cfg"
+alias fixpacman="sudo rm /var/lib/pacman/db.lck"
+alias tarnow='tar -acf '
+alias untar='tar -zxvf '
+alias wget='wget -c '
+alias psmem='ps auxf | sort -nr -k 4'
+alias psmem10='ps auxf | sort -nr -k 4 | head -10'
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
+alias .....='cd ../../../..'
+alias ......='cd ../../../../..'
+alias dir='dir --color=auto'
+alias vdir='vdir --color=auto'
+alias grep='grep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias egrep='egrep --color=auto'
+alias hw='hwinfo --short' # Hardware Info
+alias big="expac -H M '%m\t%n' | sort -h | nl" # Sort installed packages according to size in MB
+alias gitpkg='pacman -Q | grep -i "\-git" | wc -l' # List amount of -git packages
+alias update='sudo pacman -Syu'
+
+# Get fastest mirrors
+alias mirror="sudo cachyos-rate-mirrors"
+
+# Help people new to Arch
+alias apt='man pacman'
+alias apt-get='man pacman'
+alias please='sudo'
+alias tb='nc termbin.com 9999'
+
+# Cleanup orphaned packages
+alias cleanup='sudo pacman -Rns (pacman -Qtdq)'
+
+# Get the error messages from journalctl
+alias jctl="journalctl -p 3 -xb"
+
+# Recent installed packages
+alias rip="expac --timefmt='%Y-%m-%d %T' '%l\t%n %v' | sort | tail -200 | nl"

fish/config.fish

@@ -1,128 +1,7 @@
-## Source from conf.d before our fish config
+source ~/.config/fish/cachyos-config.fish
-source ~/.config/fish/conf.d/done.fish
 atuin init fish | source
-## Set values
+# overwrite greeting
-## Run fastfetch as welcome message
+# potentially disabling fastfetch
-function fish_greeting
+#function fish_greeting
-    fastfetch
+#    # smth smth
-end
+#end
-
-# Format man pages
-set -x MANROFFOPT -c
-set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"
-
-# Set settings for https://github.com/franciscolourenco/done
-set -U __done_min_cmd_duration 10000
-set -U __done_notification_urgency_level low
-
-## Environment setup
-# Apply .profile: use this to put fish compatible .profile stuff in
-if test -f ~/.fish_profile
-    source ~/.fish_profile
-end
-
-# Add ~/.local/bin to PATH
-if test -d ~/.local/bin
-    if not contains -- ~/.local/bin $PATH
-        set -p PATH ~/.local/bin
-    end
-end
-
-# Add depot_tools to PATH
-if test -d ~/Applications/depot_tools
-    if not contains -- ~/Applications/depot_tools $PATH
-        set -p PATH ~/Applications/depot_tools
-    end
-end
-
-## Functions
-# Functions needed for !! and !$ https://github.com/oh-my-fish/plugin-bang-bang
-function __history_previous_command
-    switch (commandline -t)
-        case "!"
-            commandline -t $history[1]
-            commandline -f repaint
-        case "*"
-            commandline -i !
-    end
-end
-
-function __history_previous_command_arguments
-    switch (commandline -t)
-        case "!"
-            commandline -t ""
-            commandline -f history-token-search-backward
-        case "*"
-            commandline -i '$'
-    end
-end
-
-if [ "$fish_key_bindings" = fish_vi_key_bindings ]
-
-    bind -Minsert ! __history_previous_command
-    bind -Minsert '$' __history_previous_command_arguments
-else
-    bind ! __history_previous_command
-    bind '$' __history_previous_command_arguments
-end
-
-# Fish command history
-function history
-    builtin history --show-time='%F %T '
-end
-
-function backup --argument filename
-    cp $filename $filename.bak
-end
-
-# Copy DIR1 DIR2
-function copy
-    set count (count $argv | tr -d \n)
-    if test "$count" = 2; and test -d "$argv[1]"
-        set from (echo $argv[1] | trim-right /)
-        set to (echo $argv[2])
-        command cp -r $from $to
-    else
-        command cp $argv
-    end
-end
-
-## Useful aliases
-# Replace ls with eza
-alias ls='eza -al --color=always --group-directories-first --icons' # preferred listing
-alias la='eza -a --color=always --group-directories-first --icons' # all files and dirs
-alias ll='eza -l --color=always --group-directories-first --icons' # long format
-alias lt='eza -aT --color=always --group-directories-first --icons' # tree listing
-alias l.="eza -a | grep -e '^\.'" # show only dotfiles
-
-# Common use
-alias grubup="sudo grub-mkconfig -o /boot/grub/grub.cfg"
-alias tarnow='tar -acf '
-alias untar='tar -zxvf '
-alias wget='wget -c '
-alias psmem='ps auxf | sort -nr -k 4'
-alias psmem10='ps auxf | sort -nr -k 4 | head -10'
-alias ..='cd ..'
-alias ...='cd ../..'
-alias ....='cd ../../..'
-alias .....='cd ../../../..'
-alias ......='cd ../../../../..'
-alias dir='dir --color=auto'
-alias vdir='vdir --color=auto'
-alias grep='grep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias egrep='egrep --color=auto'
-alias hw='hwinfo --short' # Hardware Info
-alias big="expac -H M '%m\t%n' | sort -h | nl" # Sort installed packages according to size in MB
-
-# Get fastest mirrors
-alias mirror="sudo cachyos-rate-mirrors"
-
-# Cleanup orphaned packages
-alias cleanup='sudo pacman -Rns (pacman -Qtdq)'
-
-# Get the error messages from journalctl
-alias jctl="journalctl -p 3 -xb"
-
-# Recent installed packages
-alias rip="expac --timefmt='%Y-%m-%d %T' '%l\t%n %v' | sort | tail -200 | nl"

fish/fish_variables

@@ -0,0 +1,99 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __done_min_cmd_duration:10000
+SETUVAR __done_notification_urgency_level:low
+SETUVAR __fish_initialized:3800
+SETUVAR fish_color_autosuggestion:brblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:normal
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:brcyan
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:normal
+SETUVAR fish_pager_color_description:yellow\x1e\x2di
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR pure_begin_prompt_with_current_directory:true
+SETUVAR pure_check_for_new_release:false
+SETUVAR pure_color_at_sign:pure_color_mute
+SETUVAR pure_color_aws_profile:pure_color_warning
+SETUVAR pure_color_command_duration:pure_color_warning
+SETUVAR pure_color_current_directory:pure_color_primary
+SETUVAR pure_color_danger:red
+SETUVAR pure_color_dark:black
+SETUVAR pure_color_git_branch:pure_color_mute
+SETUVAR pure_color_git_dirty:pure_color_mute
+SETUVAR pure_color_git_stash:pure_color_info
+SETUVAR pure_color_git_unpulled_commits:pure_color_info
+SETUVAR pure_color_git_unpushed_commits:pure_color_info
+SETUVAR pure_color_hostname:pure_color_mute
+SETUVAR pure_color_info:cyan
+SETUVAR pure_color_jobs:pure_color_normal
+SETUVAR pure_color_k8s_context:pure_color_success
+SETUVAR pure_color_k8s_namespace:pure_color_primary
+SETUVAR pure_color_k8s_prefix:pure_color_info
+SETUVAR pure_color_light:white
+SETUVAR pure_color_mute:brblack
+SETUVAR pure_color_nixdevshell_prefix:pure_color_info
+SETUVAR pure_color_nixdevshell_symbol:pure_color_mute
+SETUVAR pure_color_normal:normal
+SETUVAR pure_color_prefix_root_prompt:pure_color_danger
+SETUVAR pure_color_primary:blue
+SETUVAR pure_color_prompt_on_error:pure_color_danger
+SETUVAR pure_color_prompt_on_success:pure_color_success
+SETUVAR pure_color_success:magenta
+SETUVAR pure_color_system_time:pure_color_mute
+SETUVAR pure_color_username_normal:pure_color_mute
+SETUVAR pure_color_username_root:pure_color_light
+SETUVAR pure_color_virtualenv:pure_color_mute
+SETUVAR pure_color_warning:yellow
+SETUVAR pure_enable_aws_profile:true
+SETUVAR pure_enable_container_detection:true
+SETUVAR pure_enable_git:true
+SETUVAR pure_enable_k8s:false
+SETUVAR pure_enable_nixdevshell:false
+SETUVAR pure_enable_single_line_prompt:false
+SETUVAR pure_enable_virtualenv:true
+SETUVAR pure_reverse_prompt_symbol_in_vimode:true
+SETUVAR pure_separate_prompt_on_error:false
+SETUVAR pure_shorten_prompt_current_directory_length:0
+SETUVAR pure_shorten_window_title_current_directory_length:0
+SETUVAR pure_show_jobs:false
+SETUVAR pure_show_prefix_root_prompt:false
+SETUVAR pure_show_subsecond_command_duration:false
+SETUVAR pure_show_system_time:false
+SETUVAR pure_symbol_aws_profile_prefix:
+SETUVAR pure_symbol_container_prefix:
+SETUVAR pure_symbol_git_dirty:\x2a
+SETUVAR pure_symbol_git_stash:\u2261
+SETUVAR pure_symbol_git_unpulled_commits:\u21e3
+SETUVAR pure_symbol_git_unpushed_commits:\u21e1
+SETUVAR pure_symbol_k8s_prefix:\u2638
+SETUVAR pure_symbol_nixdevshell_prefix:\u2744\ufe0f
+SETUVAR pure_symbol_prefix_root_prompt:\x23
+SETUVAR pure_symbol_prompt:\u276f
+SETUVAR pure_symbol_reverse_prompt:\u276e
+SETUVAR pure_symbol_ssh_prefix:
+SETUVAR pure_symbol_title_bar_separator:\x2d
+SETUVAR pure_symbol_virtualenv_prefix:
+SETUVAR pure_threshold_command_duration:5
+SETUVAR pure_truncate_prompt_current_directory_keeps:\x2d1
+SETUVAR pure_truncate_window_title_current_directory_keeps:\x2d1

fuzzel/fuzzel.ini

@@ -1,21 +0,0 @@
-[colors]
-background=1e1e2edd
-text=cdd6f4ff
-prompt=bac2deff
-placeholder=7f849cff
-input=cdd6f4ff
-match=b4befeff
-selection=585b70ff
-selection-text=cdd6f4ff
-selection-match=b4befeff
-counter=7f849cff
-border=b4befeff
-
-[main]
-font=Sarasa Gothic SC:size=18
-icon-theme=Papirus-Dark
-icons-enabled=no
-delayed-filter-ms=0
-delayed-filter-limit=0
-lines=10
-sort-result=yes

hypr/config/autostart.conf

@@ -9,7 +9,6 @@ exec-once = swww-daemon
 exec-once = waybar &
 exec-once = fcitx5 -d &
 exec-once = swayosd-server
-exec-once = wl-clip-persist --clipboard regular
 # exec-once = mako &
 exec-once = nm-applet --indicator &
 exec-once = bash -c "mkfifo /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob && tail -f /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob | wob & disown" &

hypr/config/defaults.conf

@@ -4,7 +4,7 @@
 $browser = floorp
 $filemanager = nemo
 #$applauncher = rofi -show combi -modi window,run,combi -combi-modi window,run
-$applauncher = fuzzel
+$applauncher = wofi
 $terminal = alacritty
 #$idlehandler = swayidle -w timeout 300 'swaylock -f -c 000000' before-sleep 'swaylock -f -c 000000'
 $capturing = grim -g "$(slurp)" - | swappy -f -

lazygit/config.yml

@@ -0,0 +1,23 @@
+gui:
+  authorColors:
+    "*": "#b4befe"
+  theme:
+    activeBorderColor:
+      - "#cba6f7"
+      - bold
+    inactiveBorderColor:
+      - "#a6adc8"
+    optionsTextColor:
+      - "#89b4fa"
+    selectedLineBgColor:
+      - "#313244"
+    cherryPickedCommitBgColor:
+      - "#45475a"
+    cherryPickedCommitFgColor:
+      - "#cba6f7"
+    unstagedChangesColor:
+      - "#f38ba8"
+    defaultFgColor:
+      - "#cdd6f4"
+    searchingActiveBorderColor:
+      - "#f9e2af"

nushell/config.nu

@@ -1,821 +0,0 @@
-
-let dark_theme = {
-    separator: white
-    leading_trailing_space_bg: { attr: n }
-    header: green_bold
-    bool: light_cyan
-    int: white
-    filesize: cyan
-    duration: white
-    date: purple
-    range: white
-    float: white
-    string: white
-    nothing: white
-    binary: white
-    cell-path: white
-    row_index: green_bold
-    record: white
-    list: white
-    block: white
-    hints: dark_gray
-    search_result: { bg: red fg: white }
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_external_resolved: light_yellow_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    shape_garbage: { fg: white bg: red attr: b }
-    shape_glob_interpolation: cyan_bold
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_keyword: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-    shape_raw_string: light_purple
-}
-
-let light_theme = {
-    separator: dark_gray
-    leading_trailing_space_bg: { attr: n }
-    header: green_bold
-    empty: blue
-    bool: dark_cyan
-    int: dark_gray
-    filesize: cyan_bold
-    duration: dark_gray
-    date: purple
-    range: dark_gray
-    float: dark_gray
-    string: dark_gray
-    nothing: dark_gray
-    binary: dark_gray
-    cell-path: dark_gray
-    row_index: green_bold
-    record: dark_gray
-    list: dark_gray
-    block: dark_gray
-    hints: dark_gray
-    search_result: { fg: white bg: red }
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_external_resolved: light_purple_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    shape_garbage: { fg: white bg: red attr: b }
-    shape_glob_interpolation: cyan_bold
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_keyword: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-    shape_raw_string: light_purple
-}
-$env.config = {
-    show_banner: false
-
-    ls: {
-        use_ls_colors: true
-        clickable_links: true
-    }
-
-    rm: {
-        always_trash: false
-    }
-
-    table: {
-        mode: rounded
-        index_mode: always
-        show_empty: true
-        padding: { left: 1, right: 1 }
-        trim: {
-            methodology: wrapping
-            wrapping_try_keep_words: true
-            truncating_suffix: "..."
-        }
-        header_on_separator: false
-    }
-
-    error_style: "fancy"
-    display_errors: {
-        exit_code: false
-        termination_signal: true
-    }
-    datetime_format: {
-    }
-
-    explore: {
-        status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" },
-        command_bar_text: { fg: "#C4C9C6" },
-        highlight: { fg: "black", bg: "yellow" },
-        status: {
-            error: { fg: "white", bg: "red" },
-            warn: {}
-            info: {}
-        },
-        selected_cell: { bg: light_blue },
-    }
-
-    history: {
-        max_size: 100_000
-        sync_on_enter: true
-        file_format: "plaintext"
-        isolation: false
-    }
-
-    completions: {
-        case_sensitive: false
-        quick: true
-        partial: true
-        algorithm: "prefix"
-        sort: "smart"
-        external: {
-            enable: true
-            max_results: 100
-            completer: null
-        }
-        use_ls_colors: true
-    }
-
-    cursor_shape: {
-        emacs: line
-        vi_insert: block
-        vi_normal: underscore
-    }
-
-    color_config: $dark_theme
-    footer_mode: 25
-    float_precision: 2
-    buffer_editor: micro
-    use_ansi_coloring: true
-    bracketed_paste: true
-    edit_mode: emacs
-    shell_integration: {
-        osc2: true
-        osc7: true
-        osc8: true
-        osc9_9: false
-        osc133: true
-        osc633: true
-        reset_application_mode: true
-    }
-    render_right_prompt_on_last_line: false
-    use_kitty_protocol: false
-    highlight_resolved_externals: false
-    recursion_limit: 50
-
-    plugins: {}
-
-    plugin_gc: {
-        default: {
-            enabled: true
-            stop_after: 10sec
-        }
-        plugins: {
-        }
-    }
-
-    hooks: {
-        pre_prompt: [{ null }]
-        pre_execution: [{ null }]
-        env_change: {
-            PWD: [{|before, after|
-                if (which direnv | is-empty) {
-                    return
-                }
-
-                direnv export json | from json | default {} | load-env
-            }]
-        }
-        display_output: "if (term size).columns >= 100 { table -e } else { table }"
-        command_not_found: { null }
-    }
-
-    menus: [
-        {
-            name: completion_menu
-            only_buffer_difference: false
-            marker: "| "
-            type: {
-                layout: columnar
-                columns: 4
-                col_width: 20
-                col_padding: 2
-            }
-            style: {
-                text: green
-                selected_text: { attr: r }
-                description_text: yellow
-                match_text: { attr: u }
-                selected_match_text: { attr: ur }
-            }
-        }
-        {
-            name: ide_completion_menu
-            only_buffer_difference: false
-            marker: "| "
-            type: {
-                layout: ide
-                min_completion_width: 0,
-                max_completion_width: 50,
-                max_completion_height: 10,
-                padding: 0,
-                border: true,
-                cursor_offset: 0,
-                description_mode: "prefer_right"
-                min_description_width: 0
-                max_description_width: 50
-                max_description_height: 10
-                description_offset: 1
-                correct_cursor_pos: false
-            }
-            style: {
-                text: green
-                selected_text: { attr: r }
-                description_text: yellow
-                match_text: { attr: u }
-                selected_match_text: { attr: ur }
-            }
-        }
-        {
-            name: history_menu
-            only_buffer_difference: true
-            marker: "? "
-            type: {
-                layout: list
-                page_size: 10
-            }
-            style: {
-                text: green
-                selected_text: green_reverse
-                description_text: yellow
-            }
-        }
-        {
-            name: help_menu
-            only_buffer_difference: true
-            marker: "? "
-            type: {
-                layout: description
-                columns: 4
-                col_width: 20
-                col_padding: 2
-                selection_rows: 4
-                description_rows: 10
-            }
-            style: {
-                text: green
-                selected_text: green_reverse
-                description_text: yellow
-            }
-        }
-    ]
-
-    keybindings: [
-        {
-            name: completion_menu
-            modifier: none
-            keycode: tab
-            mode: [emacs vi_normal vi_insert]
-            event: {
-                until: [
-                    { send: menu name: completion_menu }
-                    { send: menunext }
-                    { edit: complete }
-                ]
-            }
-        }
-        {
-            name: completion_previous_menu
-            modifier: shift
-            keycode: backtab
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: menuprevious }
-        }
-        {
-            name: ide_completion_menu
-            modifier: control
-            keycode: space
-            mode: [emacs vi_normal vi_insert]
-            event: {
-                until: [
-                    { send: menu name: ide_completion_menu }
-                    { send: menunext }
-                    { edit: complete }
-                ]
-            }
-        }
-        {
-            name: history_menu
-            modifier: control
-            keycode: char_r
-            mode: [emacs, vi_insert, vi_normal]
-            event: { send: menu name: history_menu }
-        }
-        {
-            name: help_menu
-            modifier: none
-            keycode: f1
-            mode: [emacs, vi_insert, vi_normal]
-            event: { send: menu name: help_menu }
-        }
-        {
-            name: next_page_menu
-            modifier: control
-            keycode: char_x
-            mode: emacs
-            event: { send: menupagenext }
-        }
-        {
-            name: undo_or_previous_page_menu
-            modifier: control
-            keycode: char_z
-            mode: emacs
-            event: {
-                until: [
-                    { send: menupageprevious }
-                    { edit: undo }
-                ]
-            }
-        }
-        {
-            name: escape
-            modifier: none
-            keycode: escape
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: esc }    # NOTE: does not appear to work
-        }
-        {
-            name: cancel_command
-            modifier: control
-            keycode: char_c
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: ctrlc }
-        }
-        {
-            name: quit_shell
-            modifier: control
-            keycode: char_d
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: ctrld }
-        }
-        {
-            name: clear_screen
-            modifier: control
-            keycode: char_l
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: clearscreen }
-        }
-        {
-            name: search_history
-            modifier: control
-            keycode: char_q
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: searchhistory }
-        }
-        {
-            name: open_command_editor
-            modifier: control
-            keycode: char_o
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: openeditor }
-        }
-        {
-            name: move_up
-            modifier: none
-            keycode: up
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuup }
-                    { send: up }
-                ]
-            }
-        }
-        {
-            name: move_down
-            modifier: none
-            keycode: down
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menudown }
-                    { send: down }
-                ]
-            }
-        }
-        {
-            name: move_left
-            modifier: none
-            keycode: left
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuleft }
-                    { send: left }
-                ]
-            }
-        }
-        {
-            name: move_right_or_take_history_hint
-            modifier: none
-            keycode: right
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { send: menuright }
-                    { send: right }
-                ]
-            }
-        }
-        {
-            name: move_one_word_left
-            modifier: control
-            keycode: left
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: control
-            keycode: right
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: move_to_line_start
-            modifier: none
-            keycode: home
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_start
-            modifier: control
-            keycode: char_a
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_end_or_take_history_hint
-            modifier: none
-            keycode: end
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { edit: movetolineend }
-                ]
-            }
-        }
-        {
-            name: move_to_line_end_or_take_history_hint
-            modifier: control
-            keycode: char_e
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { edit: movetolineend }
-                ]
-            }
-        }
-        {
-            name: move_to_line_start
-            modifier: control
-            keycode: home
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_end
-            modifier: control
-            keycode: end
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolineend }
-        }
-        {
-            name: move_down
-            modifier: control
-            keycode: char_n
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menudown }
-                    { send: down }
-                ]
-            }
-        }
-        {
-            name: move_up
-            modifier: control
-            keycode: char_p
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuup }
-                    { send: up }
-                ]
-            }
-        }
-        {
-            name: delete_one_character_backward
-            modifier: none
-            keycode: backspace
-            mode: [emacs, vi_insert]
-            event: { edit: backspace }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: control
-            keycode: backspace
-            mode: [emacs, vi_insert]
-            event: { edit: backspaceword }
-        }
-        {
-            name: delete_one_character_forward
-            modifier: none
-            keycode: delete
-            mode: [emacs, vi_insert]
-            event: { edit: delete }
-        }
-        {
-            name: delete_one_character_forward
-            modifier: control
-            keycode: delete
-            mode: [emacs, vi_insert]
-            event: { edit: delete }
-        }
-        {
-            name: delete_one_character_backward
-            modifier: control
-            keycode: char_h
-            mode: [emacs, vi_insert]
-            event: { edit: backspace }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: control
-            keycode: char_w
-            mode: [emacs, vi_insert]
-            event: { edit: backspaceword }
-        }
-        {
-            name: move_left
-            modifier: none
-            keycode: backspace
-            mode: vi_normal
-            event: { edit: moveleft }
-        }
-        {
-            name: newline_or_run_command
-            modifier: none
-            keycode: enter
-            mode: emacs
-            event: { send: enter }
-        }
-        {
-            name: move_left
-            modifier: control
-            keycode: char_b
-            mode: emacs
-            event: {
-                until: [
-                    { send: menuleft }
-                    { send: left }
-                ]
-            }
-        }
-        {
-            name: move_right_or_take_history_hint
-            modifier: control
-            keycode: char_f
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { send: menuright }
-                    { send: right }
-                ]
-            }
-        }
-        {
-            name: redo_change
-            modifier: control
-            keycode: char_g
-            mode: emacs
-            event: { edit: redo }
-        }
-        {
-            name: undo_change
-            modifier: control
-            keycode: char_z
-            mode: emacs
-            event: { edit: undo }
-        }
-        {
-            name: paste_before
-            modifier: control
-            keycode: char_y
-            mode: emacs
-            event: { edit: pastecutbufferbefore }
-        }
-        {
-            name: cut_word_left
-            modifier: control
-            keycode: char_w
-            mode: emacs
-            event: { edit: cutwordleft }
-        }
-        {
-            name: cut_line_to_end
-            modifier: control
-            keycode: char_k
-            mode: emacs
-            event: { edit: cuttolineend }
-        }
-        {
-            name: cut_line_from_start
-            modifier: control
-            keycode: char_u
-            mode: emacs
-            event: { edit: cutfromstart }
-        }
-        {
-            name: swap_graphemes
-            modifier: control
-            keycode: char_t
-            mode: emacs
-            event: { edit: swapgraphemes }
-        }
-        {
-            name: move_one_word_left
-            modifier: alt
-            keycode: left
-            mode: emacs
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: alt
-            keycode: right
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: move_one_word_left
-            modifier: alt
-            keycode: char_b
-            mode: emacs
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: alt
-            keycode: char_f
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: delete_one_word_forward
-            modifier: alt
-            keycode: delete
-            mode: emacs
-            event: { edit: deleteword }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: alt
-            keycode: backspace
-            mode: emacs
-            event: { edit: backspaceword }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: alt
-            keycode: char_m
-            mode: emacs
-            event: { edit: backspaceword }
-        }
-        {
-            name: cut_word_to_right
-            modifier: alt
-            keycode: char_d
-            mode: emacs
-            event: { edit: cutwordright }
-        }
-        {
-            name: upper_case_word
-            modifier: alt
-            keycode: char_u
-            mode: emacs
-            event: { edit: uppercaseword }
-        }
-        {
-            name: lower_case_word
-            modifier: alt
-            keycode: char_l
-            mode: emacs
-            event: { edit: lowercaseword }
-        }
-        {
-            name: capitalize_char
-            modifier: alt
-            keycode: char_c
-            mode: emacs
-            event: { edit: capitalizechar }
-        }
-        {
-            name: copy_selection
-            modifier: control_shift
-            keycode: char_c
-            mode: emacs
-            event: { edit: copyselection }
-        }
-        {
-            name: cut_selection
-            modifier: control_shift
-            keycode: char_x
-            mode: emacs
-            event: { edit: cutselection }
-        }
-        {
-            name: select_all
-            modifier: control_shift
-            keycode: char_a
-            mode: emacs
-            event: { edit: selectall }
-        }
-    ]
-}
-
-mkdir ($nu.data-dir | path join "vendor/autoload")
-atuin init nu | save -f ($nu.data-dir | path join "vendor/autoload/atuin.nu")
-starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.nu")
-zoxide init nushell | save -f ($nu.data-dir | path join "vendor/autoload/zoxide.nu")

nushell/env.nu

@@ -1,57 +0,0 @@
-def create_left_prompt [] {
-    let dir = match (do --ignore-errors { $env.PWD | path relative-to $nu.home-path }) {
-        null => $env.PWD
-        '' => '~'
-        $relative_pwd => ([~ $relative_pwd] | path join)
-    }
-
-    let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
-    let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
-    let path_segment = $"($path_color)($dir)(ansi reset)"
-
-    $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
-}
-
-def create_right_prompt [] {
-    let time_segment = ([
-        (ansi reset)
-        (ansi magenta)
-        (date now | format date '%x %X')
-    ] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
-        str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
-
-    let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
-        (ansi rb)
-        ($env.LAST_EXIT_CODE)
-    ] | str join)
-    } else { "" }
-
-    ([$last_exit_code, (char space), $time_segment] | str join)
-}
-
-$env.PROMPT_COMMAND = {|| create_left_prompt }
-$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
-$env.PROMPT_INDICATOR = {|| "> " }
-$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " }
-$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " }
-$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
-
-$env.ENV_CONVERSIONS = {
-    "PATH": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-    "Path": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-}
-
-$env.NU_LIB_DIRS = [
-    ($nu.default-config-dir | path join 'scripts')
-    ($nu.data-dir | path join 'completions')
-]
-
-$env.NU_PLUGIN_DIRS = [
-    ($nu.default-config-dir | path join 'plugins')
-]

nvim/lazy-lock.json

@@ -1,46 +1,46 @@
 {
-  "LazyVim": { "branch": "main", "commit": "a65d5d530d372b39a468dfbb2ce633f344770c5c" },
+  "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "960a5cf992c033170499ccc7003df59734ed40a8" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5" },
-  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
+  "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "af58927c55c9f3272c940ff02b3cee94a1249f26" },
+  "catppuccin": { "branch": "main", "commit": "56a9dfd1e05868cf3189369aad87242941396563" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "b67cc417d9020fb4b83d46662351b4d16894905e" },
+  "clangd_extensions.nvim": { "branch": "main", "commit": "db28f29be928d18cbfb86fbfb9f83f584f658feb" },
-  "cmake-tools.nvim": { "branch": "master", "commit": "88e07c6bff838a5bda2f461e9c1122b79ff0829f" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "591ae37fc5494677e929118f0a182d2b61fe1af1" },
-  "conform.nvim": { "branch": "master", "commit": "235dd79731c1dc51ec04abb4045cbc54727a172a" },
+  "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
-  "flash.nvim": { "branch": "main", "commit": "2febce67ff9cf7638d2569d17c41af02c38401eb" },
+  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
+  "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
-  "grug-far.nvim": { "branch": "main", "commit": "3e72397465f774b01aa38e4fe8e6eecf23d766d9" },
+  "grug-far.nvim": { "branch": "main", "commit": "f24022147ca4a0fe1d424a520a9437accbeba193" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" },
+  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" },
+  "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
-  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
+  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" },
+  "mini.ai": { "branch": "main", "commit": "7f1fe86277f0e977642cf8fe15f004229f61e61a" },
-  "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
+  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" },
+  "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
-  "noice.nvim": { "branch": "main", "commit": "db248375c12c5322fbb9b505c1dc6f08e4527684" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
-  "nvim-dap": { "branch": "master", "commit": "6782b097af2417a4c3e33849b0a26ae2188bd7ea" },
+  "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
-  "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
+  "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
-  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
+  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
+  "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" },
-  "nvim-lspconfig": { "branch": "master", "commit": "e5c61b02f33b5c6538be25b2696b33b4cc91e667" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" },
-  "nvim-treesitter": { "branch": "main", "commit": "71bf1665f804d46f7e4b24ad7ffc11f6ea5b271a" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "persistence.nvim": { "branch": "main", "commit": "51eef57272742b773468949f6bd0503ec3f83874" },
+  "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "snacks.nvim": { "branch": "main", "commit": "1b4205eb1a224f668e85abeda2c0b1f0f73f477d" },
+  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
-  "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "tokyonight.nvim": { "branch": "main", "commit": "e63c42a42b11cd6225f009dd949b9ee0fccc15ef" },
+  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
-  "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "ts-comments.nvim": { "branch": "main", "commit": "217ab9cc137fceb6659b53790bd25e608219abe1" },
+  "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" },
-  "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
-

nvim/lazyvim.json

@@ -9,7 +9,7 @@
   ],
   "install_version": 8,
   "news": {
-    "NEWS.md": "11866"
+    "NEWS.md": "10960"
   },
   "version": 8
-}
+}

nvim/lua/plugins/diffview.lua

@@ -1,8 +0,0 @@
-return {
-	"sindrets/diffview.nvim",
-	dependencies = { "nvim-lua/plenary.nvim" },
-	cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewFileHistory" },
-	config = function()
-		require("diffview").setup()
-	end,
-}

setup_ubuntu.sh

@@ -1,196 +0,0 @@
-#!/bin/bash
-set -e
-
-# =============================
-#  基础软件
-# =============================
-sudo apt update
-sudo apt install -y \
-    build-essential curl wget git unzip \
-    ca-certificates gnupg lsb-release software-properties-common \
-    zsh neovim eza fzf zoxide
-
-# =============================
-#  安装 Docker
-# =============================
-echo ">>> Installing Docker..."
-
-sudo install -m 0755 -d /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-
-echo \
-"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] \
-https://download.docker.com/linux/ubuntu \
-$(lsb_release -sc) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-
-sudo apt update
-sudo apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
-
-# 加入 Docker 组（避免 sudo）
-sudo usermod -aG docker "$USER"
-echo ">>> Added $USER to docker group"
-
-# =============================
-# 安装 Atuin
-# =============================
-echo ">>> Installing Atuin..."
-curl --proto '=https' --tlsv1.2 -sSf https://setup.atuin.sh | bash
-
-# =============================
-# 安装 Starship
-# =============================
-echo ">>> Installing Starship..."
-curl -sS https://starship.rs/install.sh | sh -s -- -y
-
-# =============================
-# 安装 JetBrainsMono Nerd Font
-# =============================
-FONT_NAME="JetBrainsMono"
-ZIP_URL="https://github.com/ryanoasis/nerd-fonts/releases/latest/download/${FONT_NAME}.zip"
-ZIP_FILE="/tmp/${FONT_NAME}.zip"
-FONT_DIR="$HOME/.local/share/fonts"
-
-echo ">>> Downloading Nerd Font..."
-
-mkdir -p "$FONT_DIR"
-
-# 下载失败自动切换 FastGit
-wget -O "$ZIP_FILE" "$ZIP_URL" || \
-wget -O "$ZIP_FILE" "https://download.fastgit.org/ryanoasis/nerd-fonts/releases/latest/download/${FONT_NAME}.zip"
-
-unzip -o "$ZIP_FILE" -d "$FONT_DIR"
-fc-cache -fv
-
-# =============================
-# 安装 zsh 插件
-# =============================
-echo ">>> Installing zsh plugins..."
-
-PLUGIN_DIR="$HOME/.config/zsh/plugins"
-mkdir -p "$PLUGIN_DIR"
-
-# zsh-autosuggestions
-if [ ! -d "$PLUGIN_DIR/zsh-autosuggestions" ]; then
-  git clone https://github.com/zsh-users/zsh-autosuggestions "$PLUGIN_DIR/zsh-autosuggestions"
-fi
-
-# syntax-highlighting
-if [ ! -d "$PLUGIN_DIR/zsh-syntax-highlighting" ]; then
-  git clone https://github.com/zsh-users/zsh-syntax-highlighting "$PLUGIN_DIR/zsh-syntax-highlighting"
-fi
-
-# fzf-tab
-if [ ! -d "$PLUGIN_DIR/fzf-tab" ]; then
-  git clone https://github.com/Aloxaf/fzf-tab "$PLUGIN_DIR/fzf-tab"
-fi
-
-# =============================
-# 生成 .zshrc
-# =============================
-echo ">>> Generating ~/.zshrc..."
-
-cat > ~/.zshrc << 'EOF'
-# ========================
-#  Locale & Editor
-# ========================
-export EDITOR=nano
-
-export PATH="$HOME/.atuin/bin:$PATH"
-
-# ========================
-#  History
-# ========================
-HISTFILE="${XDG_STATE_HOME:-$HOME/.local/state}/zsh/history"
-mkdir -p "$(dirname "$HISTFILE")"
-HISTSIZE=10000
-SAVEHIST=10000
-setopt HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY INC_APPEND_HISTORY
-
-# ========================
-#  Tools Integration
-# ========================
-if [[ -o interactive ]]; then
-  # AtuIn
-  if command -v atuin >/dev/null 2>&1; then
-    eval "$(atuin init zsh)"
-  fi
-
-  # zoxide
-  if command -v zoxide >/dev/null 2>&1; then
-    eval "$(zoxide init zsh)"
-  fi
-
-  # starship
-  if command -v starship >/dev/null 2>&1; then
-    eval "$(starship init zsh)"
-  fi
-fi
-
-# ========================
-#  Colors & Aliases
-# ========================
-autoload -U colors && colors
-
-alias ls='eza --icons=auto --group-directories-first'
-alias ll='eza -lh --icons=auto --group-directories-first'
-alias la='eza -lha --icons=auto --group-directories-first'
-
-alias grep='grep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias egrep='egrep --color=auto'
-alias ..='cd ..'
-alias ...='cd ../..'
-
-# ========================
-#  Completion
-# ========================
-autoload -Uz compinit
-mkdir -p ~/.cache/zsh
-compinit -d ~/.cache/zsh/zcompdump
-setopt CORRECT
-
-if [[ -o interactive ]]; then
-  source ~/.config/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-  source ~/.config/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-  source ~/.config/zsh/plugins/fzf-tab/fzf-tab.plugin.zsh
-
-  ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-  ZSH_AUTOSUGGEST_STRATEGY=(history completion)
-
-  bindkey -e
-fi
-
-# ========================
-#  Prompt
-# ========================
-if ! command -v starship >/dev/null 2>&1; then
-  PROMPT='%F{green}%n@%m%f:%F{blue}%~%f %# '
-  RPROMPT='%F{yellow}[%D{%H:%M}]%f'
-fi
-EOF
-
-# =============================
-# 设置 GNOME Terminal 字体
-# =============================
-if command -v gsettings >/dev/null; then
-  if gsettings list-schemas | grep -q "org.gnome.Terminal"; then
-    echo ">>> Setting GNOME Terminal font..."
-
-    PROFILE_ID=$(gsettings get org.gnome.Terminal.ProfilesList default | tr -d "'")
-    PROFILE_PATH="org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:$PROFILE_ID/"
-
-    gsettings set "$PROFILE_PATH" font 'JetBrainsMono Nerd Font Mono 14' || true
-  else
-    echo "⚠️ 检测到不是 GNOME Terminal，跳过字体设置。"
-  fi
-else
-  echo "⚠️ gsettings 不可用，跳过终端字体设置。"
-fi
-
-# =============================
-# 更改默认 shell 为 zsh
-# =============================
-echo ">>> Changing default shell to zsh..."
-chsh -s "$(which zsh)"
-
-echo ">>> 完成！重新登录即可生效所有配置。"

waybar/config.jsonc

@@ -2,15 +2,15 @@
   "layer": "top",
   "position": "top",
   //"height": 20,
-  "margin-left": 0,
+  "margin-left": 10,
   "margin-bottom": 0,
-  "margin-right": 0,
+  "margin-right": 10,
   "spacing": 8,
   "modules-left": [
     "custom/startmenu",
     "backlight",
-    "wireplumber",
     "battery",
+//   "network",
     "hyprland/workspaces",
     "niri/workspaces",
     "sway/workspaces"
@@ -21,8 +21,9 @@
   "modules-right": [
     "custom/screenshot",
     "tray",
-//    "custom/wl-gammarelay-brightness",
+    "custom/wl-gammarelay-brightness",
-//    "custom/wl-gammarelay-temperature",
+    "custom/wl-gammarelay-temperature",
+    "wireplumber",
     "clock",
     "custom/swaync",
   ],
@@ -58,7 +59,16 @@
     "format-plugged": " {capacity}%",
     "format-icons": ["", "", "", "", ""],
   },
-
+/*
+  "network": {
+    "interval": 3,
+    "format": "{bandwidthUpBytes} {bandwidthDownBytes}",
+    "format-disconnected": "󰲜 ",
+    "on-click": "alacritty -e zenith",
+    "on-click-right": "corestats",
+    "tooltip-format": "{ifname}\n{ipaddr}/{cidr}\n",
+  },
+*/
   "hyprland/workspaces": {
     "all-outputs": true,
     "format": "{name}",
@@ -86,7 +96,7 @@
       "on-click": "activate",
       "on-click-middle": "close",
   },
-/*
+
   "custom/screenshot": {
     "format": " 󰨵 ",
     "on-click": "sh ~/.config/waybar/scripts/Screenshot-Area.sh",
@@ -94,7 +104,7 @@
     "on-click-middle": "sh ~/.config/waybar/scripts/Screenshot-Fullscreen.sh",
     "tooltip": false,
   },
-*/
+
   "tray": {
     "spacing": 8,
   },
@@ -117,6 +127,7 @@
       "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n -100",
       "tooltip": false
   },
+
 /*
   "wireplumber": {
     "on-click": "pwvucontrol",
@@ -133,13 +144,12 @@
     },
   },
 */
-
   "wireplumber": {
     "on-click": "pwvucontrol",
     "on-click-right": "easyeffects",
     "on-click-middle": "pamixer -t && swayosd-client --output-volume mute-toggle",
-    "on-scroll-down": "pamixer -d 1 && swayosd-client --output-volume -1",
+    "on-scroll-down": "pamixer -d 2 && swayosd-client --output-volume -2",
-    "on-scroll-up": "pamixer -i 1 && swayosd-client --output-volume +1",
+    "on-scroll-up": "pamixer -i 2 && swayosd-client --output-volume +2",
     "format": "{icon} {volume}%",
     "format-muted": "MUTE",
     "format-source": "",
@@ -148,22 +158,14 @@
       "default": ["", "", ""]
     },
   },
-/*
+
   "clock": {
     "interval": 60,
     "align": 0,
     "rotate": 0,
     "tooltip-format": "<tt><big>{calendar}</big></tt>",
-    "format": " {:%d.%m.%Y}",
+    "format": " {:%H:%M}",
-    "format-alt": " {:%b%d %a,%G}",
+    "format-alt": " {:%a %b %d, %G}",
-  },
-*/
-  "clock": {
-    "interval": 60,
-    "align": 0,
-    "rotate": 0,
-    "format": " {:%a %d %H:%M}",
-    "tooltip-format": "<tt><big>{:%A, %d %B %Y}</big></tt>",
   },
 
   "custom/swaync": {
@@ -182,3 +184,4 @@
     "escape": true,
   },
 }
+

waybar/scripts/Screenshot-Area.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+grim -g "$(slurp)" - | swappy -f -

waybar/scripts/Screenshot-Fullscreen.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+grim - | wl-copy -t image/png;notify-send "Screenshot copied to clipboard"

waybar/scripts/Screenshot-Hyprland-Window.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+grim -g "$(hyprctl clients -j | jq '.[] | select(.hidden | not) | "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"' -r | slurp)" - | swappy -f -

waybar/scripts/Screenshot-OCR.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+## only support EN
+grim -g "$(slurp)" - | tesseract -l "eng" stdin stdout | wl-copy;notify-send "OCR content copied to clipboard"

waybar/scripts/Screenshot-sway-Window.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+grim -g "$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"' | slurp)" - | swappy -f -

wofi/config

@@ -0,0 +1,6 @@
+allow_images=true
+hide_scroll=true
+no_actions=false
+term=alacritty
+mode=drun
+--show

wofi/style.css

@@ -0,0 +1,46 @@
+* {
+    font-family: "Hack", monospace;
+}
+
+window {
+    background-color: #3B4252;
+}
+
+#input {
+    margin: 5px;
+    border-radius: 0px;
+    border: none;
+    background-color: #3B4252;
+    color: white;
+}
+
+#inner-box {
+    background-color: #383C4A;
+}
+
+#outer-box {
+    margin: 2px;
+    padding: 10px;
+    background-color: #383C4A;
+}
+
+#scroll {
+    margin: 5px;
+}
+
+#text {
+    padding: 4px;
+    color: white;
+}
+
+#entry:nth-child(even){
+    background-color: #404552;
+}
+
+#entry:selected {
+    background-color: #4C566A;
+}
+
+#text:selected {
+    background: transparent;
+}

zellij/config.kdl

@@ -283,7 +283,7 @@ load_plugins {
 // Choose the theme that is specified in the themes section.
 // Default: default
 // 
-theme "dracula"
+// theme "dracula"
  
 // Choose the base input mode of zellij.
 // Default: normal

zsh/.zshrc

@@ -1,77 +0,0 @@
-# ========================
-#  Locale & Editor
-# ========================
-export EDITOR=nano
-
-export PATH="$HOME/.atuin/bin:$PATH"
-
-# ========================
-#  History
-# ========================
-HISTFILE="${XDG_STATE_HOME:-$HOME/.local/state}/zsh/history"
-mkdir -p "$(dirname "$HISTFILE")"
-HISTSIZE=10000
-SAVEHIST=10000
-setopt HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY INC_APPEND_HISTORY
-
-# ========================
-#  Tools Integration
-# ========================
-if [[ -o interactive ]]; then
-  # AtuIn
-  if command -v atuin >/dev/null 2>&1; then
-    eval "$(atuin init zsh)"
-  fi
-
-  # zoxide
-  if command -v zoxide >/dev/null 2>&1; then
-    eval "$(zoxide init zsh)"
-  fi
-
-  # starship
-  if command -v starship >/dev/null 2>&1; then
-    eval "$(starship init zsh)"
-  fi
-fi
-
-# ========================
-#  Colors & Aliases
-# ========================
-autoload -U colors && colors
-
-alias ls='eza --icons=auto --group-directories-first'
-alias ll='eza -lh --icons=auto --group-directories-first'
-alias la='eza -lha --icons=auto --group-directories-first'
-
-alias grep='grep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias egrep='egrep --color=auto'
-alias ..='cd ..'
-alias ...='cd ../..'
-
-# ========================
-#  Completion
-# ========================
-autoload -Uz compinit
-mkdir -p ~/.cache/zsh
-compinit -d ~/.cache/zsh/zcompdump
-setopt CORRECT
-
-if [[ -o interactive ]]; then
-  source ~/.config/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-  source ~/.config/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-  source ~/.config/zsh/plugins/fzf-tab/fzf-tab.plugin.zsh
-
-  ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-  ZSH_AUTOSUGGEST_STRATEGY=(history completion)
-
-  bindkey -e
-fi
-
-# ========================
-#  Prompt
-# ========================
-if ! command -v starship >/dev/null 2>&1; then
-  PROMPT='%F{green}%n@%m%f:%F{blue}%~%f %# '
-  RPROMPT='%F{yellow}[%D{%H:%M}]%f'
-fi