fmt + brewfile update

.editorconfig

@@ -7,3 +7,7 @@ indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[.git{ignore,modules}]
+indent_style = tab
+indent_size = 1

.gitmodules

@@ -1,3 +1,4 @@
+# vim: set expandtab:
 [submodule "dotbot"]
 	path = dotbot
 	url = https://github.com/anishathalye/dotbot.git
@@ -26,3 +27,9 @@
 	update = rebase
 	branch = main
 	ignore = dirty
+
+[submodule "cheat-community"]
+	path = config/cheat/cheatsheets/community
+	url = https://github.com/cheat/cheatsheets.git
+	ignore = dirty
+

.yamlignore

@@ -0,0 +1,2 @@
+# .yamlignore
+

Brewfile

@@ -69,10 +69,14 @@ brew "eg-examples"
 brew "faas-cli"
 # Simple, fast and user-friendly alternative to find
 brew "fd"
+# Banner-like program prints strings as ASCII art
+brew "figlet"
 # Libraries to talk to Microsoft SQL Server and Sybase databases
 brew "freetds"
 # Monitor a directory for changes and run a shell command
 brew "fswatch"
+# Command-line fuzzy finder written in Go
+brew "fzf"
 # Disk usage analyzer with console interface written in Go
 brew "gdu", link: false
 # GitHub command-line tool
@@ -129,6 +133,8 @@ brew "lazydocker"
 brew "libpq"
 # Linguistic software and Finnish dictionary
 brew "libvoikko"
+# Rainbows and unicorns in your console!
+brew "lolcat"
 # Package manager for the Lua programming language
 brew "luarocks"
 # Swiss Army Knife for macOS
@@ -155,6 +161,8 @@ brew "pandoc"
 brew "perl"
 # General-purpose scripting language
 brew "php@8.1"
+# Simple Python style checker in one Python file
+brew "pycodestyle"
 # Python version management
 brew "pyenv"
 # Migrate pip packages from one Python version to another
@@ -213,6 +221,8 @@ brew "watch"
 brew "wget"
 # Personal information dashboard for your terminal
 brew "wtfutil"
+# Check your $HOME for unwanted files and directories
+brew "xdg-ninja"
 # JavaScript package manager
 brew "yarn"
 # A vulnerability scanner for container images and filesystems
@@ -291,6 +301,8 @@ cask "quicklook-json"
 cask "quicklookase"
 # Automatically hides or quits apps after periods of inactivity
 cask "quitter"
+# Control your tools with a few keystrokes
+cask "raycast"
 # Move and resize windows using keyboard shortcuts or snap areas
 cask "rectangle"
 # MySQL/MariaDB database management

add-submodules.sh

@@ -2,3 +2,4 @@
 
 git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git dotbot-brew
 git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git dotbot-include
+git submodule add --name cheat-community -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community

config/cheat/conf.yml

@@ -1,6 +1,6 @@
 ---
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
-editor: EDITOR_PATH
+editor: $EDITOR
 
 # Should 'cheat' always colorize output?
 colorize: true
@@ -12,12 +12,12 @@ style: monokai
 
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
-formatter: terminal16m
+formatter: terminal256
 
 # Through which pager should output be piped?
 # 'less -FRX' is recommended on Unix systems
 # 'more' is recommended on Windows
-pager: PAGER_PATH
+pager: less -FRX
 
 # Cheatpaths are paths at which cheatsheets are available on your local
 # filesystem.

config/exports-shell

@@ -49,4 +49,14 @@ if [ "$SHELL" = "$(which zsh)" ]; then
   export HISTFILE="$XDG_STATE_HOME/zsh/history"
   zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
   zstyle ':completion:*' list-colors "$LS_COLORS"
