diff --git a/README.md b/README.md index b37aa21..b192da1 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,21 @@ - manual settings, refer to [ref/macos-system-settings](ref/macos-system-settings.txt) ### script run -- (run these commands from repo's root dir) -- to do the full setup, run: `./box_setup.sh` -- to copy dotfiles only, run: `./copy_dotfiles.sh` +- to do the full setup, from git root dir, run: `./box_setup.sh` +- to copy dotfiles only, from git root dir, run: `./copy_dotfiles.sh` ### after script run -- complete manual actions specified in [ref/post-run-manual](ref/post-run-manual.md) +- complete manual actions specified in [ref/post-run](ref/post-run.md) + +------------------------------------------------------------------------------------------ ### todo items - choose window manager for linux, then configure - config for: terminal (ghostty); shell; mpd, mpc, ncmpcpp; mpv - decide on docker? or alternatives like podman? any license concerns? +- switch installation approach, use csv file with programs to install, install types, + any extra flags/opts, comments + - regarding the system-types idea i'd started to build in already, maybe have a + column for filtering in the csv file, or just have multiple csv files corresponding + to a base/core install, a music-studio install, a employer/work machine, etc. +- add command in tmux to perform cd to a given dir in all windows of the current session diff --git a/installs_and_builds/s02_utils b/installs_and_builds/s02_utils index 059eceb..1759856 100755 --- a/installs_and_builds/s02_utils +++ b/installs_and_builds/s02_utils @@ -12,5 +12,16 @@ ${=BOX_SETUP_INSTALL_COMMAND} \ grep \ ripgrep +utils_package_name_pandoc="pandoc" +case $BOX_SETUP_DISTRO in + (arch | alpine) + utils_package_name_pandoc="pandoc-cli" + ;; + (artix) + utils_package_name_pandoc="pandoc-bin" + ;; +esac +${=BOX_SETUP_INSTALL_COMMAND} $utils_package_name_pandoc + [[ "$BOX_SETUP_OS" = "macos" ]] && - ${=BOX_SETUP_INSTALL_COMMAND} coreutils + ${=BOX_SETUP_INSTALL_COMMAND} coreutils findutils diff --git a/installs_and_builds/s12_web_browser b/installs_and_builds/s12_web_browser index bb441c9..37e5664 100755 --- a/installs_and_builds/s12_web_browser +++ b/installs_and_builds/s12_web_browser @@ -1,8 +1,10 @@ #!/bin/zsh -# TODO: replace firefox with brave or another browser +# TODO: get browser config and install set up +# current idea: qutebrowser for general, tor for sensitive, brave as a backup option + # install_option_prefix='' # [[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask' # firefox_package_name='firefox' -# [[ "$BOX_SETUP_OS" = "debian" ]] && firefox_package_name='firefox-esr' +# [[ "$BOX_SETUP_DISTRO" = "debian" ]] && firefox_package_name='firefox-esr' # ${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" "$firefox_package_name" diff --git a/ref/post-run-manual.md b/ref/post-run.md similarity index 100% rename from ref/post-run-manual.md rename to ref/post-run.md diff --git a/ref/workflow-and-workspaces-scheme.md b/ref/workflow-and-workspaces-scheme.md index ba3c70e..7a83e7c 100644 --- a/ref/workflow-and-workspaces-scheme.md +++ b/ref/workflow-and-workspaces-scheme.md @@ -8,15 +8,16 @@ idea from the ThePrimeagen: designated workspace/label/desktop per app/purpose | workspace number | wm layout/mode | |--------------------------------------------------------------|------------------------| -| 1. notes/drawing (stack: nvim, obsidian, gimp) | stack | +| 1. notes (stack: nvim, obsidian) | stack | | 2. music makeing - misc | stack | | 3. music making - daw | floating (workaround) | -| 4. music/audio listening | stack | -| 5. general - misc (catch-all) | stack | +| 4. drawing (currently: gimp) | stack | +| 5. music/audio listening | stack | | 6. comms (stack: emails, chats, av/calls) | stack | -| 7. programming - misc (whatever is not in terminal) | stack | +| 7. web browser | stack | | 8. terminal (primary; one-offs & tui apps can be anywhere) | stack | -| 9. web browser | stack | +| 9. programming - misc (whatever is not in terminal) | stack | +| 0. general - misc (catch-all) | stack | ### ideas/guidelines: - use this consistently accross all machines diff --git a/src_files/.config/aerospace/aerospace.toml b/src_files/.config/aerospace/aerospace.toml index 04ad9d2..dce080e 100644 --- a/src_files/.config/aerospace/aerospace.toml +++ b/src_files/.config/aerospace/aerospace.toml @@ -9,7 +9,7 @@ enable-normalization-opposite-orientation-for-nested-containers = true accordion-padding = 0 # ref: https://nikitabobko.github.io/AeroSpace/guide#layouts default-root-container-layout = 'accordion' # tiles|accordion -default-root-container-orientation = 'auto' # horizontal|vertical|auto +default-root-container-orientation = 'vertical' # horizontal|vertical|auto # refs: https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks # https://nikitabobko.github.io/AeroSpace/commands#move-mouse @@ -61,8 +61,9 @@ automatically-unhide-macos-hidden-apps = true # ''' # See: https://nikitabobko.github.io/AeroSpace/commands#layout - alt-slash = 'layout tiles horizontal vertical' - alt-comma = 'layout accordion horizontal vertical' + alt-comma = 'layout v_accordion' + alt-period = 'layout h_tiles' + alt-slash = 'layout horizontal vertical' # See: https://nikitabobko.github.io/AeroSpace/commands#focus # new windows are added to the stack "below" the current, so swap up and down @@ -94,6 +95,7 @@ automatically-unhide-macos-hidden-apps = true alt-7 = 'workspace 7' alt-8 = 'workspace 8' alt-9 = 'workspace 9' + alt-0 = 'workspace 0' # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace alt-shift-1 = 'move-node-to-workspace 1' @@ -105,6 +107,7 @@ automatically-unhide-macos-hidden-apps = true alt-shift-7 = 'move-node-to-workspace 7' alt-shift-8 = 'move-node-to-workspace 8' alt-shift-9 = 'move-node-to-workspace 9' + alt-shift-0 = 'move-node-to-workspace 0' # See: https://nikitabobko.github.io/AeroSpace/commands#mode alt-shift-semicolon = 'mode service' @@ -117,9 +120,8 @@ automatically-unhide-macos-hidden-apps = true r = ['flatten-workspace-tree', 'mode main'] # reset layout f = ['flatten-workspace-tree', 'layout floating', 'mode main'] - t = ['flatten-workspace-tree', 'layout tiling', 'mode main'] - s = ['layout v_accordion', 'mode main'] - g = ['layout v_tiles', 'mode main'] + s = ['flatten-workspace-tree', 'layout v_accordion', 'mode main'] + g = ['flatten-workspace-tree', 'layout h_tiles', 'mode main'] alt-shift-h = ['join-with left', 'mode main'] alt-shift-j = ['join-with down', 'mode main'] diff --git a/src_files/.config/aerospace/ref-aerospace-default.toml b/src_files/.config/aerospace/ref-aerospace-default.toml deleted file mode 100644 index 10b8041..0000000 --- a/src_files/.config/aerospace/ref-aerospace-default.toml +++ /dev/null @@ -1,206 +0,0 @@ -# Place a copy of this config to ~/.aerospace.toml -# After that, you can edit ~/.aerospace.toml to your liking - -# You can use it to add commands that run after AeroSpace startup. -# Available commands : https://nikitabobko.github.io/AeroSpace/commands -after-startup-command = [] - -# 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 = 30 - -# 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/goodies#disable-hide-app -automatically-unhide-macos-hidden-apps = false - -# Possible values: (qwerty|dvorak|colemak) -# 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 = 0 - inner.vertical = 0 - outer.left = 0 - outer.bottom = 0 - outer.top = 0 - outer.right = 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] - - # 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, pageUp, pageDown, home, end, forwardDelete, - # sectionSign (ISO keyboards only, european keyboards only) - # - 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' - # ''' - - # See: https://nikitabobko.github.io/AeroSpace/commands#layout - alt-slash = 'layout tiles horizontal vertical' - alt-comma = 'layout accordion horizontal vertical' - - # 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#move - alt-shift-h = 'move left' - alt-shift-j = 'move down' - alt-shift-k = 'move up' - alt-shift-l = 'move right' - - # See: https://nikitabobko.github.io/AeroSpace/commands#resize - alt-minus = 'resize smart -50' - alt-equal = 'resize smart +50' - - # See: https://nikitabobko.github.io/AeroSpace/commands#workspace - alt-1 = 'workspace 1' - alt-2 = 'workspace 2' - alt-3 = 'workspace 3' - alt-4 = 'workspace 4' - alt-5 = 'workspace 5' - alt-6 = 'workspace 6' - alt-7 = 'workspace 7' - alt-8 = 'workspace 8' - alt-9 = 'workspace 9' - alt-a = 'workspace A' # In your config, you can drop workspace bindings that you don't need - alt-b = 'workspace B' - alt-c = 'workspace C' - alt-d = 'workspace D' - alt-e = 'workspace E' - alt-f = 'workspace F' - alt-g = 'workspace G' - alt-i = 'workspace I' - alt-m = 'workspace M' - alt-n = 'workspace N' - alt-o = 'workspace O' - alt-p = 'workspace P' - alt-q = 'workspace Q' - alt-r = 'workspace R' - alt-s = 'workspace S' - alt-t = 'workspace T' - alt-u = 'workspace U' - alt-v = 'workspace V' - alt-w = 'workspace W' - alt-x = 'workspace X' - alt-y = 'workspace Y' - alt-z = 'workspace Z' - - # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace - alt-shift-1 = 'move-node-to-workspace 1' - alt-shift-2 = 'move-node-to-workspace 2' - alt-shift-3 = 'move-node-to-workspace 3' - alt-shift-4 = 'move-node-to-workspace 4' - alt-shift-5 = 'move-node-to-workspace 5' - alt-shift-6 = 'move-node-to-workspace 6' - alt-shift-7 = 'move-node-to-workspace 7' - alt-shift-8 = 'move-node-to-workspace 8' - alt-shift-9 = 'move-node-to-workspace 9' - alt-shift-a = 'move-node-to-workspace A' - alt-shift-b = 'move-node-to-workspace B' - alt-shift-c = 'move-node-to-workspace C' - alt-shift-d = 'move-node-to-workspace D' - alt-shift-e = 'move-node-to-workspace E' - alt-shift-f = 'move-node-to-workspace F' - alt-shift-g = 'move-node-to-workspace G' - alt-shift-i = 'move-node-to-workspace I' - alt-shift-m = 'move-node-to-workspace M' - alt-shift-n = 'move-node-to-workspace N' - alt-shift-o = 'move-node-to-workspace O' - alt-shift-p = 'move-node-to-workspace P' - alt-shift-q = 'move-node-to-workspace Q' - alt-shift-r = 'move-node-to-workspace R' - alt-shift-s = 'move-node-to-workspace S' - alt-shift-t = 'move-node-to-workspace T' - alt-shift-u = 'move-node-to-workspace U' - alt-shift-v = 'move-node-to-workspace V' - alt-shift-w = 'move-node-to-workspace W' - alt-shift-x = 'move-node-to-workspace X' - alt-shift-y = 'move-node-to-workspace Y' - alt-shift-z = 'move-node-to-workspace Z' - - # See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth - alt-tab = 'workspace-back-and-forth' - # See: https://nikitabobko.github.io/AeroSpace/commands#move-workspace-to-monitor - alt-shift-tab = 'move-workspace-to-monitor --wrap-around next' - - # See: https://nikitabobko.github.io/AeroSpace/commands#mode - alt-shift-semicolon = 'mode service' - -# 'service' binding mode declaration. -# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes -[mode.service.binding] - esc = ['reload-config', 'mode main'] - r = ['flatten-workspace-tree', 'mode main'] # reset layout - f = ['layout floating tiling', 'mode main'] # Toggle between floating and tiling layout - backspace = ['close-all-windows-but-current', 'mode main'] - - # sticky is not yet supported https://github.com/nikitabobko/AeroSpace/issues/2 - #s = ['layout sticky tiling', 'mode main'] - - alt-shift-h = ['join-with left', 'mode main'] - alt-shift-j = ['join-with down', 'mode main'] - alt-shift-k = ['join-with up', 'mode main'] - alt-shift-l = ['join-with right', 'mode main'] - - down = 'volume down' - up = 'volume up' - shift-down = ['volume set 0', 'mode main'] diff --git a/src_files/.config/git/ignore b/src_files/.config/git/ignore index 0a29fe4..20d4725 100644 --- a/src_files/.config/git/ignore +++ b/src_files/.config/git/ignore @@ -2,8 +2,12 @@ .tmux-session-hydrate zxcv* -# cache/build/etc +# compilation/debug/cache/build/etc +**/build/ **/__pycache__/ +*.o +*.pch +*.dSYM # lang/package mise*.toml diff --git a/src_files/.config/nvim/lua/plugins_lazy/telescope.lua b/src_files/.config/nvim/lua/plugins_lazy/telescope.lua index 9ca45e0..ac7e3a7 100644 --- a/src_files/.config/nvim/lua/plugins_lazy/telescope.lua +++ b/src_files/.config/nvim/lua/plugins_lazy/telescope.lua @@ -17,7 +17,7 @@ return { pickers = { find_files = { find_command = { - "rg", "--no-ignore", "--hidden", "--files", + "rg", "--hidden", "--files", -- "--no-ignore", "-g", "!**/.git/**", "-g", "!**/build/**", "-g", "!**/node_modules/**", @@ -25,7 +25,7 @@ return { }, live_grep = { additional_args = { - "--no-ignore", "--hidden", + "--hidden", "--no-binary", -- "--no-ignore", "-g", "!**/.git/**", "-g", "!**/build/**", "-g", "!**/node_modules/**", diff --git a/src_files/.config/obsidian/app.json b/src_files/.config/obsidian/app.json index 737b6b2..28bef47 100644 --- a/src_files/.config/obsidian/app.json +++ b/src_files/.config/obsidian/app.json @@ -5,13 +5,14 @@ "autoPairBrackets": false, "autoPairMarkdown": false, "useTab": false, - "autoConvertHtml": false, - "vimMode": true, + "autoConvertHtml": true, + "vimMode": false, "trashOption": "none", "newFileLocation": "folder", "newFileFolderPath": "inbox", "showUnsupportedFiles": true, "attachmentFolderPath": "inbox", "showInlineTitle": false, - "readableLineLength": false + "readableLineLength": false, + "livePreview": false } \ No newline at end of file diff --git a/src_files/.config/obsidian/appearance.json b/src_files/.config/obsidian/appearance.json index 4be83d6..8326fc5 100644 --- a/src_files/.config/obsidian/appearance.json +++ b/src_files/.config/obsidian/appearance.json @@ -1,4 +1,5 @@ { "theme": "obsidian", - "accentColor": "#2f930e" + "accentColor": "#2f930e", + "baseFontSize": 18 } \ No newline at end of file diff --git a/src_files/.config/obsidian/graph.json b/src_files/.config/obsidian/graph.json new file mode 100644 index 0000000..e21a18d --- /dev/null +++ b/src_files/.config/obsidian/graph.json @@ -0,0 +1,22 @@ +{ + "collapse-filter": true, + "search": "", + "showTags": false, + "showAttachments": false, + "hideUnresolved": false, + "showOrphans": true, + "collapse-color-groups": true, + "colorGroups": [], + "collapse-display": true, + "showArrow": false, + "textFadeMultiplier": 0, + "nodeSizeMultiplier": 1, + "lineSizeMultiplier": 1, + "collapse-forces": true, + "centerStrength": 0.518713248970312, + "repelStrength": 10, + "linkStrength": 1, + "linkDistance": 250, + "scale": 1, + "close": false +} \ No newline at end of file diff --git a/src_files/.config/obsidian/hotkeys.json b/src_files/.config/obsidian/hotkeys.json index f78d228..d0c186b 100644 --- a/src_files/.config/obsidian/hotkeys.json +++ b/src_files/.config/obsidian/hotkeys.json @@ -1,16 +1,18 @@ { "markdown:toggle-preview": [ - { - "modifiers": [ - "Mod" - ], - "key": "E" - }, { "modifiers": [ "Alt" ], "key": "R" } + ], + "switcher:open": [ + { + "modifiers": [ + "Ctrl" + ], + "key": "F" + } ] } \ No newline at end of file diff --git a/src_files/.config/zsh/zsh-general-dev b/src_files/.config/zsh/zsh-general-dev index 8cbbbdc..e707c49 100644 --- a/src_files/.config/zsh/zsh-general-dev +++ b/src_files/.config/zsh/zsh-general-dev @@ -10,6 +10,7 @@ alias login-aws-id-list="grep sso_account_id $HOME/.aws/config" alias gfo='git fetch origin' alias gfl='git fetch origin; git log' alias gpo='git pull origin' +alias gppo='git push origin' alias gst='git status' alias git-push-to-temp='git branch -D temp; git checkout -b temp; git push origin temp -uf; git checkout -' alias gptemp='git-push-to-temp'