feat(config): migrated alacritty config to toml

config/alacritty/alacritty.toml

@@ -0,0 +1,345 @@
+[colors]
+draw_bold_text_with_bright_colors = true
+
+[colors.bright]
+black = "0x414868"
+blue = "0x7aa2f7"
+cyan = "0x7dcfff"
+green = "0x9ece6a"
+magenta = "0xbb9af7"
+red = "0xf7768e"
+white = "0xc0caf5"
+yellow = "0xe0af68"
+
+[colors.normal]
+black = "0x1d202f"
+blue = "0x7aa2f7"
+cyan = "0x7dcfff"
+green = "0x9ece6a"
+magenta = "0xbb9af7"
+red = "0xf7768e"
+white = "0xa9b1d6"
+yellow = "0xe0af68"
+
+[colors.primary]
+background = "0x24283b"
+foreground = "0xc0caf5"
+
+[env]
+TERM = "xterm-256color"
+
+[font]
+size = 14.0
+
+[font.bold]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "Bold"
+
+[font.glyph_offset]
+x = 0
+y = 0
+
+[font.italic]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "Italic"
+
+[font.normal]
+family = "JetBrainsMonoNL Nerd Font Mono"
+style = "ExtraLight"
+
+[font.offset]
+x = 0
+y = 0
+
+[[keyboard.bindings]]
+action = "Paste"
+key = "V"
+mods = "Command"
+
+[[keyboard.bindings]]
+action = "Copy"
+key = "C"
+mods = "Command"
+
+[[keyboard.bindings]]
+action = "Quit"
+key = "Q"
+mods = "Command"
+
+[[keyboard.bindings]]
+action = "Quit"
+key = "W"
+mods = "Command"
+
+[[keyboard.bindings]]
+action = "SpawnNewInstance"
+key = "N"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u001BOH"
+key = "Home"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[1~"
+key = "Home"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOF"
+key = "End"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[4~"
+key = "End"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[5;2~"
+key = "PageUp"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[5;5~"
+key = "PageUp"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[5~"
+key = "PageUp"
+
+[[keyboard.bindings]]
+chars = "\u001B[6;2~"
+key = "PageDown"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[6;5~"
+key = "PageDown"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[6~"
+key = "PageDown"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;2D"
+key = "Left"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;5D"
+key = "Left"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;3D"
+key = "Left"
+mods = "Alt"
+
+[[keyboard.bindings]]
+chars = "\u001B[D"
+key = "Left"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOD"
+key = "Left"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;2C"
+key = "Right"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;5C"
+key = "Right"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;3C"
+key = "Right"
+mods = "Alt"
+
+[[keyboard.bindings]]
+chars = "\u001B[C"
+key = "Right"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOC"
+key = "Right"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;2A"
+key = "Up"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;5A"
+key = "Up"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;3A"
+key = "Up"
+mods = "Alt"
+
+[[keyboard.bindings]]
+chars = "\u001B[A"
+key = "Up"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOA"
+key = "Up"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;2B"
+key = "Down"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;5B"
+key = "Down"
+mods = "Control"
+
+[[keyboard.bindings]]
+chars = "\u001B[1;3B"
+key = "Down"
+mods = "Alt"
+
+[[keyboard.bindings]]
+chars = "\u001B[B"
+key = "Down"
+mode = "~AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001BOB"
+key = "Down"
+mode = "AppCursor"
+
+[[keyboard.bindings]]
+chars = "\u001B[Z"
+key = "Tab"
+mods = "Shift"
+
+[[keyboard.bindings]]
+chars = "\u001BOP"
+key = "F1"
+
+[[keyboard.bindings]]
+chars = "\u001BOQ"
+key = "F2"
+
+[[keyboard.bindings]]
+chars = "\u001BOR"
+key = "F3"
+
+[[keyboard.bindings]]
+chars = "\u001BOS"
+key = "F4"
+
+[[keyboard.bindings]]
+chars = "\u001B[15~"
+key = "F5"
+
+[[keyboard.bindings]]
+chars = "\u001B[17~"
+key = "F6"
+
+[[keyboard.bindings]]
+chars = "\u001B[18~"
+key = "F7"
+
+[[keyboard.bindings]]
+chars = "\u001B[19~"
+key = "F8"
+
+[[keyboard.bindings]]
+chars = "\u001B[20~"
+key = "F9"
+
+[[keyboard.bindings]]
+chars = "\u001B[21~"
+key = "F10"
+
+[[keyboard.bindings]]
+chars = "\u001B[23~"
+key = "F11"
+
+[[keyboard.bindings]]
+chars = "\u001B[24~"
+key = "F12"
+
+[[keyboard.bindings]]
+key = "Back"
+action = "ReceiveChar"
+
+[[keyboard.bindings]]
+chars = "\u001B[2~"
+key = "Insert"
+
+[[keyboard.bindings]]
+chars = "\u001B[3~"
+key = "Delete"
+
+[[keyboard.bindings]]
+chars = "\u0002&"
+key = "W"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u0002c"
+key = "T"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u0002n"
+key = "RBracket"
+mods = "Command|Shift"
+
+[[keyboard.bindings]]
+chars = "\u0002p"
+key = "LBracket"
+mods = "Command|Shift"
+
+[[keyboard.bindings]]
+chars = "\u0002o"
+key = "RBracket"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u0002;"
+key = "LBracket"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u0002/"
+key = "F"
+mods = "Command"
+
+[[mouse.bindings]]
+action = "PasteSelection"
+mouse = "Middle"
+
+[selection]
+semantic_escape_chars = ",│`|:\"' ()[]{}<>"
+
+[window]
+decorations = "none"
+dynamic_title = true
+opacity = 0.98
+
+[window.dimensions]
+columns = 200
+lines = 100
+
+[window.padding]
+x = 5
+y = 5

config/alacritty/alacritty.yml

@@ -1,206 +0,0 @@
----
-# Configuration for Alacritty, the GPU enhanced terminal emulator
-
-# Any items in the `env` entry below will be added as
-# environment variables. Some entries may override variables
-# set by alacritty it self.
-env:
-  # TERM env customization.
-  #
-  # If this property is not set, alacritty will set it to xterm-256color.
-  #
-  # Note that some xterm terminfo databases don't declare support for italics.
-  # You can verify this by checking for the presence of `smso` and `sitm` in
-  # `infocmp xterm-256color`.
-  TERM: xterm-256color
-
-# Window dimensions in character columns and lines
-# (changes require restart)
-window:
-  dynamic_title: true
-  dimensions:
-    columns: 200
-    lines: 100
-
-  # Adds this many blank pixels of padding around the window
-  # Units are physical pixels; this is not DPI aware.
-  # (change requires restart)
-  padding:
-    x: 5
-    y: 5
-
-  decorations: buttonless
-
-  opacity: 0.98
-
-# When true, bold text is drawn using the bright variant of colors.
-draw_bold_text_with_bright_colors: true
-
-# Font configuration (changes require restart)
-font:
-  # The normal (roman) font face to use.
-  normal:
-    family: JetBrainsMonoNL Nerd Font Mono
-    # Style can be specified to pick a specific face.
-    style: ExtraLight
-
-    # The bold font face
-  bold:
-    family: JetBrainsMonoNL Nerd Font Mono
-    # Style can be specified to pick a specific face.
-    style: Bold
-
-  # The italic font face
-  italic:
-    family: JetBrainsMonoNL Nerd Font Mono
-    # Style can be specified to pick a specific face.
-    style: Italic
-
-  # Point size of the font
-  size: 14.0
-
-  # Offset is the extra space around each character. offset.y can be thought of
-  # as modifying the linespacing, and offset.x as modifying the letter spacing.
-  offset:
-    x: 0
-    y: 0
-
-  # Glyph offset determines the locations of the glyphs within their cells with
-  # the default being at the bottom. Increase the x offset to move the glyph to
-  # the right, increase the y offset to move the glyph upward.
-  glyph_offset:
-    x: 0
-    y: 0
-
-# Should display the render timer
-debug.render_timer: false
-
-# TokyoNight Alacritty Colors (storm)
-colors:
-  # Default colors
-  primary:
-    background: '0x24283b'
-    foreground: '0xc0caf5'
-
-  # Normal colors
-  normal:
-    black: '0x1d202f'
-    red: '0xf7768e'
-    green: '0x9ece6a'
-    yellow: '0xe0af68'
-    blue: '0x7aa2f7'
-    magenta: '0xbb9af7'
-    cyan: '0x7dcfff'
-    white: '0xa9b1d6'
-
-  # Bright colors
-  bright:
-    black: '0x414868'
-    red: '0xf7768e'
-    green: '0x9ece6a'
-    yellow: '0xe0af68'
-    blue: '0x7aa2f7'
-    magenta: '0xbb9af7'
-    cyan: '0x7dcfff'
-    white: '0xc0caf5'
-
-  # indexed_colors:
-  # - { index: 16, color: '0xff9e64' }
-  # - { index: 17, color: '0xdb4b4b' }
-
-key_bindings:
-  - { key: V, mods: Command, action: Paste }
-  - { key: C, mods: Command, action: Copy }
-  - { key: Q, mods: Command, action: Quit }
-  - { key: W, mods: Command, action: Quit }
-  - { key: N, mods: Command, action: SpawnNewInstance }
-  - { key: Home, chars: "\eOH", mode: AppCursor }
-  - { key: Home, chars: "\e[1~", mode: ~AppCursor }
-  - { key: End, chars: "\eOF", mode: AppCursor }
-  - { key: End, chars: "\e[4~", mode: ~AppCursor }
-  - { key: PageUp, mods: Shift, chars: "\e[5;2~" }
-  - { key: PageUp, mods: Control, chars: "\e[5;5~" }
-  - { key: PageUp, chars: "\e[5~" }
-  - { key: PageDown, mods: Shift, chars: "\e[6;2~" }
-  - { key: PageDown, mods: Control, chars: "\e[6;5~" }
-  - { key: PageDown, chars: "\e[6~" }
-  - { key: Left, mods: Shift, chars: "\e[1;2D" }
-  - { key: Left, mods: Control, chars: "\e[1;5D" }
-  - { key: Left, mods: Alt, chars: "\e[1;3D" }
-  - { key: Left, chars: "\e[D", mode: ~AppCursor }
-  - { key: Left, chars: "\eOD", mode: AppCursor }
-  - { key: Right, mods: Shift, chars: "\e[1;2C" }
-  - { key: Right, mods: Control, chars: "\e[1;5C" }
-  - { key: Right, mods: Alt, chars: "\e[1;3C" }
-  - { key: Right, chars: "\e[C", mode: ~AppCursor }
-  - { key: Right, chars: "\eOC", mode: AppCursor }
-  - { key: Up, mods: Shift, chars: "\e[1;2A" }
-  - { key: Up, mods: Control, chars: "\e[1;5A" }
-  - { key: Up, mods: Alt, chars: "\e[1;3A" }
-  - { key: Up, chars: "\e[A", mode: ~AppCursor }
-  - { key: Up, chars: "\eOA", mode: AppCursor }
-  - { key: Down, mods: Shift, chars: "\e[1;2B" }
-  - { key: Down, mods: Control, chars: "\e[1;5B" }
-  - { key: Down, mods: Alt, chars: "\e[1;3B" }
-  - { key: Down, chars: "\e[B", mode: ~AppCursor }
-  - { key: Down, chars: "\eOB", mode: AppCursor }
-  - { key: Tab, mods: Shift, chars: "\e[Z" }
-  - { key: F1, chars: "\eOP" }
-  - { key: F2, chars: "\eOQ" }
-  - { key: F3, chars: "\eOR" }
-  - { key: F4, chars: "\eOS" }
-  - { key: F5, chars: "\e[15~" }
-  - { key: F6, chars: "\e[17~" }
-  - { key: F7, chars: "\e[18~" }
-  - { key: F8, chars: "\e[19~" }
-  - { key: F9, chars: "\e[20~" }
-  - { key: F10, chars: "\e[21~" }
-  - { key: F11, chars: "\e[23~" }
-  - { key: F12, chars: "\e[24~" }
-  - { key: Back, chars: '' }
-  - { key: Back, mods: Alt, chars: "\e" }
-  - { key: Insert, chars: "\e[2~" }
-  - { key: Delete, chars: "\e[3~" }
-
-  # shortcuts for tmux. the leader key is control-b (0x02)
-  - { key: W, mods: Command, chars: "\x02&" } # close tab (kill)
-  - { key: T, mods: Command, chars: "\x02c" } # new tab
-  - { key: RBracket, mods: Command|Shift, chars: "\x02n" } # select next tab
-  - { key: LBracket, mods: Command|Shift, chars: "\x02p" } # select previous tab
-  - { key: RBracket, mods: Command, chars: "\x02o" } # select next pane
-  - { key: LBracket, mods: Command, chars: "\x02;" } # select last (previously used) pane
-  - { key: F, mods: Command, chars: "\x02/" } # search (upwards) (see tmux.conf)
-
-# Mouse bindings
-#
-# Currently doesn't support modifiers. Both the `mouse` and `action` fields must
-# be specified.
-#
-# Values for `mouse`:
-# - Middle
-# - Left
-# - Right
-# - Numeric identifier such as `5`
-#
-# Values for `action`:
-# - Paste
-# - PasteSelection
-# - Copy (TODO)
-mouse_bindings:
-  - { mouse: Middle, action: PasteSelection }
-
-mouse:
-  double_click: { threshold: 300 }
-  triple_click: { threshold: 300 }
-
-selection:
-  semantic_escape_chars: ',│`|:"'' ()[]{}<>'
-# Shell
-#
-# You can set shell.program to the path of your favorite shell, e.g. /bin/fish.
-# Entries in shell.args are passed unmodified as arguments to the shell.
-#
-#shell:
-#  program: /bin/bash
-#  args:
-#    - --login

config/gh/config.yml

@@ -1 +1,2 @@
 git_protocol: https
+version: '1'

config/gh/hosts.yml

@@ -1,3 +1,5 @@
 github.com:
-  user: ivuorinen
   git_protocol: https
+  users:
+    ivuorinen:
+  user: ivuorinen

config/user-dirs.dirs

@@ -0,0 +1,15 @@
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_TEMPLATES_DIR="$HOME/"
+XDG_PUBLICSHARE_DIR="$HOME/"
+XDG_DOCUMENTS_DIR="$HOME/"
+XDG_MUSIC_DIR="$HOME/"
+XDG_PICTURES_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME/"

config/user-dirs.locale

@@ -0,0 +1 @@
+en_US

local/bin/dfm

@@ -19,6 +19,9 @@ VERSION_NVM="v0.39.5"
 export DOTFILES="$HOME/.dotfiles"
 # shellcheck source=./../../scripts/shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
+source "$DOTFILES/config/exports"
+source "$DOTFILES/config/alias"
+source "$DOTFILES/config/functions"
 
 # Loads configs for better installation experience
 x-load-configs
@@ -152,6 +155,8 @@ function section_install
     nvm)
       msg "Installing nvm..."
       curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash
+      git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
       $0 install nvm-latest
       msg_yay "nvm installed!"
       ;;
@@ -161,7 +166,8 @@ function section_install
         [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
       fi
       nvm install --lts --latest-npm --default
-      git checkout "$DOTFILES/base/*"
+      git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
       msg_yay "latest lts node installed!"
       ;;
     npm)

scripts/install-cargo-packages.sh

@@ -24,6 +24,7 @@ source "$CARGO_HOME/env"
 rustup default system
 
 packages=(
+  "cargo-cache"
   # starship.rs
   "starship"
   # An incremental parsing system for programming tools
@@ -68,4 +69,5 @@ x-have bob && {
   bob use stable && x-path-append "$XDG_DATA_HOME/bob/nvim-bin"
 }
 
-msg_done "All next steps done!"
+msg_run "Removing cargo cache"
+cargo cache --autoclean

scripts/install-cheat-tldr.sh

@@ -24,10 +24,13 @@ else
   # Update the repo
   msg_run "Starting to update $TLDR_GIT"
   git -C "$TLDR_TEMP_DIR" reset --hard origin/main
-  git -C "$TLDR_TEMP_DIR" pull -q \
+  git -C "$TLDR_TEMP_DIR" pull -q --depth 2 \
     && msg_done "Updated $TLDR_GIT"
 fi
 
+msg_run "Removing non-english translation files"
+rm -rf "$TLDR_TEMP_DIR/pages.*"
+
 # Fetch the destination directory from cheat defined directories.
 TLDR_CHEAT_DEST="$(cheat -d | grep tldr | head -1 | awk '{print $2}')"
 

scripts/install-go-packages.sh

@@ -50,4 +50,8 @@ x-have git-profile && {
 }
 
 echo ""
+
+msg_run "Clearing go cache"
+go clean -cache -modcache
+
 msg_ok "Done"

scripts/install-npm-packages.sh

@@ -37,3 +37,8 @@ done
 msg_run "Upgrading all global packages"
 npm -g --no-progress --no-timing --no-fund outdated
 npm -g --no-timing --no-fund upgrade
+
+msg_run "Cleaning up npm cache"
+npm cache verify
+npm cache clean --force
+npm cache verify