+
+  # fzf
+  [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
+    && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
+fi
+
+# If we are using bash
+if [ "$SHELL" = "$(which bash)" ]; then
+  [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ] \
+    && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
 fi

config/functions

@@ -6,7 +6,7 @@
 source "$DOTFILES/scripts/shared.sh"
 
 # Weather in Tampere, or other city
-function weather
+weather()
 {
   # https://github.com/chubin/wttr.in#usage
   local city="${1:-Tampere}"
@@ -14,25 +14,25 @@ function weather
 }
 
 # Docker
-function ssh-docker
+ssh-docker()
 {
   docker exec -it "$@" bash
 }
 
 # Create a new directory and enter it
-function mkd
+mkd()
 {
   mkdir -p "$@" && cd "$@" || exit
 }
 
 # All the dig info
-function digga
+digga()
 {
   dig +nocmd "$1" any +multiline +noall +answer
 }
 
 # Rector project to php version 8.0 by default.
-function rector
+rector()
 {
   local php="${1:-80}"
   docker run -v "$(pwd)":/project rector/rector:latest process \
@@ -42,7 +42,7 @@ function rector
 }
 
 # Commit everything
-function commit
+commit()
 {
   commitMessage="$*"
 
@@ -54,7 +54,7 @@ function commit
   eval "git commit -a -m '${commitMessage}'"
 }
 
-function scheduler
+scheduler()
 {
   while :; do
     php artisan schedule:run
@@ -63,13 +63,26 @@ function scheduler
   done
 }
 
-function silent
+silent()
 {
   "$@" >&/dev/null
 }
 
+ask()
+{
+  while true; do
+    read -p "$1 ([y]/n) " -r
+    REPLY=${REPLY:-"y"}
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+      return 1
+    elif [[ $REPLY =~ ^[Nn]$ ]]; then
+      return 0
+    fi
+  done
+}
+
 # Defines default antigen bundles
-function x-default-antigen-bundles
+x-default-antigen-bundles()
 {
   # these should be always available
   antigen bundle colored-man-pages
@@ -83,7 +96,6 @@ function x-default-antigen-bundles
   antigen bundle zsh-users/zsh-syntax-highlighting
 
   # these should be available if there's need
-  have git && antigen bundle git
   have brew && antigen bundle brew
   have docker && antigen bundle docker
   have docker-compose && antigen bundle sroze/docker-compose-zsh-plugin

config/fzf/fzf.bash

@@ -0,0 +1,13 @@
+# Setup fzf
+# ---------
+if [[ ! "$PATH" == */opt/homebrew/opt/fzf/bin* ]]; then
+  PATH="${PATH:+${PATH}:}/opt/homebrew/opt/fzf/bin"
+fi
+
+# Auto-completion
+# ---------------
+[[ $- == *i* ]] && source "/opt/homebrew/opt/fzf/shell/completion.bash" 2> /dev/null
+
+# Key bindings
+# ------------
+source "/opt/homebrew/opt/fzf/shell/key-bindings.bash"

config/fzf/fzf.zsh

@@ -0,0 +1,13 @@
+# Setup fzf
+# ---------
+if [[ ! "$PATH" == */opt/homebrew/opt/fzf/bin* ]]; then
+  PATH="${PATH:+${PATH}:}/opt/homebrew/opt/fzf/bin"
+fi
+
+# Auto-completion
+# ---------------
+[[ $- == *i* ]] && source "/opt/homebrew/opt/fzf/shell/completion.zsh" 2> /dev/null
+
+# Key bindings
+# ------------
+source "/opt/homebrew/opt/fzf/shell/key-bindings.zsh"

local/bin/dfm

@@ -94,8 +94,8 @@ function section_install
     nvm)
       curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
         && nvm install --lts --latest-npm --default
-        git checkout "$DOTFILES/base/zshrc"
-        msg_yay "nvm installed!"
+      git checkout "$DOTFILES/base/zshrc"
+      msg_yay "nvm installed!"
       ;;
     npm)
       bash "$DOTFILES/scripts/install-npm-packages.sh" \