From 959e7c418ed3417c6e71ea9d43076d4c387338f2 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 4 Feb 2026 07:57:30 +0200 Subject: [PATCH] chore: remove 15 unused config directories and stale references Drop config folders (aerospace, aqua, asdf, direnv, flipperdevices, ghostty, htop, misc, nano, task, tealdeer, tms, wtf, yamlfmt, yamllint) along with starship.toml, nbrc, and aerospace scripts/docs. Clean up references in dfm, _dfm completions, bashrc, exports, and exports-lakka to match. --- base/bashrc | 4 - base/envrc | 1 - config/aerospace/aerospace.toml | 251 ------------------------- config/aqua/aqua.yaml | 15 -- config/asdf/asdfrc | 5 - config/asdf/gem-packages | 1 - config/asdf/plugin-versions | 20 -- config/direnv/direnv.toml | 12 -- config/direnv/lib/use_asdf.sh | 6 - config/exports | 14 -- config/exports-lakka | 1 - config/flipperdevices.com/qFlipper.ini | 6 - config/ghostty/config | 15 -- config/htop/htoprc | 54 ------ config/misc/screenrc | 15 -- config/nano/nanorc | 1 - config/nbrc | 18 -- config/starship.toml | 154 --------------- config/task/taskrc | 81 -------- config/tealdeer/config.toml | 38 ---- config/tms/config.toml | 11 -- config/wtf/config.yml | 181 ------------------ config/yabai/yabairc | 1 - config/yamlfmt/.yamlfmt | 8 - config/yamllint/config | 31 --- config/zsh/antidote_plugins.txt | 1 - config/zsh/completion/_dfm | 19 -- docs/aerospace-keybindings.md | 66 ------- local/bin/dfm | 5 - scripts/create-aerospace-keymaps.md | 11 -- scripts/create-aerospace-keymaps.php | 67 ------- 31 files changed, 1113 deletions(-) delete mode 100644 base/envrc delete mode 100644 config/aerospace/aerospace.toml delete mode 100644 config/aqua/aqua.yaml delete mode 100644 config/asdf/asdfrc delete mode 100644 config/asdf/gem-packages delete mode 100644 config/asdf/plugin-versions delete mode 100644 config/direnv/direnv.toml delete mode 100644 config/direnv/lib/use_asdf.sh delete mode 100644 config/flipperdevices.com/qFlipper.ini delete mode 100644 config/ghostty/config delete mode 100644 config/htop/htoprc delete mode 100644 config/misc/screenrc delete mode 100644 config/nano/nanorc delete mode 100755 config/nbrc delete mode 100644 config/starship.toml delete mode 100644 config/task/taskrc delete mode 100644 config/tealdeer/config.toml delete mode 100644 config/tms/config.toml delete mode 100644 config/wtf/config.yml delete mode 100644 config/yamlfmt/.yamlfmt delete mode 100644 config/yamllint/config delete mode 100644 docs/aerospace-keybindings.md delete mode 100644 scripts/create-aerospace-keymaps.md delete mode 100755 scripts/create-aerospace-keymaps.php diff --git a/base/bashrc b/base/bashrc index 1541cf3..33dab13 100644 --- a/base/bashrc +++ b/base/bashrc @@ -7,10 +7,6 @@ export SHARED_SCRIPTS_SOURCED=0 source "$DOTFILES/config/shared.sh" -if [ -n "${GHOSTTY_RESOURCES_DIR}" ]; then - builtin source "${GHOSTTY_RESOURCES_DIR}/shell-integration/bash/ghostty.bash" -fi - # shellcheck source=../config/fzf/fzf.bash [ -f "${DOTFILES}/config/fzf/fzf.bash" ] && source "${DOTFILES}/config/fzf/fzf.bash" diff --git a/base/envrc b/base/envrc deleted file mode 100644 index 08ccdc9..0000000 --- a/base/envrc +++ /dev/null @@ -1 +0,0 @@ -use node diff --git a/config/aerospace/aerospace.toml b/config/aerospace/aerospace.toml deleted file mode 100644 index f700c25..0000000 --- a/config/aerospace/aerospace.toml +++ /dev/null @@ -1,251 +0,0 @@ -# Start AeroSpace at login -start-at-login = false - -# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization -enable-normalization-flatten-containers = true -enable-normalization-opposite-orientation-for-nested-containers = true - -# See: https://nikitabobko.github.io/AeroSpace/guide#layouts -# The 'accordion-padding' specifies the size of accordion padding -# You can set 0 to disable the padding feature -accordion-padding = 10 - -# Possible values: tiles|accordion -default-root-container-layout = 'tiles' - -# Possible values: horizontal|vertical|auto -# 'auto' means: wide monitor (anything wider than high) gets horizontal orientation, -# tall monitor (anything higher than wide) gets vertical orientation -default-root-container-orientation = 'auto' - -# Mouse follows focus when focused monitor changes -# Drop it from your config, if you don't like this behavior -# See https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks -# See https://nikitabobko.github.io/AeroSpace/commands#move-mouse -# Fallback value (if you omit the key): on-focused-monitor-changed = [] -on-focused-monitor-changed = ['move-mouse monitor-lazy-center'] - -# You can effectively turn off macOS "Hide application" (cmd-h) feature by toggling this flag -# Useful if you don't use this macOS feature, but accidentally hit cmd-h or cmd-alt-h key -# Also see: https://nikitabobko.github.io/AeroSpace/goodness#disable-hide-app -automatically-unhide-macos-hidden-apps = true - -# [[on-window-detected]] -# if.app-id = 'com.apple.systempreferences' -# if.app-name-regex-substring = 'settings' -# if.window-title-regex-substring = 'substring' -# if.workspace = 'workspace-name' -# if.during-aerospace-startup = true -# check-further-callbacks = true -# run = ['layout floating', 'move-node-to-workspace S'] # The callback itself - -[[on-window-detected]] -if.app-name-regex-substring = 'settings' # All settings -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.apple.systempreferences' # macOS System Preferences -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.1password.1password' # 1Password -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'org.ferdium.ferdium-app' # Ferdium, has WhatsApp etc. -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.jetbrains.PhpStorm' # PhpStorm -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.apple.finder' # Finder -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.apple.Preview' # Preview -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.apple.mail' # Mail -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.DanPristupov.Fork' # Fork -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.flexibits.fantastical2.mac' # Fantastical -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'org.whispersystems.signal-desktop' # Signal -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.tidal.desktop' # TIDAL -run = ['layout floating', 'move-node-to-workspace 2'] # Float and move to workspace 2 - -[[on-window-detected]] -if.app-id = 'com.apple.TV' # Apple TV app -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.setapp.DesktopClient' # Setapp -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.electron.dockerdesktop' # Docker Desktop -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.tinyspeck.slackmacgap' # Slack -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'md.obsidia' # Obsidian -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.todoist.mac.Todoist' # Todoist -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.apple.backup.launcher' # TimeMachine -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.philipyoungg.session-setapp' # Session app (Setapp) -run = ['layout floating'] - -[[on-window-detected]] -if.app-id = 'com.microsoft.rdc.macos' # Remote Desktop -run = ['layout floating'] - -# Possible values: (qwerty|dvorak) -# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping -[key-mapping] -preset = 'qwerty' - -# Gaps between windows (inner-*) and between monitor edges (outer-*). -# Possible values: -# - Constant: gaps.outer.top = 8 -# - Per monitor: gaps.outer.top = [{ monitor.main = 16 }, { monitor."some-pattern" = 32 }, 24] -# In this example, 24 is a default value when there is no match. -# Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'. -# See: https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors -[gaps] -inner.horizontal = 5 -inner.vertical = 5 -outer.top = [{ monitor.'^built-in retina display$' = 0 }, 0] -outer.right = 0 -outer.bottom = 0 -outer.left = 0 - -# 'main' binding mode declaration -# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes -# 'main' binding mode must be always presented -# Fallback value (if you omit the key): mode.main.binding = {} -[mode.main.binding] - -cmd-h = [] # Disable "hide application" -cmd-alt-h = [] # Disable "hide others" - -# All possible keys: -# - Letters. a, b, c, ..., z -# - Numbers. 0, 1, 2, ..., 9 -# - Keypad numbers. keypad0, keypad1, keypad2, ..., keypad9 -# - F-keys. f1, f2, ..., f20 -# - Special keys. minus, equal, period, comma, slash, backslash, quote, semicolon, backtick, -# leftSquareBracket, rightSquareBracket, space, enter, esc, backspace, tab -# - Keypad special. keypadClear, keypadDecimalMark, keypadDivide, keypadEnter, keypadEqual, -# keypadMinus, keypadMultiply, keypadPlus -# - Arrows. left, down, up, right - -# All possible modifiers: cmd, alt, ctrl, shift - -# All possible commands: https://nikitabobko.github.io/AeroSpace/commands - -# See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget -# You can uncomment the following lines to open up terminal with alt + enter shortcut (like in i3) -# alt-enter = '''exec-and-forget osascript -e ' -# tell application "Terminal" -# do script -# activate -# end tell' -# ''' - -# alt-cmd-shift-f = 'fullscreen' -# alt-shift-f = 'layout floating' -# alt-shift-tab = 'move-workspace-to-monitor --wrap-around next' - -# See: https://nikitabobko.github.io/AeroSpace/commands#focus -alt-h = 'focus left' -alt-j = 'focus down' -alt-k = 'focus up' -alt-l = 'focus right' - -# See: https://nikitabobko.github.io/AeroSpace/commands#workspace -alt-shift-1 = 'workspace 1' # Main -alt-shift-2 = 'workspace 2' # Media -ctrl-shift-1 = 'move-node-to-workspace 1' # Move node to Main -ctrl-shift-2 = 'move-node-to-workspace 2' # Move node to Media - -alt-shift-tab = 'workspace-back-and-forth' # Switch between workspaces -ctrl-shift-tab = 'move-workspace-to-monitor --wrap-around prev' - -# See: https://nikitabobko.github.io/AeroSpace/commands#mode -# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes -alt-a = 'mode apps' -alt-s = 'mode service' -alt-m = 'mode move' - -# ╭──────────────────────────────────────────────────────────╮ -# │ alt-m │ -# ╰──────────────────────────────────────────────────────────╯ -[mode.move.binding] -esc = ['reload-config', 'mode main'] -# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace -1 = ['move-node-to-workspace 1 --focus-follows-window'] -2 = ['move-node-to-workspace 2 --focus-follows-window'] -# See: https://nikitabobko.github.io/AeroSpace/commands#move -h = 'move left' -j = 'move down' -k = 'move up' -l = 'move right' -# See: https://nikitabobko.github.io/AeroSpace/commands#join-with -shift-h = 'join-with left' -shift-j = 'join-with down' -shift-k = 'join-with up' -shift-l = 'join-with right' -# https://nikitabobko.github.io/AeroSpace/commands#resize -ctrl-h = 'resize smart -70' -ctrl-l = 'resize smart +70' -shift-left = 'resize smart +70' -shift-right = 'resize smart -70' -# https://nikitabobko.github.io/AeroSpace/commands#flatten-workspace-tree -r = ['flatten-workspace-tree', 'mode main'] # reset layout - -# ╭──────────────────────────────────────────────────────────╮ -# │ alt-a │ -# ╰──────────────────────────────────────────────────────────╯ -[mode.apps.binding] -esc = ['reload-config', 'mode main'] -b = ['exec-and-forget open -a /Applications/Brave Browser.app', 'mode main'] # Browser -c = ['exec-and-forget open -a /Applications/Ferdium.app', 'mode main'] # Chat -g = ['exec-and-forget open -a /Applications/Ghostty.app', 'mode main'] # Ghostty -o = ['exec-and-forget open -a /Applications/Obsidian.app', 'mode main'] # Obsidian -s = ['exec-and-forget open -a /Applications/Slack.app', 'mode main'] # Slack -t = ['exec-and-forget open -a /Applications/TIDAL.app', 'mode main'] # Tidal -w = ['exec-and-forget open -a /Applications/WezTerm.app', 'mode main'] # WezTerm - -# ╭──────────────────────────────────────────────────────────╮ -# │ alt-s │ -# ╰──────────────────────────────────────────────────────────╯ -[mode.service.binding] -esc = ['reload-config', 'mode main'] # reload config -r = ['flatten-workspace-tree', 'mode main'] # reset layout -# See: https://nikitabobko.github.io/AeroSpace/commands#layout -f = ['layout floating tiling', 'mode main'] # Toggle between floating and tiling layout -backspace = ['close-all-windows-but-current', 'mode main'] diff --git a/config/aqua/aqua.yaml b/config/aqua/aqua.yaml deleted file mode 100644 index f379782..0000000 --- a/config/aqua/aqua.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/aqua-yaml.json -# aqua - Declarative CLI Version Manager -# https://aquaproj.github.io/ -# checksum: -# enabled: true -# require_checksum: true -# supported_envs: -# - all -registries: - - type: standard - ref: v4.346.0 # renovate: depName=aquaproj/aqua-registry -packages: - - name: cli/cli - version: 'v2.69.0' diff --git a/config/asdf/asdfrc b/config/asdf/asdfrc deleted file mode 100644 index 231755b..0000000 --- a/config/asdf/asdfrc +++ /dev/null @@ -1,5 +0,0 @@ -# See the docs for explanations: https://asdf-vm.com/manage/configuration.html - -legacy_version_file=yes -use_release_candidates=no -concurrency=auto diff --git a/config/asdf/gem-packages b/config/asdf/gem-packages deleted file mode 100644 index b841526..0000000 --- a/config/asdf/gem-packages +++ /dev/null @@ -1 +0,0 @@ -bundler diff --git a/config/asdf/plugin-versions b/config/asdf/plugin-versions deleted file mode 100644 index 3d83998..0000000 --- a/config/asdf/plugin-versions +++ /dev/null @@ -1,20 +0,0 @@ -1password-cli https://github.com/NeoHsu/asdf-1password-cli.git f5d5aab -age https://github.com/threkk/asdf-age.git 396bdf6 -asdf-plugin-manager https://github.com/asdf-community/asdf-plugin-manager.git b5862c1 -direnv https://github.com/asdf-community/asdf-direnv.git 6ff3dbe -dotenv-linter https://github.com/wesleimp/asdf-dotenv-linter.git 1369f53 -editorconfig-checker https://github.com/gabitchov/asdf-editorconfig-checker.git 585c1d5 -fd https://gitlab.com/wt0f/asdf-fd.git 17d56e0 -github-cli https://github.com/bartlomiejdanek/asdf-github-cli.git e0605b7 -golang https://github.com/asdf-community/asdf-golang.git e2527a3 -hadolint https://github.com/devlincashman/asdf-hadolint.git c8eb88b -kubectl https://github.com/asdf-community/asdf-kubectl.git 2fb3b57 -pre-commit https://github.com/jonathanmorley/asdf-pre-commit.git 26bfc42 -ripgrep https://gitlab.com/wt0f/asdf-ripgrep.git e836665 -rust https://github.com/code-lever/asdf-rust.git 95acf4f -shellcheck https://github.com/luizm/asdf-shellcheck.git 66200ff -shfmt https://github.com/luizm/asdf-shfmt.git a42c5ff -terragrunt https://github.com/ohmer/asdf-terragrunt.git 29f2935 -tf-summarize https://github.com/adamcrews/asdf-tf-summarize.git 880ad26 -yamllint https://github.com/ericcornelissen/asdf-yamllint.git e4cfb17 -yq https://github.com/sudermanjr/asdf-yq.git 772992f diff --git a/config/direnv/direnv.toml b/config/direnv/direnv.toml deleted file mode 100644 index b802841..0000000 --- a/config/direnv/direnv.toml +++ /dev/null @@ -1,12 +0,0 @@ -[global] -disable_stdin = false -load_dotenv = true -hide_env_diff = false - -[whitelist] -prefix = [ - "~/Code/" -] -exact = [ - "~/.dotfiles/.envrc" -] diff --git a/config/direnv/lib/use_asdf.sh b/config/direnv/lib/use_asdf.sh deleted file mode 100644 index 373bc03..0000000 --- a/config/direnv/lib/use_asdf.sh +++ /dev/null @@ -1,6 +0,0 @@ -### Do not edit. This was autogenerated by 'asdf direnv setup' ### -# shellcheck shell=bash -use_asdf() -{ - source_env "$(asdf direnv envrc "$@")" -} diff --git a/config/exports b/config/exports index aaea2da..b3d5016 100755 --- a/config/exports +++ b/config/exports @@ -348,12 +348,6 @@ export COMPOSER_HOME="$XDG_STATE_HOME/composer" export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin" export PATH="$COMPOSER_BIN:$PATH" -# direnv, https://direnv.net/ -# https://direnv.net/docs/hook.html -# Set the hook to show the direnv message in a different color -# export DIRENV_LOG_FORMAT=$'\033[2mdirenv: %s\033[0m' -export DIRENV_LOG_FORMAT= - # docker, https://docs.docker.com/engine/reference/commandline/cli/ msg "Setting up Docker configuration" export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker" @@ -410,11 +404,6 @@ x-have pyenv && eval "$(pyenv init -)" msg "Setting up Rust/Cargo configuration" export RUST_WITHOUT=rust-docs -# screen -# https://www.gnu.org/software/screen/manual/screen.html -msg "Setting up screen configuration" -export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc" - # sonarlint # https://www.sonarlint.org/ msg "Setting up Sonarlint configuration" @@ -442,9 +431,6 @@ export ZSH_TMUX_UNICODE=true export ZSH_TMUX_AUTOQUIT=false export ZSH_TMUX_DEFAULT_SESSION_NAME=main -# tms, https://github.com/jrmoulton/tmux-sessionizer -export TMS_CONFIG_FILE="${XDG_CONFIG_HOME}/tms/config.toml" - # wakatime, https://github.com/wakatime/wakatime-cli msg "Setting up Wakatime configuration" export WAKATIME_HOME="$XDG_STATE_HOME/wakatime" diff --git a/config/exports-lakka b/config/exports-lakka index a9c6c46..cb3df9e 100644 --- a/config/exports-lakka +++ b/config/exports-lakka @@ -8,7 +8,6 @@ fi export PATH="$HOME/.local/go/bin:$PATH" alias logrotate='/usr/sbin/logrotate -s "$HOME/logs/state"' -alias nano='nano -wS -$' alias gpg=gpg2 ACME_PATH="$HOME/.acme.sh" diff --git a/config/flipperdevices.com/qFlipper.ini b/config/flipperdevices.com/qFlipper.ini deleted file mode 100644 index 2f51d86..0000000 --- a/config/flipperdevices.com/qFlipper.ini +++ /dev/null @@ -1,6 +0,0 @@ -[General] -ApplicationUpdateChannel=release -CheckApplicatonUpdates=true -FirmwareUpdateChannel=release -LastFolderUrl=/Users/ivuorinen -ShowHiddenFiles=false diff --git a/config/ghostty/config b/config/ghostty/config deleted file mode 100644 index 7d0b0d4..0000000 --- a/config/ghostty/config +++ /dev/null @@ -1,15 +0,0 @@ -# vim: ft=ghostty -theme = "light:tokyonight-day,dark:tokyonight-storm" -font-family = "JetBrainsMono Nerd Font Mono" - -background-blur-radius = 15 -background-opacity = 0.95 - -clipboard-read = allow -clipboard-write = allow -cursor-style = bar -custom-shader-animation = true -gtk-single-instance = true -mouse-hide-while-typing = true -shell-integration-features = true -window-theme = system diff --git a/config/htop/htoprc b/config/htop/htoprc deleted file mode 100644 index ebcfce2..0000000 --- a/config/htop/htoprc +++ /dev/null @@ -1,54 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -htop_version=3.4.1 -config_reader_min_version=3 -fields=0 48 17 18 38 39 2 46 47 49 1 -hide_kernel_threads=1 -hide_userland_threads=0 -hide_running_in_container=0 -shadow_other_users=0 -show_thread_names=0 -show_program_path=1 -highlight_base_name=0 -highlight_deleted_exe=1 -shadow_distribution_path_prefix=0 -highlight_megabytes=1 -highlight_threads=1 -highlight_changes=0 -highlight_changes_delay_secs=5 -find_comm_in_cmdline=1 -strip_exe_from_cmdline=1 -show_merged_command=0 -header_margin=1 -screen_tabs=1 -detailed_cpu_time=0 -cpu_count_from_one=0 -show_cpu_usage=1 -show_cpu_frequency=0 -show_cached_memory=1 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=0 -enable_mouse=1 -delay=15 -hide_function_bar=0 -header_layout=two_50_50 -column_meters_0=LeftCPUs2 Memory Swap -column_meter_modes_0=1 1 1 -column_meters_1=RightCPUs2 Tasks LoadAverage Uptime -column_meter_modes_1=1 2 2 2 -tree_view=0 -sort_key=46 -tree_sort_key=0 -sort_direction=-1 -tree_sort_direction=1 -tree_view_always_by_pid=0 -all_branches_collapsed=0 -screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command -.sort_key=PERCENT_CPU -.tree_sort_key=PID -.tree_view_always_by_pid=0 -.tree_view=0 -.sort_direction=-1 -.tree_sort_direction=1 -.all_branches_collapsed=0 diff --git a/config/misc/screenrc b/config/misc/screenrc deleted file mode 100644 index 12ec529..0000000 --- a/config/misc/screenrc +++ /dev/null @@ -1,15 +0,0 @@ -# Disable the startup message -startup_message off - -# Set a large scrollback buffer -defscrollback 32000 - -# Always start `screen` with UTF-8 enabled (`screen -U`) -defutf8 on - -# Scroll with mouse wheel (http://stackoverflow.com/a/1125947) -termcapinfo xterm* ti@:te@ - -# Some settings for screen + vim -term xterm-256color -maptimeout 10 diff --git a/config/nano/nanorc b/config/nano/nanorc deleted file mode 100644 index e0e43a9..0000000 --- a/config/nano/nanorc +++ /dev/null @@ -1 +0,0 @@ -set tabsize 2 diff --git a/config/nbrc b/config/nbrc deleted file mode 100755 index aeff3b0..0000000 --- a/config/nbrc +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -############################################################################### -# .nbrc -# -# Configuration file for `nb`, a command line note-taking, bookmarking, -# and knowledge base application with encryption, search, Git-backed syncing, -# and more in a single portable script. -# -# Edit this file manually or manage settings using the `nb settings` -# subcommand. Configuration options are set as environment variables, eg: -# export NB_ENCRYPTION_TOOL=gpg -# -# https://github.com/xwmx/nb -############################################################################### - -export NB_DIR="${NB_DIR:-$HOME/.local/state/nb}" # Set by `nb` • Mon May 8 15:25:12 EEST 2023 - -export NB_COLOR_THEME="${NB_COLOR_THEME:-unicorn}" # Set by `nb` • Mon May 8 15:41:22 EEST 2023 diff --git a/config/starship.toml b/config/starship.toml deleted file mode 100644 index ee25319..0000000 --- a/config/starship.toml +++ /dev/null @@ -1,154 +0,0 @@ -# Get editor completions based on the config schema -"$schema" = 'https://starship.rs/config-schema.json' - -format = """ -$os\ -$directory\ -$git_branch\ -$git_state\ -$git_status\ -$fill \ -$battery\ -$username\ -$hostname\ -$aws\ -$gcloud\ -$conda\ -$golang\ -$nodejs\ -$php\ -$python\ -$package\ -$line_break\ -$character""" - -# Timeout for commands executed by starship (in milliseconds). -command_timeout = 1500 - -[character] -success_symbol = "[→](bold green)" -error_symbol = "[→](red)" -vimcmd_symbol = "[←](green)" - -[aws] -symbol = " " -format = '[$symbol($profile )(\($region\) )(\[$duration\] )]($style)' - -[cmd_duration] -disabled = true - -[directory] -read_only = " 󰌾" -style = "blue" -before_repo_root_style = "white" -truncation_symbol = "…/" - -[docker_context] -symbol = " " -format = '[$symbol$context]($style) ' - -[fill] -symbol = '·' -style = 'bold black' - -[gcloud] -format = '[($symbol)$account(@$domain)(\($region\))]($style) ' - -[git_branch] -symbol = " " -format = '[$symbol$branch(:$remote_branch)]($style) ' -truncation_length = 20 -truncation_symbol = '…' -ignore_branches = ['master', 'main'] - -[git_status] -up_to_date = '✓' -staged = '[++\($count\)](green)' - -[git_state] -format = '\([$state( $progress_current/$progress_total)]($style)\) ' -style = "bright-black" - -[git_metrics] -added_style = 'bold blue' -format = '[+$added]($added_style)/[-$deleted]($deleted_style) ' -disabled = false - -[golang] -symbol = " " -format = '[$symbol($version )]($style) ' - -[hostname] -ssh_symbol = " " -ssh_only = false -format = '[$ssh_symbol](bold blue)[$hostname](bold red) ' - -[lua] -format = '[$symbol($version )]($style)' - -[nodejs] -symbol = " " -format = '[$symbol($version )]($style)' -version_format = '${major}.${minor}' - -[os] -format = "[$symbol]($style) " -style = "bold blue" -disabled = false - -[os.symbols] -Alpaquita = " " -Alpine = " " -Amazon = " " -Android = " " -Arch = " " -Artix = " " -CentOS = " " -Debian = " " -DragonFly = " " -Emscripten = " " -EndeavourOS = " " -Fedora = " " -FreeBSD = " " -Garuda = "󰛓 " -Gentoo = " " -HardenedBSD = "󰞌 " -Illumos = "󰈸 " -Linux = " " -Mabox = " " -Macos = " " -Manjaro = " " -Mariner = " " -MidnightBSD = " " -Mint = " " -NetBSD = " " -NixOS = " " -OpenBSD = "󰈺 " -openSUSE = " " -OracleLinux = "󰌷 " -Pop = " " -Raspbian = " " -Redhat = " " -RedHatEnterprise = " " -Redox = "󰀘 " -Solus = "󰠳 " -SUSE = " " -Ubuntu = " " -Unknown = " " -Windows = "󰍲 " - -[package] -symbol = "󰏗 " -format = '[$symbol($version )]($style)' -version_format = '${major}.${minor}' - -[php] -format = '[$symbol($version )]($style)' -version_format = '${major}.${minor}' - -[python] -symbol = " " -format = "[$virtualenv]($style) " - -[username] -format = "[$user]($style) " diff --git a/config/task/taskrc b/config/task/taskrc deleted file mode 100644 index 427b937..0000000 --- a/config/task/taskrc +++ /dev/null @@ -1,81 +0,0 @@ -# [Created by task 2.6.2 5/11/2023 09:33:14] -# Taskwarrior program configuration file. -# For more documentation, see https://taskwarrior.org or try 'man task', 'man task-color', -# 'man task-sync' or 'man taskrc' - -# Here is an example of entries that use the default, override and blank values -# variable=foo -- By specifying a value, this overrides the default -# variable= -- By specifying no value, this means no default -# #variable=foo -- By commenting out the line, or deleting it, this uses the default - -# You can also refence environment variables: -# variable=$HOME/task -# variable=$VALUE - -# Use the command 'task show' to see all defaults and overrides - -# Files -data.location=$XDG_DATA_HOME/task/ - -# To use the default location of the XDG directories, -# move this configuration file from ~/.taskrc to ~/.config/task/taskrc and uncomment below - -#data.location=$XDG_DATA_HOME/task -#hooks.location=~/.config/task/hooks - -# Color theme (uncomment one to use) -#include light-16.theme -#include light-256.theme -#include dark-16.theme -#include dark-256.theme -#include dark-red-256.theme -#include dark-green-256.theme -#include dark-blue-256.theme -#include dark-violets-256.theme -#include dark-yellow-green.theme -#include dark-gray-256.theme -#include dark-gray-blue-256.theme -#include solarized-dark-256.theme -#include solarized-light-256.theme -#include no-color.theme - -weekstart=monday - -news.version=2.6.0 - -default.project=Inbox -calendar.details=full -calendar.holidays=sparse -recurrence=on - -uda.taskwarrior-tui.keyconfig.quit=q -uda.taskwarrior-tui.keyconfig.refresh=r -uda.taskwarrior-tui.keyconfig.go-to-bottom=G -uda.taskwarrior-tui.keyconfig.go-to-top=g -uda.taskwarrior-tui.keyconfig.down=j -uda.taskwarrior-tui.keyconfig.up=k -uda.taskwarrior-tui.keyconfig.page-down=J -uda.taskwarrior-tui.keyconfig.page-up=K -uda.taskwarrior-tui.keyconfig.delete=x -uda.taskwarrior-tui.keyconfig.done=d -uda.taskwarrior-tui.keyconfig.start-stop=s -uda.taskwarrior-tui.keyconfig.quick-tag=t -uda.taskwarrior-tui.keyconfig.undo=u -uda.taskwarrior-tui.keyconfig.edit=e -uda.taskwarrior-tui.keyconfig.modify=m -uda.taskwarrior-tui.keyconfig.shell=! -uda.taskwarrior-tui.keyconfig.log=l -uda.taskwarrior-tui.keyconfig.add=a -uda.taskwarrior-tui.keyconfig.annotate=A -uda.taskwarrior-tui.keyconfig.filter=/ -uda.taskwarrior-tui.keyconfig.zoom=z -uda.taskwarrior-tui.keyconfig.context-menu=c -uda.taskwarrior-tui.keyconfig.next-tab=. -uda.taskwarrior-tui.keyconfig.previous-tab=, - -taskd.certificate=$XDG_DATA_HOME/task/private.certificate.pem -taskd.key=$XDG_DATA_HOME/task/private.key.pem -taskd.ca=$XDG_DATA_HOME/task/ca.cert.pem -taskd.server=inthe.am:53589 -taskd.credentials=inthe_am/ivuorinen/b99a4970-94fb-4fb8-b9fe-e1a8140dd44d -taskd.trust=strict diff --git a/config/tealdeer/config.toml b/config/tealdeer/config.toml deleted file mode 100644 index 4364a9e..0000000 --- a/config/tealdeer/config.toml +++ /dev/null @@ -1,38 +0,0 @@ -[style.description] -underline = false -bold = false -italic = false - -[style.command_name] -foreground = "cyan" -underline = false -bold = false -italic = false - -[style.example_text] -foreground = "green" -underline = false -bold = false -italic = false - -[style.example_code] -foreground = "cyan" -underline = false -bold = false -italic = false - -[style.example_variable] -foreground = "cyan" -underline = true -bold = false -italic = false - -[display] -compact = false -use_pager = false - -[updates] -auto_update = false -auto_update_interval_hours = 720 - -[directories] diff --git a/config/tms/config.toml b/config/tms/config.toml deleted file mode 100644 index a8423da..0000000 --- a/config/tms/config.toml +++ /dev/null @@ -1,11 +0,0 @@ -default_session = "main" -display_full_path = true - -[[search_dirs]] -path = "~/Code" -depth = 3 - -[picker_colors] -highlight_color = "#31748f" -highlight_text_color = "#e0def4" -border_color = "#524F67" diff --git a/config/wtf/config.yml b/config/wtf/config.yml deleted file mode 100644 index dd11c22..0000000 --- a/config/wtf/config.yml +++ /dev/null @@ -1,181 +0,0 @@ ---- -wtf: - colors: - background: black - border: - focusable: darkslateblue - focused: orange - normal: gray - checked: yellow - highlight: - fore: black - back: gray - rows: - even: yellow - odd: white - grid: - # How _wide_ the columns are, in terminal characters. In this case we have - # four columns, each of which are 35 characters wide. - columns: [35, 35, 30, 20] - # How _high_ the rows are, in terminal lines. In this case we have four rows - # that support ten line of text and one of four. - rows: [10, 10, 10, 20, 10, 4] - refreshInterval: 1 - openFileUtil: 'open' - mods: - # You can have multiple widgets of the same type. - # The "key" is the name of the widget and the type is the actual - # widget you want to implement. - europe_time: - title: 'Europe' - type: clocks - colors: - rows: - even: 'lightblue' - odd: 'white' - enabled: true - locations: - GMT: 'Etc/GMT' - Amsterdam: 'Europe/Amsterdam' - Berlin: 'Europe/Berlin' - Barcelona: 'Europe/Madrid' - Copenhagen: 'Europe/Copenhagen' - London: 'Europe/London' - Rome: 'Europe/Rome' - Stockholm: 'Europe/Stockholm' - position: - top: 0 - left: 0 - height: 1 - width: 1 - refreshInterval: 15 - sort: 'alphabetical' - americas_time: - title: 'Americas' - type: clocks - colors: - rows: - even: 'lightblue' - odd: 'white' - enabled: true - locations: - UTC: 'Etc/UTC' - Vancouver: 'America/Vancouver' - New_York: 'America/New_York' - Sao_Paulo: 'America/Sao_Paulo' - Denver: 'America/Denver' - Iqaluit: 'America/Iqaluit' - Bahamas: 'America/Nassau' - Chicago: 'America/Chicago' - position: - top: 0 - left: 1 - height: 1 - width: 1 - refreshInterval: 15 - sort: 'alphabetical' - battery: - type: power - title: '⚡️' - enabled: true - position: - top: 1 - left: 2 - height: 1 - width: 2 - refreshInterval: 15 - todolist: - type: todo - checkedIcon: 'X' - colors: - checked: gray - highlight: - fore: 'black' - back: 'orange' - enabled: true - filename: 'todo.yml' - position: - top: 1 - left: 0 - height: 2 - width: 1 - refreshInterval: 3600 - ip: - type: ipinfo - title: 'My IP' - colors: - name: 'lightblue' - value: 'white' - enabled: true - position: - top: 0 - left: 2 - height: 1 - width: 2 - refreshInterval: 150 - security_info: - type: security - title: 'Staying safe' - enabled: true - position: - top: 1 - left: 1 - height: 1 - width: 1 - refreshInterval: 3600 - readme: - type: textfile - enabled: true - filePaths: - - '~/.config/wtf/config.yml' - format: true - formatStyle: 'monokai' - position: - top: 3 - left: 0 - height: 1 - width: 1 - refreshInterval: 15 - news: - type: hackernews - title: 'HackerNews' - enabled: true - numberOfStories: 10 - position: - top: 3 - left: 1 - height: 1 - width: 3 - storyType: top - refreshInterval: 900 - resources: - type: resourceusage - enabled: true - position: - top: 4 - left: 0 - height: 2 - width: 1 - refreshInterval: 1 - uptime: - type: cmdrunner - args: [] - cmd: 'uptime' - enabled: true - position: - top: 5 - left: 1 - height: 1 - width: 3 - refreshInterval: 30 - disks: - type: cmdrunner - cmd: 'df' - args: ['-h'] - enabled: true - position: - top: 4 - left: 1 - height: 1 - width: 3 - refreshInterval: 3600 diff --git a/config/yabai/yabairc b/config/yabai/yabairc index e6f70e9..27c5a70 100755 --- a/config/yabai/yabairc +++ b/config/yabai/yabairc @@ -20,7 +20,6 @@ yabai -m config \ window_shadow float # apps to not manage (ignore) -# TODO: add apps from aerospace config to here # list active apps: # > yabai -m query --windows | jq .[].app | sort | uniq yabai -m rule --add app="1Password" manage=off diff --git a/config/yamlfmt/.yamlfmt b/config/yamlfmt/.yamlfmt deleted file mode 100644 index 887f719..0000000 --- a/config/yamlfmt/.yamlfmt +++ /dev/null @@ -1,8 +0,0 @@ -formatter: - type: basic - indent: 2 - retain_line_breaks: false - disallow_anchors: false - max_line_length: 0 - scan_folded_as_literal: false - indentless_arrays: false diff --git a/config/yamllint/config b/config/yamllint/config deleted file mode 100644 index ebb8fad..0000000 --- a/config/yamllint/config +++ /dev/null @@ -1,31 +0,0 @@ ---- -extends: default - -ignore-from-file: [.gitignore, .yamlignore] - -rules: - braces: - level: warning - max-spaces-inside: 1 - brackets: - level: warning - max-spaces-inside: 1 - colons: - level: warning - commas: - level: warning - comments: disable - comments-indentation: disable - document-start: disable - empty-lines: - level: warning - hyphens: - level: warning - indentation: - level: warning - indent-sequences: consistent - line-length: - level: warning - allow-non-breakable-inline-mappings: true - max: 120 - truthy: disable diff --git a/config/zsh/antidote_plugins.txt b/config/zsh/antidote_plugins.txt index e3c1a33..1433cc2 100644 --- a/config/zsh/antidote_plugins.txt +++ b/config/zsh/antidote_plugins.txt @@ -37,7 +37,6 @@ zdharma-continuum/fast-syntax-highlighting # Add some plugins that are not in OMZ jreese/zsh-titles -yuki-ycino/tms # This needs to be last bundle # zsh-users/zsh-syntax-highlighting diff --git a/config/zsh/completion/_dfm b/config/zsh/completion/_dfm index f5d5dd7..dc6b456 100644 --- a/config/zsh/completion/_dfm +++ b/config/zsh/completion/_dfm @@ -28,7 +28,6 @@ _dfm() sections=( 'install:Installation commands' - 'asdf:ASDF version manager commands' 'brew:Homebrew package manager commands' 'check:System check commands' 'dotfiles:Dotfiles management commands' @@ -69,24 +68,6 @@ _dfm() _describe 'install commands' install_cmds ;; - asdf) - local -a asdf_cmds - asdf_cmds=( - 'current:Show current versions' - 'global:Show global versions' - 'installed:Show installed versions' - 'plugins-update:Update all plugins' - 'plugins-install:Install plugins from configuration' - 'plugins-remove:Remove installed plugins' - 'reset:Reset plugins' - 'fix-tool-versions:Remove uninstalled plugins from .tool-versions' - 'versions:Show versions' - 'where:Show where' - 'which:Show which' - ) - _describe 'asdf commands' asdf_cmds - ;; - brew) local -a brew_cmds brew_cmds=( diff --git a/docs/aerospace-keybindings.md b/docs/aerospace-keybindings.md deleted file mode 100644 index 6920691..0000000 --- a/docs/aerospace-keybindings.md +++ /dev/null @@ -1,66 +0,0 @@ -# aerospace keybindings - -## main - -| Key | Command(s) and actions | -| -------------- | -------------------------------------------- | -| alt-a | mode apps | -| alt-h | focus left | -| alt-j | focus down | -| alt-k | focus up | -| alt-l | focus right | -| alt-m | mode move | -| alt-s | mode service | -| alt-shift-1 | workspace 1 | -| alt-shift-2 | workspace 2 | -| alt-shift-tab | workspace-back-and-forth | -| ctrl-shift-1 | move-node-to-workspace 1 | -| ctrl-shift-2 | move-node-to-workspace 2 | -| ctrl-shift-tab | move-workspace-to-monitor --wrap-around prev | - -## apps - -| Key | Command(s) and actions | -| --- | ------------------------------------------------------------------ | -| b | exec-and-forget open -a /Applications/Brave Browser.app; mode main | -| c | exec-and-forget open -a /Applications/Ferdium.app; mode main | -| esc | reload-config; mode main | -| g | exec-and-forget open -a /Applications/Ghostty.app; mode main | -| o | exec-and-forget open -a /Applications/Obsidian.app; mode main | -| s | exec-and-forget open -a /Applications/Slack.app; mode main | -| t | exec-and-forget open -a /Applications/TIDAL.app; mode main | -| w | exec-and-forget open -a /Applications/WezTerm.app; mode main | - -## move - -| Key | Command(s) and actions | -| ----------- | ----------------------------------------------- | -| 1 | move-node-to-workspace 1 --focus-follows-window | -| 2 | move-node-to-workspace 2 --focus-follows-window | -| ctrl-h | resize smart -70 | -| ctrl-l | resize smart +70 | -| esc | reload-config; mode main | -| h | move left | -| j | move down | -| k | move up | -| l | move right | -| r | flatten-workspace-tree; mode main | -| shift-h | join-with left | -| shift-j | join-with down | -| shift-k | join-with up | -| shift-l | join-with right | -| shift-left | resize smart +70 | -| shift-right | resize smart -70 | - -## service - -| Key | Command(s) and actions | -| --------- | ---------------------------------------- | -| backspace | close-all-windows-but-current; mode main | -| esc | reload-config; mode main | -| f | layout floating tiling; mode main | -| r | flatten-workspace-tree; mode main | - -File generated: 2025-01-15 13:32:41 - -Config file: [config/aerospace/aerospace.toml](./../config/aerospace/aerospace.toml) diff --git a/local/bin/dfm b/local/bin/dfm index f19890a..c0340f1 100755 --- a/local/bin/dfm +++ b/local/bin/dfm @@ -299,7 +299,6 @@ section_helpers() "colors:Show colors" "env:Show environment variables" "functions:Show functions" - "aerospace:Show aerospace keybindings" "nvim:Show nvim keybindings" 'path:Show $PATH dir by dir' "tmux:Show tmux keybindings" @@ -361,7 +360,6 @@ section_helpers() "env") env | sort ;; "functions") declare -F ;; - "aerospace") cat "$DOTFILES/docs/aerospace-keybindings.md" ;; "nvim") cat "$DOTFILES/docs/nvim-keybindings.md" ;; "tmux") cat "$DOTFILES/docs/tmux-keybindings.md" ;; "wezterm") cat "$DOTFILES/docs/wezterm-keybindings.md" ;; @@ -438,7 +436,6 @@ section_docs() MENU=( "all:Update all keybindings documentations" - "aerospace:Update aerospace keybindings documentation" "tmux:Update tmux keybindings documentation" "nvim:Update nvim keybindings documentation" "wezterm:Update wezterm keybindings documentation" @@ -446,12 +443,10 @@ section_docs() case "$1" in all) - $0 docs aerospace $0 docs tmux $0 docs nvim $0 docs wezterm ;; - aerospace) bash "$DOTFILES/scripts/create-aerospace-keymaps.php" ;; tmux) bash "$DOTFILES/local/bin/x-dfm-docs-xterm-keybindings" ;; nvim) bash "$DOTFILES/scripts/create-nvim-keymaps.sh" ;; wezterm) bash "$DOTFILES/scripts/create-wezterm-keymaps.sh" ;; diff --git a/scripts/create-aerospace-keymaps.md b/scripts/create-aerospace-keymaps.md deleted file mode 100644 index d3a8010..0000000 --- a/scripts/create-aerospace-keymaps.md +++ /dev/null @@ -1,11 +0,0 @@ -# create-aerospace-keymaps - -Generates `docs/aerospace-keybindings.md` using `aerospace config --json`. - -## Usage - -```bash -scripts/create-aerospace-keymaps.php -``` - -Requires the `aerospace` CLI tool to be installed. diff --git a/scripts/create-aerospace-keymaps.php b/scripts/create-aerospace-keymaps.php deleted file mode 100755 index cec75d6..0000000 --- a/scripts/create-aerospace-keymaps.php +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env php - $value) { - $k = str_pad($key, $k_len + 1); - $v = str_pad($value, $v_len + 1); - $output[] = sprintf("| %s | %s |", $k, $v); - } - - return implode("\n", $output); -} - -$contents = []; -$contents[] = "# aerospace keybindings"; - -$contents[] = process_section("main", $main); - -ksort($config); - -foreach ($config as $mode => $bindings) { - $contents[] = process_section($mode, $bindings); -} - -$contents[] = "\nFile generated: " . date("Y-m-d H:i:s") . "\n"; - -$config_file_name = 'config/aerospace/aerospace.toml'; -$config_file_source = './../config/aerospace/aerospace.toml'; -$contents[] = "Config file: [$config_file_name]($config_file_source)\n"; - -$file = implode("\n", $contents); -file_put_contents($dest, $file);