July 16 2022 (#94)

README.md

@@ -1,7 +1,4 @@
 <h3 align="center">
-  <span><img width="18" src="https://image.flaticon.com/icons/svg/226/226769.svg" alt="OSX - Icon made by Freepik from Flaticon" /></span>
-  <span><img width="18" src="https://image.flaticon.com/icons/svg/226/226772.svg" alt="Linux - Icon made by Freepik from Flaticon" /></span>
-  <span><img width="18" src="https://image.flaticon.com/icons/svg/174/174836.svg" alt="Android - Icon made by Freepik from Flaticon" /></span>
   denisidoro/dotfiles
   <a alt="CI status" href="https://github.com/denisidoro/dotfiles/actions"><img src="https://github.com/denisidoro/dotfiles/workflows/Tests/badge.svg" /></a>
   <a alt="GitHub release" href="https://github.com/denisidoro/dotfiles/releases"><img src="https://img.shields.io/github/v/release/denisidoro/dotfiles?include_prereleases" /></a>
@@ -13,7 +10,7 @@
   <sub>Awesome personal dotfiles</sub>
 </p>
 <p align="center">
-  <a href="#-installation">Installation</a>&nbsp;&nbsp;&nbsp;
+  <a href="#full-installation">Installation</a>&nbsp;&nbsp;&nbsp;
   <a href="shell">Shell</a>&nbsp;&nbsp;&nbsp;
   <a href="scripts">Scripts</a>&nbsp;&nbsp;&nbsp;
   <a href="git/config">Git</a>&nbsp;&nbsp;&nbsp;
@@ -43,7 +40,7 @@ git clone https://github.com/denisidoro/dotfiles "$DOTFILES"
 
 ```bash
 dot::clone() {
-  DOT_VERSION=master bash <(curl -s https://raw.githubusercontent.com/denisidoro/dotfiles/master/scripts/self/install) 
+  bash <(curl -s https://raw.githubusercontent.com/denisidoro/dotfiles/master/scripts/self/install) 
 }
 
 dot::clone_if_necessary() {
@@ -83,17 +80,6 @@ Benchmark #1: /usr/bin/time /bin/zsh -i -c exit
   Range (min … max):    32.7 ms …  48.8 ms    67 runs
 ```
 
-## Overriding configs
-
-Edit the following files accordingly:
-```bash
-# shell
-vi "${DOTFILES}/local/zshrc"
-
-# git
-vi "${DOTFILES}/local/gitconfig"
-```
-
 ## Template
 
 In order to setup your own dotfiles, I recommend using [dotly](https://github.com/CodelyTV/dotly) or [Sloth](https://github.com/gtrabanco/.Sloth), which are frameworks inpired by this repository.

bin/dot

@@ -54,8 +54,9 @@ _alias() {
       bash|sh|shell|terminal|scripting) echo script ;;
       fs) echo filesystem ;;
       and) echo android ;;
+      cloud) echo storm ;;
       clj) echo clojure ;;
-      game) echo gaming ;;
+      gaming) echo game ;;
       environment|env) echo self ;;
       net) echo network ;;
       pkg) echo package ;;
