Compare commits

..

4 Commits

Author SHA1 Message Date
43de177a64 add script 2025-10-12 22:49:19 -05:00
62a5233ddf temp, testing 2025-10-12 22:42:32 -05:00
158b6a285d Adjust workspace use and related aerospace configs; minor other changes 2025-10-12 22:40:46 -05:00
05ab1fb1b1 Fix gimp configs and launch script for gimp v3 2025-10-08 13:52:44 -05:00
38 changed files with 475 additions and 287 deletions

View File

@@ -13,14 +13,21 @@
- manual settings, refer to [ref/macos-system-settings](ref/macos-system-settings.txt) - manual settings, refer to [ref/macos-system-settings](ref/macos-system-settings.txt)
### script run ### script run
- (run these commands from repo's root dir) - to do the full setup, from git root dir, run: `./box_setup.sh`
- to do the full setup, run: `./box_setup.sh` - to copy dotfiles only, from git root dir, run: `./copy_dotfiles.sh`
- to copy dotfiles only, run: `./copy_dotfiles.sh`
### after script run ### 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 ### todo items
- choose window manager for linux, then configure - choose window manager for linux, then configure
- config for: terminal (ghostty); shell; mpd, mpc, ncmpcpp; mpv - config for: terminal (ghostty); shell; mpd, mpc, ncmpcpp; mpv
- decide on docker? or alternatives like podman? any license concerns? - 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

View File

@@ -12,5 +12,16 @@ ${=BOX_SETUP_INSTALL_COMMAND} \
grep \ grep \
ripgrep 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_OS" = "macos" ]] &&
${=BOX_SETUP_INSTALL_COMMAND} coreutils ${=BOX_SETUP_INSTALL_COMMAND} coreutils findutils

View File

@@ -1,8 +1,10 @@
#!/bin/zsh #!/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='' # install_option_prefix=''
# [[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask' # [[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask'
# firefox_package_name='firefox' # 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" # ${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" "$firefox_package_name"

View File

@@ -8,15 +8,16 @@ idea from the ThePrimeagen: designated workspace/label/desktop per app/purpose
| workspace number | wm layout/mode | | workspace number | wm layout/mode |
|--------------------------------------------------------------|------------------------| |--------------------------------------------------------------|------------------------|
| 1. notes/drawing (stack: nvim, obsidian, gimp) | stack | | 1. notes (stack: nvim, obsidian) | stack |
| 2. music makeing - misc | stack | | 2. music makeing - misc | stack |
| 3. music making - daw | floating (workaround) | | 3. music making - daw | floating (workaround) |
| 4. music/audio listening | stack | | 4. drawing (currently: gimp) | stack |
| 5. general - misc (catch-all) | stack | | 5. music/audio listening | stack |
| 6. comms (stack: emails, chats, av/calls) | 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 | | 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: ### ideas/guidelines:
- use this consistently accross all machines - use this consistently accross all machines

View File

@@ -9,7 +9,7 @@ enable-normalization-opposite-orientation-for-nested-containers = true
accordion-padding = 0 # ref: https://nikitabobko.github.io/AeroSpace/guide#layouts accordion-padding = 0 # ref: https://nikitabobko.github.io/AeroSpace/guide#layouts
default-root-container-layout = 'accordion' # tiles|accordion 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 # refs: https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks
# https://nikitabobko.github.io/AeroSpace/commands#move-mouse # 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 # See: https://nikitabobko.github.io/AeroSpace/commands#layout
alt-slash = 'layout tiles horizontal vertical' alt-comma = 'layout v_accordion'
alt-comma = 'layout accordion horizontal vertical' alt-period = 'layout h_tiles'
alt-slash = 'layout horizontal vertical'
# See: https://nikitabobko.github.io/AeroSpace/commands#focus # See: https://nikitabobko.github.io/AeroSpace/commands#focus
# new windows are added to the stack "below" the current, so swap up and down # 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-7 = 'workspace 7'
alt-8 = 'workspace 8' alt-8 = 'workspace 8'
alt-9 = 'workspace 9' alt-9 = 'workspace 9'
alt-0 = 'workspace 0'
# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
alt-shift-1 = 'move-node-to-workspace 1' 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-7 = 'move-node-to-workspace 7'
alt-shift-8 = 'move-node-to-workspace 8' alt-shift-8 = 'move-node-to-workspace 8'
alt-shift-9 = 'move-node-to-workspace 9' alt-shift-9 = 'move-node-to-workspace 9'
alt-shift-0 = 'move-node-to-workspace 0'
# See: https://nikitabobko.github.io/AeroSpace/commands#mode # See: https://nikitabobko.github.io/AeroSpace/commands#mode
alt-shift-semicolon = 'mode service' alt-shift-semicolon = 'mode service'
@@ -117,9 +120,8 @@ automatically-unhide-macos-hidden-apps = true
r = ['flatten-workspace-tree', 'mode main'] # reset layout r = ['flatten-workspace-tree', 'mode main'] # reset layout
f = ['flatten-workspace-tree', 'layout floating', 'mode main'] f = ['flatten-workspace-tree', 'layout floating', 'mode main']
t = ['flatten-workspace-tree', 'layout tiling', 'mode main'] s = ['flatten-workspace-tree', 'layout v_accordion', 'mode main']
s = ['layout v_accordion', 'mode main'] g = ['flatten-workspace-tree', 'layout h_tiles', 'mode main']
g = ['layout v_tiles', 'mode main']
alt-shift-h = ['join-with left', 'mode main'] alt-shift-h = ['join-with left', 'mode main']
alt-shift-j = ['join-with down', 'mode main'] alt-shift-j = ['join-with down', 'mode main']

View File

@@ -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']

View File

@@ -0,0 +1,9 @@
# GIMP colorrc
#
# This file holds a list of recently used colors.
(color-history
(color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0)
(color "R'G'B'A float" 16 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\200\77" 0))
# end of colorrc

View File

@@ -0,0 +1,18 @@
# GIMP user context
(tool "gimp-pencil-tool")
(paint-info "gimp-pencil")
(foreground
(color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
(background
(color "R'G'B'A float" 16 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\200\77" 0))
(brush "2. Hardness 050")
(dynamics "Pressure Opacity")
(mybrush "100% Opaque")
(pattern "Pine")
(gradient "FG to BG (RGB)")
(palette "Color History")
(font "Sans-serif")
(tool-preset "Core Pointer")
# end of user context

View File

@@ -1,11 +1,10 @@
# GIMP gimprc # GIMP gimprc
# #
# personal gimprc file, takes precedence over values in system-wide gimprc # personal gimprc file, takes precedence over values in system-wide gimprc
# most values can be set within gimp by changing options in the preferences dialog
# if changing within gimp, make sure i copy those settings into my dotfiles src_files # if changing within gimp, make sure i copy those settings into my dotfiles src_files
(tile-cache-size 4G) (prev-language "en-US")
(theme "Dark") (config-version "3.0.6")
(default-image (default-image
(width 2480) (width 2480)
(height 1748) (height 1748)
@@ -14,36 +13,28 @@
(yresolution 300) (yresolution 300)
(resolution-unit inches) (resolution-unit inches)
(image-type rgb) (image-type rgb)
(precision u8-gamma) (precision u8-non-linear)
(color-managed yes)
(color-profile NULL) (color-profile NULL)
(simulation-profile NULL)
(simulation-bpc no)
(simulation-intent relative-colorimetric)
(fill-type background) (fill-type background)
(comment "Created with GIMP")) (comment ""))
(default-grid
(style dots)
(fgcolor (color-rgba 1 1 1 1))
(bgcolor (color-rgba 0 0 0 1))
(xspacing 10)
(yspacing 10)
(spacing-unit inches)
(xoffset 0)
(yoffset 0)
(offset-unit inches))
(undo-size 1024M)
(quick-mask-color (color-rgba 0 0.64095744680851063 0.2932039384336802 0.5))
(import-raw-plug-in "${gimp_plug_in_dir}/plug-ins/file-raw-placeholder/file-raw-placeholder") (import-raw-plug-in "${gimp_plug_in_dir}/plug-ins/file-raw-placeholder/file-raw-placeholder")
(debug-policy never)
(check-updates no) (check-updates no)
(check-update-timestamp 1730568274) (check-update-timestamp 1759871981)
(monitor-xresolution 129) (monitor-xresolution 129)
(monitor-yresolution 129) (monitor-yresolution 129)
(show-welcome-dialog no)
(fill-options (fill-options
(style solid) (style fg-color)
(custom-style solid-color)
(antialias yes) (antialias yes)
(feather no) (feather no)
(feather-radius 10)) (feather-radius 10))
(stroke-options (stroke-options
(style solid) (style fg-color)
(custom-style solid-color)
(antialias yes) (antialias yes)
(feather no) (feather no)
(feather-radius 10) (feather-radius 10)

View File

@@ -1,2 +0,0 @@
(gtk_accel_path "<Actions>/view/view-zoom-fit-in" "<Shift><Control>j")
(gtk_accel_path "<Actions>/windows/windows-hide-docks" "<Shift><Control>d")

View File

@@ -0,0 +1,3 @@
(file-version 1)
(action "windows-hide-docks" "<Shift><Control>d")
(action "view-zoom-fit-in" "<Shift><Control>f")

View File

@@ -1,13 +1,13 @@
# GIMP gimp-paintbrush-tool options # GIMP gimp-paintbrush-tool options
(foreground (color-rgb 1 1 1)) (background
(background (color-rgb 0 0 0)) (color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
(brush "2. Hardness 050") (brush "2. Hardness 050")
(dynamics "Pressure Opacity") (dynamics "Pressure Opacity")
(pattern "Pine")
(gradient "FG to BG (RGB)") (gradient "FG to BG (RGB)")
(palette "Color History") (palette "Color History")
(brush-size 2.0) (brush-size 2.0)
(brush-hardness 0.5) (brush-hardness 0.5)
(brush-link-size no)
# end of gimp-paintbrush-tool options # end of gimp-paintbrush-tool options

View File

@@ -1,13 +1,13 @@
# GIMP gimp-pencil-tool options # GIMP gimp-pencil-tool options
(foreground (color-rgb 1 1 1)) (background
(background (color-rgb 0 0 0)) (color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
(brush "2. Hardness 050") (brush "2. Hardness 050")
(dynamics "Pressure Opacity") (dynamics "Pressure Opacity")
(pattern "Pine")
(gradient "FG to BG (RGB)") (gradient "FG to BG (RGB)")
(palette "Color History") (palette "Color History")
(brush-size 2.0) (brush-size 2.0)
(brush-hardness 0.5) (brush-hardness 0.5)
(brush-link-size no)
# end of gimp-pencil-tool options # end of gimp-pencil-tool options

View File

@@ -2,8 +2,12 @@
.tmux-session-hydrate .tmux-session-hydrate
zxcv* zxcv*
# cache/build/etc # compilation/debug/cache/build/etc
**/build/
**/__pycache__/ **/__pycache__/
*.o
*.pch
*.dSYM
# lang/package # lang/package
mise*.toml mise*.toml

View File

@@ -4,7 +4,7 @@ local csgAutocmd = vim.api.nvim_create_autocmd
require("settings") require("settings")
require("plugin_manager") require("plugin_manager")
require("key_mappings") require("key_mappings")
require("colorscheme_settings") require("theme")
csgAutocmd({"BufWritePre"}, { csgAutocmd({"BufWritePre"}, {
group = csGroup, group = csGroup,

View File

@@ -1,17 +0,0 @@
local defaultColorScheme = "tokyodark"
function SetColorSchemeWrapper(scheme)
scheme = scheme or defaultColorScheme
vim.cmd.colorscheme(scheme)
end
SetColorSchemeWrapper(defaultColorScheme)
--
-- SetColorSchemeWrapper("tokyodark")
-- SetColorSchemeWrapper("tokyonight-night")
-- SetColorSchemeWrapper("bamboo-vulgaris")
-- SetColorSchemeWrapper("rose-pine-main")
-- SetColorSchemeWrapper("gruvbox")
-- SetColorSchemeWrapper("slate")
-- SetColorSchemeWrapper("sorbet")

View File

@@ -26,4 +26,9 @@ require("lazy").setup({
}, },
checker = { enabled = false }, checker = { enabled = false },
change_detection = { notify = false }, change_detection = { notify = false },
dev = {
path = "~/dev/git/other/omarchy/plugins",
patterns = { 'LazyVim' },
fallback = false,
},
}) })

View File

@@ -17,7 +17,7 @@ return {
pickers = { pickers = {
find_files = { find_files = {
find_command = { find_command = {
"rg", "--no-ignore", "--hidden", "--files", "rg", "--hidden", "--files", -- "--no-ignore",
"-g", "!**/.git/**", "-g", "!**/.git/**",
"-g", "!**/build/**", "-g", "!**/build/**",
"-g", "!**/node_modules/**", "-g", "!**/node_modules/**",
@@ -25,7 +25,7 @@ return {
}, },
live_grep = { live_grep = {
additional_args = { additional_args = {
"--no-ignore", "--hidden", "--hidden", "--no-binary", -- "--no-ignore",
"-g", "!**/.git/**", "-g", "!**/.git/**",
"-g", "!**/build/**", "-g", "!**/build/**",
"-g", "!**/node_modules/**", "-g", "!**/node_modules/**",

View File

@@ -0,0 +1,31 @@
local defaultColorScheme = "tokyodark"
-- local defaultColorScheme = "tokyonight-night"
-- local defaultColorScheme = "bamboo-vulgaris"
-- local defaultColorScheme = "rose-pine-main"
-- local defaultColorScheme = "gruvbox"
-- local defaultColorScheme = "slate"
-- local defaultColorScheme = "sorbet"
local ok, theme_specs = pcall(dofile, (os.getenv('DIR_CURRENT_THEME') or "") .. "/neovim.lua")
if not ok then
vim.notify(
'current theme file not found, using default: ' .. defaultColorScheme,
vim.log.levels.INFO
)
vim.cmd.colorscheme(defaultColorScheme)
return
end
local first = theme_specs[1]
local plugin_name = (type(first.name) == 'string' and first.name)
or (type(first[1]) == 'string' and first[1]:match('.*/(.*)'))
or 'plugin_name_not_found'
local last = theme_specs[#theme_specs]
local colorscheme = ((type(last.opts) == 'table' and type(last.opts.colorscheme) == 'string') and last.opts.colorscheme)
or plugin_name:gsub("%.%w+$", "")
colorscheme = (colorscheme == 'plugin_name_not_found' and defaultColorScheme)
or colorscheme
vim.cmd.colorscheme(colorscheme)

View File

@@ -5,13 +5,14 @@
"autoPairBrackets": false, "autoPairBrackets": false,
"autoPairMarkdown": false, "autoPairMarkdown": false,
"useTab": false, "useTab": false,
"autoConvertHtml": false, "autoConvertHtml": true,
"vimMode": true, "vimMode": false,
"trashOption": "none", "trashOption": "none",
"newFileLocation": "folder", "newFileLocation": "folder",
"newFileFolderPath": "inbox", "newFileFolderPath": "inbox",
"showUnsupportedFiles": true, "showUnsupportedFiles": true,
"attachmentFolderPath": "inbox", "attachmentFolderPath": "inbox",
"showInlineTitle": false, "showInlineTitle": false,
"readableLineLength": false "readableLineLength": false,
"livePreview": false
} }

View File

@@ -1,4 +1,5 @@
{ {
"theme": "obsidian", "theme": "obsidian",
"accentColor": "#2f930e" "accentColor": "#2f930e",
"baseFontSize": 18
} }

View File

@@ -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
}

View File

@@ -1,16 +1,18 @@
{ {
"markdown:toggle-preview": [ "markdown:toggle-preview": [
{
"modifiers": [
"Mod"
],
"key": "E"
},
{ {
"modifiers": [ "modifiers": [
"Alt" "Alt"
], ],
"key": "R" "key": "R"
} }
],
"switcher:open": [
{
"modifiers": [
"Ctrl"
],
"key": "F"
}
] ]
} }

View File

@@ -10,6 +10,7 @@ alias login-aws-id-list="grep sso_account_id $HOME/.aws/config"
alias gfo='git fetch origin' alias gfo='git fetch origin'
alias gfl='git fetch origin; git log' alias gfl='git fetch origin; git log'
alias gpo='git pull origin' alias gpo='git pull origin'
alias gppo='git push origin'
alias gst='git status' 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 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' alias gptemp='git-push-to-temp'

View File

@@ -2,7 +2,7 @@
# for reference, default macos directory was in $HOME/Library/Application Support/GIMP/ # for reference, default macos directory was in $HOME/Library/Application Support/GIMP/
nohup \ nohup \
env GIMP2_DIRECTORY=$XDG_CONFIG_HOME/gimp \ env GIMP3_DIRECTORY="$XDG_CONFIG_HOME/gimp" \
/Applications/GIMP.app/Contents/MacOS/gimp \ /Applications/GIMP.app/Contents/MacOS/gimp \
> /dev/null 2>&1 \ > /dev/null 2>&1 \
& &

View File

@@ -0,0 +1,68 @@
return {
{
"ellisonleao/gruvbox.nvim",
name = "gruvbox",
-- lazy = false,
-- priority = 1000,
opts = {
terminal_colors = true, -- add neovim terminal colors
undercurl = true,
underline = true,
bold = true,
italic = {
strings = true,
emphasis = true,
comments = true,
operators = false,
folds = true,
},
strikethrough = true,
invert_selection = false,
invert_signs = false,
invert_tabline = false,
inverse = true, -- invert background for search, diffs, statuslines and errors
contrast = "", -- "hard", "soft", or ""
palette_overrides = {},
overrides = {},
dim_inactive = false,
transparent_mode = false,
},
},
{
"folke/tokyonight.nvim",
lazy = false,
priority = 1000,
opts = {
style = "night", -- "night", "storm", "moon", "day"
styles = {
functions = {} -- disable italic for functions
},
on_colors = function(colors)
colors.hint = colors.orange
colors.error = "#ff0000"
colors.fg_gutter = "#9098B8"
end,
},
},
{
"tiagovla/tokyodark.nvim",
lazy = false,
priority = 1000,
opts = {
custom_highlights = function(highlights, _palette)
highlights.Comment['fg'] = "#8a9097"
highlights.LineNr['fg'] = "#8088A8"
return highlights
end,
},
},
{
'ribru17/bamboo.nvim',
-- lazy = false,
-- priority = 1000,
config = function()
require('bamboo').setup { }
require('bamboo').load()
end,
},
}

View File

@@ -0,0 +1,11 @@
return {
{
'ribru17/bamboo.nvim',
-- lazy = false,
-- priority = 1000,
config = function()
require('bamboo').setup { }
require('bamboo').load()
end,
},
}

View File

@@ -0,0 +1,19 @@
return {
{
"catppuccin/nvim",
name = "catppuccin",
priority = 1000,
config = function()
require("catppuccin").setup({
flavour = "latte", -- other options: "mocha", "frappe", "macchiato"
})
vim.cmd.colorscheme("catppuccin-latte")
end,
},
{
"LazyVim/LazyVim",
opts = {
colorscheme = "catppuccin-latte",
},
},
}

View File

@@ -0,0 +1,15 @@
return {
{
"neanias/everforest-nvim",
opts = {
background = "soft",
},
},
{
"LazyVim/LazyVim",
opts = {
colorscheme = "everforest",
background = "soft",
},
},
}

View File

@@ -0,0 +1,31 @@
return {
{
"ellisonleao/gruvbox.nvim",
name = "gruvbox",
-- lazy = false,
-- priority = 1000,
opts = {
terminal_colors = true, -- add neovim terminal colors
undercurl = true,
underline = true,
bold = true,
italic = {
strings = true,
emphasis = true,
comments = true,
operators = false,
folds = true,
},
strikethrough = true,
invert_selection = false,
invert_signs = false,
invert_tabline = false,
inverse = true, -- invert background for search, diffs, statuslines and errors
contrast = "", -- "hard", "soft", or ""
palette_overrides = {},
overrides = {},
dim_inactive = false,
transparent_mode = false,
},
},
}

View File

@@ -0,0 +1,9 @@
return {
{ "tahayvr/matteblack.nvim", lazy = false, priority = 1000 },
{
"LazyVim/LazyVim",
opts = {
colorscheme = "matteblack",
},
},
}

View File

@@ -0,0 +1,9 @@
return {
{ "EdenEast/nightfox.nvim" },
{
"LazyVim/LazyVim",
opts = {
colorscheme = "nordfox",
},
},
}

View File

@@ -0,0 +1,14 @@
return {
{
"tiagovla/tokyodark.nvim",
lazy = false,
priority = 1000,
opts = {
custom_highlights = function(highlights, _palette)
highlights.Comment['fg'] = "#8a9097"
highlights.LineNr['fg'] = "#8088A8"
return highlights
end,
},
},
}

View File

@@ -0,0 +1,18 @@
return {
{
"folke/tokyonight.nvim",
lazy = false,
priority = 1000,
opts = {
style = "night", -- "night", "storm", "moon", "day"
styles = {
functions = {} -- disable italic for functions
},
on_colors = function(colors)
colors.hint = colors.orange
colors.error = "#ff0000"
colors.fg_gutter = "#9098B8"
end,
},
},
}

View File

@@ -0,0 +1,14 @@
return {
{
"tiagovla/tokyodark.nvim",
lazy = false,
priority = 1000,
opts = {
custom_highlights = function(highlights, _palette)
highlights.Comment['fg'] = "#8a9097"
highlights.LineNr['fg'] = "#8088A8"
return highlights
end,
},
},
}

View File

@@ -0,0 +1,8 @@
local M = {}
M.opts = {}
function M.setup(opts)
end
return M

86
theme-switcher-testing/zxcv.sh Executable file
View File

@@ -0,0 +1,86 @@
#!/bin/bash
# OMARCHY_CURRENT_THEME_NEOVIM="~/.config/omarchy/current/theme/neovim.lua"
OMARCHY_CURRENT_THEME_NEOVIM="./neovim.lua"
if [[ ! -f "$OMARCHY_CURRENT_THEME_NEOVIM" ]]; then
echo "neovim theme not found for live update: $OMARCHY_CURRENT_THEME_NEOVIM" >&2
exit 1
fi
read -r plugin_name colorscheme_name <<< "$(
nvim -l <(cat << NESTED_LUA_BLOCK
local ok, plugins = pcall(dofile, '${OMARCHY_CURRENT_THEME_NEOVIM}')
if not ok then
print('ERROR: could not load neovim theme file for live update')
os.exit(1)
end
local first = plugins[1]
local plugin_name = (type(first.name) == 'string' and first.name)
or (type(first[1]) == 'string' and first[1]:match('.*/(.*)'))
or 'plugin_name_not_found'
if plugin_name == 'plugin_name_not_found' then
print('ERROR: could not detect neovim theme plugin for live update')
os.exit(1)
end
local last = plugins[#plugins]
local colorscheme = ((type(last.opts) == 'table' and type(last.opts.colorscheme) == 'string') and last.opts.colorscheme)
or plugin_name:gsub("%.%w+$", "")
vim.print(plugin_name .. " " .. colorscheme)
NESTED_LUA_BLOCK
) > /dev/stdout 2>&1 | tr -d '\r'
)"
nvim --headless +"lua require(\"lazy\").install({ show = false, wait = true })" +q > /dev/null 2>&1
nvim_stdpath_run=$(dirname $(nvim -l <(echo "vim.cmd.echo('stdpath(\"run\")')") > /dev/stdout 2>&1))
find "$nvim_stdpath_run" -type s -name "nvim*" 2> /dev/null |
while IFS= read -r nvim_server; do
# echo "running for $nvim_server"
timeout 2s nvim --server "$nvim_server" \
--remote-expr "execute('lua require(\"lazy\").install({ show = false, wait = true })')" \
> /dev/null 2>&1
timeout 4s nvim --server "$nvim_server" \
--remote-expr "execute('lua require(\"lazy\").load({ show = false, wait = true, plugins = { \"$plugin_name\" } })')" \
> /dev/null 2>&1
timeout 2s nvim --server "$nvim_server" \
--remote-expr "execute('colorscheme $colorscheme_name')" \
> /dev/null 2>&1
# echo "finished for $nvim_server"
done
##########################################################################################
# ln -snf ~/dev/git/other/omarchy/neovim.lua ~/.config/nvim/lua/plugins_lazy/colorschemes.lua
# ref only
# lua require("lazy").install({ show = false, wait = true })
# lua require("lazy").load({ show = false, wait = true, plugins = { "nightfox.nvim" } })
# lua require("lazy").build({ show = false, wait = true, plugins = { name = "tokyonight.nvim" } })
# lua require("lazy").reload({ show = false, wait = true, plugins = { name = "tokyonight.nvim" } })
# get neovim theme file, parse as lua? load the tables and get first value in each, as well as a name if one is set
# if name is set, that is plugin name which lazy.nvim knows, if not, then take the value after the / in the git repo name
# also, in the final table, parse out the colorscheme value, that is what needs to be passed to my loop below
# if none is present, then default to the plugin name from above, but trim off any .suffix like .nvim
# # nvim_sockets=$(find /var/folders -type s -user "$USERNAME" -name "nvim*" -path "*nvim.$USERNAME*" 2> /dev/null)
# nvim_sockets=$(find /var/folders -type s -name "nvim*" -path "*nvim.*" 2> /dev/null)
# # for s in "${nvim_sockets[@]}"; do
# for s in $nvim_sockets; do
# echo "will run for $s"
# # nvim --server "$s" --remote-expr "execute('colorscheme $1')"
# done
# find /var/folders -type s -name "nvim*" -path "*nvim.*" 2> /dev/null | while IFS= read -r server; do
# nvim -l <(echo "vim.cmd.echo('stdpath(\"run\")')") > /dev/stdout 2>&1 |
# dirname $@ |
# find $@ -type s -name "nvim*" 2> /dev/null |
# while IFS= read -r server; do
# timeout 0.5s nvim --server "$server" --remote-expr "execute('colorscheme $1')" > /dev/null 2>&1
# done