From b0ee2a61efa758a18c892db051f00f8780e395f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=20G=C3=B3mez?= Date: Fri, 15 Sep 2023 16:15:22 +0200 Subject: [PATCH] feat: replace exa per eza --- modules/dotly | 2 +- scripts/npm/rm_node_modules | 14 ++++++++++++++ scripts/system/clean | 17 ----------------- scripts/utils/open_common | 1 + shell/aliases.sh | 10 +++++----- shell/bash/.bashrc | 6 ------ shell/exports.sh | 4 ++-- shell/init.sh | 1 + shell/zsh/.zshrc | 8 ++++++++ 9 files changed, 32 insertions(+), 31 deletions(-) create mode 100755 scripts/npm/rm_node_modules delete mode 100755 scripts/system/clean diff --git a/modules/dotly b/modules/dotly index 7047a802..072b59ba 160000 --- a/modules/dotly +++ b/modules/dotly @@ -1 +1 @@ -Subproject commit 7047a802bce0c625082c19fb1cfe9f8f208d09a3 +Subproject commit 072b59ba27bea2b96bb1bbebdbf8553964d7e589 diff --git a/scripts/npm/rm_node_modules b/scripts/npm/rm_node_modules new file mode 100755 index 00000000..f9cfb235 --- /dev/null +++ b/scripts/npm/rm_node_modules @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -euo pipefail + +source "$DOTLY_PATH/scripts/core/_main.sh" + +##? Remove all node modules recursively +#?? 1.0.0 +##? +##? Usage: +##? rm_node_modules +docs::parse "$@" + +find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + diff --git a/scripts/system/clean b/scripts/system/clean deleted file mode 100755 index 6580950f..00000000 --- a/scripts/system/clean +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -source "$DOTLY_PATH/scripts/core/_main.sh" - -##? Clean junk files -#?? 1.0.0 -##? -##? Usage: -##? clean -docs::parse "$@" - -sudo find /usr/local/Cellar/python* -name "IDLE*.app" -exec rm -rf "{}" \; -echo '[x] Python junk cleaned' - -echo 'Done!' diff --git a/scripts/utils/open_common b/scripts/utils/open_common index b8143708..9c7c7059 100755 --- a/scripts/utils/open_common +++ b/scripts/utils/open_common @@ -22,6 +22,7 @@ folders=( ["📁 screenshots"]="$HOME/Desktop/tmp/screenshots" ["📁 screencasts"]="$HOME/Desktop/tmp/screencasts" ["📁 Thumbnails"]="$GOOGLE_DRIVE_PATH/Shared drives/👑 Contents/🔖 Pro/Design/Thumbnails Cursos" + ["📁 Twitch"]="$GOOGLE_DRIVE_PATH/Shared drives/👑 Contents/🔴 Recordings/👾 Twitch" ) folder=$(printf "%s\n" "${!folders[@]}" | choose) diff --git a/shell/aliases.sh b/shell/aliases.sh index 4a3a1467..f978707c 100644 --- a/shell/aliases.sh +++ b/shell/aliases.sh @@ -3,20 +3,20 @@ alias sudo='sudo ' alias ..="cd .." alias ...="cd ../.." -alias ll="exa -l --icons" -alias la="exa -la --icons" +alias ll="eza -l --icons" +alias la="eza -la --icons" # Jumps alias ~="cd ~" alias tmp="cd ~/Desktop/tmp" -alias c='cd ~/Code' -alias codely="cd ~/Code/codely" +alias cdc='cd ~/Code' +alias cly="cd ~/Code/codely" # Git alias gaa="git add -A" alias gc="dot git commit" alias gca="git add --all && git commit --amend --no-edit" -alias gco="git checkout" +alias gsw="git switch" alias gd="dot git pretty-diff" alias gs="git status -sb" alias gf="git fetch --all -p" diff --git a/shell/bash/.bashrc b/shell/bash/.bashrc index 5342dec2..29efa0ae 100644 --- a/shell/bash/.bashrc +++ b/shell/bash/.bashrc @@ -36,9 +36,3 @@ done for bash_file in "$DOTLY_PATH"/shell/bash/completions/*; do source "$bash_file" done - -if [ -n "$(ls -A "$DOTFILES_PATH/shell/bash/completions/")" ]; then - for bash_file in "$DOTFILES_PATH"/shell/bash/completions/*; do - source "$bash_file" - done -fi diff --git a/shell/exports.sh b/shell/exports.sh index 6ec92cc3..58e00d34 100644 --- a/shell/exports.sh +++ b/shell/exports.sh @@ -3,8 +3,8 @@ # ------------------------------------------------------------------------------ export CODELY_THEME_MODE="dark" export CODELY_THEME_PWD_MODE="short" # full, short, home_relative -export CODELY_THEME_STATUS_ICON_OK="" #  -export CODELY_THEME_STATUS_ICON_KO="" +export CODELY_THEME_STATUS_ICON_OK="ﬦ" #  ﭧ ﯓ +export CODELY_THEME_STATUS_ICON_KO="ﮊ" export CODELY_THEME_PROMPT_IN_NEW_LINE=false if [[ $__CFBundleIdentifier == "com.jetbrains."* ]]; then diff --git a/shell/init.sh b/shell/init.sh index 37acc5e4..a5c02a03 100644 --- a/shell/init.sh +++ b/shell/init.sh @@ -1,4 +1,5 @@ # This is a useful file to have the same aliases/functions in bash and zsh source "$DOTFILES_PATH/shell/aliases.sh" +source "$DOTFILES_PATH/modules/private/shell/exports.sh" source "$DOTFILES_PATH/shell/exports.sh" source "$DOTFILES_PATH/shell/functions.sh" diff --git a/shell/zsh/.zshrc b/shell/zsh/.zshrc index 076ff593..64034016 100644 --- a/shell/zsh/.zshrc +++ b/shell/zsh/.zshrc @@ -2,8 +2,16 @@ # zmodload zsh/zprof # ZSH Ops +## History setopt HIST_IGNORE_ALL_DUPS +setopt HIST_SAVE_NO_DUPS +setopt HIST_REDUCE_BLANKS +setopt INC_APPEND_HISTORY_TIME +setopt EXTENDED_HISTORY setopt HIST_FCNTL_LOCK +setopt HIST_NO_STORE + +## Autocd setopt +o nomatch # setopt autopushd