@@ -98,7 +99,7 @@ elif [[ $# -eq 1 ]]; then
 
    echo 'Commands:'
    for cmd in $(find "${DOTFILES}/scripts/${context_query}/" -mindepth 1 -maxdepth 1 -executable -type f | awk -F"/" '{print $NF}'); do
-      printf "   %-24s %s" "$cmd" "$("${DOTFILES}/scripts/${context_query}/${cmd}" --help | head -n1)"
+      printf "   \033[34m%-24s\033[39m \033[37m%s\033[39m" "$cmd" "$("${DOTFILES}/scripts/${context_query}/${cmd}" --help | head -n1)"
       echo
    done
 else

bin/e

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+dot_bin_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+
+editors="/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code,code,vscode,sublime,nvim,vim,vi,nano"
+"${dot_bin_dir}/dot" terminal dashed "$editors" -- "$@"

bin/git-dot

@@ -2,4 +2,5 @@
 set -euo pipefail
 
 dot_bin_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+
 "${dot_bin_dir}/dot" git "$@"

bin/v

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+dot_bin_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+
+editors="nvim,vim,vi,nano"
+"${dot_bin_dir}/dot" terminal dashed "$editors" -- "$@"

config.yaml

@@ -0,0 +1,7 @@
+pkg:
+  sudo:
+    apk: true
+
+game:
+  cemu:
+    dir: /mnt/d/Emulators/Cemu

editors/spacevim/spacevim.rc

@@ -1,3 +1,5 @@
+let g:go_version_warning = 0
+
 let g:spacevim_plug_home = '~/.vim/plugged'
 
 " let g:spacevim_leader = "<\Space>"
@@ -22,7 +24,7 @@ function! UserInit()
   Plug 'junegunn/seoul256.vim'
   Plug 'airblade/vim-rooter'
   Plug 'danilo-augusto/vim-afterglow'
-  Plug 'liuchengxu/space-vim-dark'
+  " Plug 'liuchengxu/space-vim-dark'
   Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 
 endfunction
@@ -39,7 +41,7 @@ function! UserConfig()
   if has('termguicolors')
 
     " colorscheme afterglow
-    colorscheme space-vim-dark
+    " colorscheme space-vim-dark
     hi Comment cterm=italic
     hi Normal     ctermbg=NONE guibg=NONE
     hi LineNr     ctermbg=NONE guibg=NONE

editors/vscode/settings.json

@@ -44,7 +44,7 @@
    "terminal.integrated.rendererType": "dom",
    // ==================
    // Explorer
-   // ================== 
+   // ==================
    "explorer.confirmDragAndDrop": false,
    "explorer.confirmDelete": false,
    "files.exclude": {
@@ -93,11 +93,11 @@
    // },
    // ==================
    // Rust
-   // ================== 
+   // ==================
    "rust-analyzer.checkOnSave.command": "clippy",
    // ==================
    // Javascript
-   // ================== 
+   // ==================
    "javascript.validate.enable": false,
    "javascript.updateImportsOnFileMove.enabled": "always",
    // ==================
@@ -230,4 +230,4 @@
    "typescript.inlayHints.propertyDeclarationTypes.enabled": true,
    "typescript.inlayHints.variableTypes.enabled": true,
    "workbench.editor.enablePreviewFromCodeNavigation": true
-}
+}

git/config

@@ -86,7 +86,7 @@
   autoStash = true
 
 [include]
-  path = ~/dotfiles/local/gitconfig
+  path = ~/dotfiles/local/mac/gitconfig
 
 [pull]
   rebase = true

navi/cheats/android.cheat

@@ -32,4 +32,4 @@ $ ssh_config: echo "${PREFIX}/etc/ssh/sshd_config"
 % android, apps
 
 # Open Google Play Store profile page for an app
-dot browser google-lucky "<query> site:play.google.com"
+dot terminal open "https://duckduckgo.com/?q=%21+$(dot script eval --load str str::urlencode "<query> site:play.google.com")&ia=web"

navi/cheats/editor.cheat

@@ -4,6 +4,6 @@
 echo "<vscode_action>"
 
 # Edit dotfiles in VSCode
-dot terminal dashed dot code vscode -- "${DOTFILES}" &disown
+e "${DOTFILES}" &disown
 
 $ vscode_action: curl -sL "https://raw.githubusercontent.com/aburok/mysettings/master/VisualStudio/vscommands.txt"

navi/cheats/filesystem.cheat

@@ -7,7 +7,7 @@ find -L . -name . -o -type d -prune -o -type l -exec rm {} +
 du -sh
 
 # Edit fre entries
-dot code vscode "${HOME}/Library/Application Support/fre/fre.json"
+e "${HOME}/Library/Application Support/fre/fre.json"
 
 # Resize pngs to 128x128
 \ls ./*[^(_128)].png | sed 's/.png//' | xargs -I% convert "%.png" -resize 128x128 "%_128.png"

navi/cheats/tmp.cheat

@@ -1,3 +1,13 @@
+% examples
+# Display contents of a file
+cat <file>
+
+# Echo text
+echo <some_text>
+
+$file: ls
+
+
 % tmp
 
 # Echo multiline
@@ -61,6 +71,13 @@ $ log: echo "foo bar"
 $ words: echo "$log" | wc -w | xargs
 
 
+% empty
+
+# empty test
+tar -xf <file>
+
+$ file: ls *.tar
+
 % default
 
 # default test

raycast/navi.sh

@@ -6,7 +6,7 @@
 # @raycast.mode silent
 
 # Optional parameters:
-# @raycast.icon /Users/denis.isidoro/Pictures/Icons/navi_128.png
+# @raycast.icon /Users/denis.isidoro/Pictures/Icons/navi_64sq.png
 # @raycast.packageName Browser
 
 # Documentation:

repos/dotlink/set.sh

@@ -9,13 +9,14 @@ dot_set() {
    local dotset_backup=false
    local dotset_verbose=false
 
+   # TODO: understand why doset_backup=true is necessary here
    for arg in "$@"; do
       shift
       case "$arg" in
          "--ignore" ) set -- "$@" "-i" ;;
          "--force"  ) set -- "$@" "-f" ;;
          "--create-dirs"|"p" ) dotset_create_dirs=true ;;
-         "--backup" ) set -- "$@" "-b" ;;
+         "--backup" ) dotset_backup=true; set -- "$@" "-b" ;;
          "--verbose") set -- "$@" "-v" ;;
          *) set -- "$@" "$arg" ;;
       esac
@@ -32,6 +33,12 @@ dot_set() {
       esac
    done
 
+   # echo "args: $*" >&2
+   # echo "dotset_ignore: ${dotset_ignore:-}" >&2
+   # echo "dotset_force: ${dotset_force:-}" >&2
+   # echo "dotset_backup: ${dotset_backup:-}" >&2
+   # echo "dotset_verbose: ${dotset_verbose:-}" >&2
+
    check_dir() { #{{{
       local orig="$1"
 
@@ -160,6 +167,16 @@ dot_set() {
       dotfile="$1"
       orig="$2"
 
+      if [ -n "${DOTLINK_IGNORE_LIST:-}" ]; then
+         IFS=',' read -r -a ignores <<< "$DOTLINK_IGNORE_LIST"
+         for ignore in "${ignores[@]}"; do
+            if [[ "$dotfile" = *"$ignore"* ]]; then
+               echo "IGNORING ${dotfile} because it matches ${ignore}!"
+               return 0
+            fi
+         done
+      fi
+
       # if dotfile doesn't exist, print error message and pass
       if [ ! -e "${dotfile}" ]; then
          echo "$(prmpt 1 "not found")${dotfile}"