Compare commits
3 Commits
f1700e1d3d
...
bde573e35b
| Author | SHA1 | Date | |
|---|---|---|---|
| bde573e35b | |||
| c5b93865d0 | |||
| 2ca301b3e2 |
3
.tmux-session-hydrate
Normal file
3
.tmux-session-hydrate
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
source "$XDG_CONFIG_HOME/tmux/.tmux-session-hydrate-default"
|
||||||
|
tmux rename-window -t procs nv-kickstart
|
||||||
|
tmux send-keys -t :nv-kickstart "cd $DIR_GIT_PROJECTS/other/kickstart.nvim" c-M
|
||||||
@@ -49,13 +49,12 @@ export BOX_SETUP_UPDATE_PKG_MANAGER_AND_DEFS_CMD="$update_pkg_manager_and_defs_c
|
|||||||
export BOX_SETUP_UPDATE_PKGS_CMD="$update_pkgs_cmd"
|
export BOX_SETUP_UPDATE_PKGS_CMD="$update_pkgs_cmd"
|
||||||
|
|
||||||
# make dirs and copy configs/dotfiles
|
# make dirs and copy configs/dotfiles
|
||||||
source ./src_files/.config/zsh/.zshenv
|
. ./src_files/shell/profile
|
||||||
./make_dirs.sh
|
./make_dirs.sh
|
||||||
./copy_dotfiles.sh $1
|
./copy_dotfiles.sh $1
|
||||||
|
|
||||||
# install programs
|
# install programs
|
||||||
source $ZDOTDIR/.zshenv
|
. $ZDOTDIR/.zshrc
|
||||||
source $ZDOTDIR/.zshrc
|
|
||||||
./install_programs.sh $1
|
./install_programs.sh $1
|
||||||
|
|
||||||
echo "setting the default theme: $DEFAULT_THEME_NAME"
|
echo "setting the default theme: $DEFAULT_THEME_NAME"
|
||||||
|
|||||||
@@ -34,11 +34,14 @@ sym_link() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
echo "---- copying dotfiles ------------------"
|
echo "---- copying dotfiles ------------------"
|
||||||
source src_files/.config/zsh/.zshenv
|
. ./src_files/shell/profile
|
||||||
copy_file src_files/.config/zsh/.zshenv $HOME # copy first, ensure $ZDOTDIR set
|
|
||||||
# copy_file src_files/.config/ksh/.profile $HOME # TODO: if using oksh, get it working
|
|
||||||
|
|
||||||
# configs/executables/scripts from .config and .local
|
# copy over env/profile files used by shell(s)
|
||||||
|
copy_file src_files/shell/profile $XDG_CONFIG_HOME
|
||||||
|
copy_file src_files/shell/.profile $HOME
|
||||||
|
copy_file src_files/.config/zsh/.zshenv $HOME
|
||||||
|
|
||||||
|
# copy over configs, executables, and scripts
|
||||||
copy_dir src_files/.config $XDG_CONFIG_HOME
|
copy_dir src_files/.config $XDG_CONFIG_HOME
|
||||||
copy_dir src_files/.local/bin $DIR_BIN
|
copy_dir src_files/.local/bin $DIR_BIN
|
||||||
copy_dir src_files/.local/scripts $DIR_SCRIPTS
|
copy_dir src_files/.local/scripts $DIR_SCRIPTS
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/zsh
|
#!/bin/zsh
|
||||||
|
|
||||||
echo "---- making system dirs ----------------"
|
echo "---- making system dirs ----------------"
|
||||||
source ./src_files/.config/zsh/.zshenv # ensure env vars set for use below
|
. ./src_files/shell/profile # ensure env vars set for use below
|
||||||
|
|
||||||
# some standard/common directories, some overlap/use in XDG directories
|
# some standard/common directories, some overlap/use in XDG directories
|
||||||
[[ ! -d "$DIR_LOCAL" ]] && mkdir -p "$DIR_LOCAL"
|
[[ ! -d "$DIR_LOCAL" ]] && mkdir -p "$DIR_LOCAL"
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ macos_custom_beam_cursor yes
|
|||||||
# theme stuff
|
# theme stuff
|
||||||
# NOTE: on linux, may want background_opacity at 1.0 and let hyprland handle transparency
|
# NOTE: on linux, may want background_opacity at 1.0 and let hyprland handle transparency
|
||||||
include ~/.config/kitty/theme.conf
|
include ~/.config/kitty/theme.conf
|
||||||
background_opacity 0.95
|
background_opacity 0.94
|
||||||
|
|
||||||
# etc
|
# etc
|
||||||
enable_audio_bell no
|
enable_audio_bell no
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ return {
|
|||||||
settings = {
|
settings = {
|
||||||
save_on_toggle = true,
|
save_on_toggle = true,
|
||||||
sync_on_ui_close = true,
|
sync_on_ui_close = true,
|
||||||
}
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,123 +1,130 @@
|
|||||||
return {
|
return {
|
||||||
"neovim/nvim-lspconfig",
|
{
|
||||||
dependencies = {
|
"L3MON4D3/LuaSnip",
|
||||||
"stevearc/conform.nvim",
|
version = "v2.*",
|
||||||
"williamboman/mason.nvim",
|
-- build = "make install_jsregexp"
|
||||||
"williamboman/mason-lspconfig.nvim",
|
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
|
||||||
"hrsh7th/cmp-buffer",
|
|
||||||
"hrsh7th/cmp-path",
|
|
||||||
"hrsh7th/cmp-cmdline",
|
|
||||||
"hrsh7th/nvim-cmp",
|
|
||||||
"L3MON4D3/LuaSnip", -- snippets, using luasnip for now
|
|
||||||
"saadparwaiz1/cmp_luasnip", -- snippets, using luasnip for now
|
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
dependencies = {
|
||||||
|
"stevearc/conform.nvim",
|
||||||
|
"williamboman/mason.nvim",
|
||||||
|
"williamboman/mason-lspconfig.nvim",
|
||||||
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
|
"hrsh7th/cmp-buffer",
|
||||||
|
"hrsh7th/cmp-path",
|
||||||
|
"hrsh7th/cmp-cmdline",
|
||||||
|
"hrsh7th/nvim-cmp",
|
||||||
|
"L3MON4D3/LuaSnip", -- snippets, using luasnip for now
|
||||||
|
"saadparwaiz1/cmp_luasnip", -- snippets, using luasnip for now
|
||||||
|
},
|
||||||
|
|
||||||
config = function()
|
config = function()
|
||||||
require("conform").setup({ formatters_by_ft = {} })
|
require("conform").setup({ formatters_by_ft = {} })
|
||||||
local cmp = require('cmp')
|
local cmp = require('cmp')
|
||||||
local cmp_lsp = require("cmp_nvim_lsp")
|
local cmp_lsp = require("cmp_nvim_lsp")
|
||||||
local capabilities = vim.tbl_deep_extend(
|
local capabilities = vim.tbl_deep_extend(
|
||||||
"force",
|
"force",
|
||||||
{},
|
{},
|
||||||
vim.lsp.protocol.make_client_capabilities(),
|
vim.lsp.protocol.make_client_capabilities(),
|
||||||
cmp_lsp.default_capabilities()
|
cmp_lsp.default_capabilities()
|
||||||
)
|
)
|
||||||
|
|
||||||
require("mason").setup()
|
require("mason").setup()
|
||||||
require("mason-lspconfig").setup({
|
require("mason-lspconfig").setup({
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
"clangd",
|
"clangd",
|
||||||
"lua_ls",
|
"lua_ls",
|
||||||
-- "ruby_lsp",
|
-- "ruby_lsp",
|
||||||
-- "gopls",
|
-- "gopls",
|
||||||
-- "tailwindcss",
|
-- "tailwindcss",
|
||||||
},
|
},
|
||||||
handlers = {
|
handlers = {
|
||||||
function(server_name) -- default
|
function(server_name) -- default
|
||||||
require("lspconfig")[server_name].setup {
|
require("lspconfig")[server_name].setup {
|
||||||
capabilities = capabilities
|
capabilities = capabilities
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
|
|
||||||
["lua_ls"] = function()
|
["lua_ls"] = function()
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
lspconfig.lua_ls.setup {
|
lspconfig.lua_ls.setup {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
format = {
|
format = {
|
||||||
enable = true,
|
enable = true,
|
||||||
defaultConfig = { -- NOTE: string values only
|
defaultConfig = { -- NOTE: string values only
|
||||||
indent_style = "space",
|
indent_style = "space",
|
||||||
indent_size = "2",
|
indent_size = "2",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
}
|
||||||
}
|
end,
|
||||||
end,
|
}
|
||||||
}
|
})
|
||||||
})
|
|
||||||
|
|
||||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
mapping = cmp.mapping.preset.insert({
|
mapping = cmp.mapping.preset.insert({
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||||
['<C-u>'] = cmp.mapping.scroll_docs(4),
|
['<C-u>'] = cmp.mapping.scroll_docs(4),
|
||||||
}),
|
}),
|
||||||
snippet = {
|
snippet = {
|
||||||
expand = function(args)
|
expand = function(args)
|
||||||
-- vim.snippet.expand(args.body) -- TODO: native option, maybe try
|
-- vim.snippet.expand(args.body) -- TODO: native option, maybe try
|
||||||
require('luasnip').lsp_expand(args.body)
|
require('luasnip').lsp_expand(args.body)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = 'nvim_lsp' },
|
{ name = 'nvim_lsp' },
|
||||||
{ name = 'luasnip' },
|
{ name = 'luasnip' },
|
||||||
}, {
|
}, {
|
||||||
{ name = 'buffer' },
|
{ name = 'buffer' },
|
||||||
}),
|
}),
|
||||||
window = {
|
window = {
|
||||||
completion = cmp.config.window.bordered(),
|
completion = cmp.config.window.bordered(),
|
||||||
documentation = cmp.config.window.bordered(),
|
documentation = cmp.config.window.bordered(),
|
||||||
},
|
},
|
||||||
performance = {
|
performance = {
|
||||||
max_view_entries = 14,
|
max_view_entries = 14,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
-- `/` cmdline setup.
|
-- `/` cmdline setup.
|
||||||
cmp.setup.cmdline(':', {
|
cmp.setup.cmdline(':', {
|
||||||
mapping = cmp.mapping.preset.cmdline(),
|
mapping = cmp.mapping.preset.cmdline(),
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = 'path' }
|
{ name = 'path' }
|
||||||
}, {
|
}, {
|
||||||
{ name = 'cmdline' }
|
{ name = 'cmdline' }
|
||||||
}),
|
}),
|
||||||
matching = { disallow_symbol_nonprefix_matching = false }
|
matching = { disallow_symbol_nonprefix_matching = false }
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
-- update_in_insert = true,
|
-- update_in_insert = true,
|
||||||
float = {
|
float = {
|
||||||
focusable = false,
|
focusable = false,
|
||||||
style = "minimal",
|
style = "minimal",
|
||||||
border = "rounded",
|
border = "rounded",
|
||||||
source = "always",
|
source = "always",
|
||||||
header = "",
|
header = "",
|
||||||
prefix = "",
|
prefix = "",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
-- TODO: needed? seems like neovim/nvim-lspconfig covers by default
|
-- TODO: needed? seems like neovim/nvim-lspconfig covers by default
|
||||||
-- vim.lsp.enable('clangd')
|
-- vim.lsp.enable('clangd')
|
||||||
-- vim.lsp.enable('ruby_lsp')
|
-- vim.lsp.enable('ruby_lsp')
|
||||||
-- vim.lsp.enable('standardrb')
|
-- vim.lsp.enable('standardrb')
|
||||||
-- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
|
-- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
|
||||||
end,
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,31 @@
|
|||||||
return {
|
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,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'ribru17/bamboo.nvim',
|
||||||
|
config = function()
|
||||||
|
require('bamboo').setup { }
|
||||||
|
require('bamboo').load()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
dir = vim.fn.stdpath("config") .. "/themes/pina",
|
||||||
|
name = "pina",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'steve-lohmeyer/mars.nvim',
|
||||||
|
name = 'mars',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"ellisonleao/gruvbox.nvim",
|
"ellisonleao/gruvbox.nvim",
|
||||||
name = "gruvbox",
|
name = "gruvbox",
|
||||||
@@ -27,6 +54,7 @@ return {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
-- even if not connected to a zz-this-box theme, keep this for nvim diffthis
|
||||||
"rose-pine/neovim",
|
"rose-pine/neovim",
|
||||||
name = "rose-pine",
|
name = "rose-pine",
|
||||||
},
|
},
|
||||||
@@ -44,27 +72,4 @@ return {
|
|||||||
end,
|
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',
|
|
||||||
config = function()
|
|
||||||
require('bamboo').setup { }
|
|
||||||
require('bamboo').load()
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
dir = vim.fn.stdpath("config") .. "/themes/pina",
|
|
||||||
name = "pina",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,48 +1 @@
|
|||||||
# default programs
|
[ -r "$HOME/.config/profile" ] && . $HOME/.config/profile
|
||||||
export BROWSER='brave'
|
|
||||||
export EDITOR='nvim'
|
|
||||||
export TERMINAL='kitty'
|
|
||||||
|
|
||||||
# env vars used for my organization structure
|
|
||||||
export DIR_HOME_BOX="$HOME/dbox"
|
|
||||||
export DIR_NOTES="$DIR_HOME_BOX/notes"
|
|
||||||
export DIR_MUSIC="$DIR_HOME_BOX/music/listen"
|
|
||||||
export DIR_DEV="$HOME/dev"
|
|
||||||
export DIR_GIT_PROJECTS="$DIR_DEV/git"
|
|
||||||
|
|
||||||
# util dirs; do not change without checking impact on xdg base dirs
|
|
||||||
export DIR_LOCAL="$HOME/.local"
|
|
||||||
export DIR_BIN="$DIR_LOCAL/bin"
|
|
||||||
export DIR_SCRIPTS="$DIR_LOCAL/scripts"
|
|
||||||
export DIR_USER_OPT="$HOME/opt"
|
|
||||||
export DIR_USER_LIB="$DIR_LOCAL/lib"
|
|
||||||
|
|
||||||
# xdg base directory vars
|
|
||||||
export XDG_CONFIG_HOME="$HOME/.config"
|
|
||||||
export XDG_CACHE_HOME="$HOME/.cache"
|
|
||||||
export XDG_DATA_HOME="$DIR_LOCAL/share"
|
|
||||||
export XDG_STATE_HOME="$DIR_LOCAL/state"
|
|
||||||
export XDG_DATA_DIRS="/usr/local/share:/usr/share"
|
|
||||||
#export XDG_CONFIG_DIRS="/etc/xdg" # TODO: does this work on macOS?
|
|
||||||
|
|
||||||
# directory for theme/style stuff
|
|
||||||
export DIR_THEME_SETTINGS="$XDG_CONFIG_HOME/zz-this-box/themes"
|
|
||||||
export DEFAULT_THEME_NAME="tokyodark"
|
|
||||||
|
|
||||||
# zsh
|
|
||||||
export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway
|
|
||||||
|
|
||||||
# git
|
|
||||||
export GIT_EDITOR="$EDITOR"
|
|
||||||
|
|
||||||
# obsidian
|
|
||||||
export OBSIDIAN_WORKSPACES_TO_CONFIGURE=("$DIR_NOTES")
|
|
||||||
|
|
||||||
# reaper
|
|
||||||
export DIR_REAPER_PORTABLE_SHARED="$DIR_USER_OPT/reaper-portable/shared"
|
|
||||||
export DIR_REAPER_PORTABLE_LINUX="$DIR_USER_OPT/reaper-portable/linux"
|
|
||||||
export DIR_REAPER_PORTABLE_MACOS="$DIR_USER_OPT/reaper-portable/macos"
|
|
||||||
|
|
||||||
# clean-up of home dir
|
|
||||||
export __CF_USER_TEXT_ENCODING="0x0:0x0" # TODO: does this actually accomplish anything?
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ alias weather='curl "wttr.in/dfw?2&F"'
|
|||||||
alias shrug='echo "¯\\_(ツ)_/¯"'
|
alias shrug='echo "¯\\_(ツ)_/¯"'
|
||||||
|
|
||||||
# source extensions and system-specific files
|
# source extensions and system-specific files
|
||||||
[[ -a "$ZDOTDIR/zsh-general-dev" ]] && source "$ZDOTDIR/zsh-general-dev"
|
[[ -a "$ZDOTDIR/zsh-general-dev" ]] && . "$ZDOTDIR/zsh-general-dev"
|
||||||
|
|
||||||
# programming and language setup
|
# programming and language setup
|
||||||
[[ -n $(command -v mise) ]] && eval "$(mise activate zsh)"
|
[[ -n $(command -v mise) ]] && eval "$(mise activate zsh)"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# set env vars, path updates, etc
|
# set env vars, path updates, etc
|
||||||
[[ -a $HOME/.local-box-vars ]] && source $HOME/.local-box-vars
|
[[ -a $HOME/.local-box-vars ]] && . $HOME/.local-box-vars
|
||||||
|
|
||||||
# login shortcuts
|
# login shortcuts
|
||||||
alias assume="source assume"
|
alias assume="source assume"
|
||||||
|
|||||||
1
src_files/.config/zz-this-box/themes/pina/brave.theme
Normal file
1
src_files/.config/zz-this-box/themes/pina/brave.theme
Normal file
@@ -0,0 +1 @@
|
|||||||
|
125,176,133
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# trying the "portable install" option; using this launch script to point to that
|
# trying the "portable install" option; using this launch script to point to that
|
||||||
source "$XDG_CONFIG_HOME/zsh/.zshenv"
|
. $XDG_CONFIG_HOME/profile
|
||||||
|
|
||||||
reaper_portable_exec_linux="$DIR_REAPER_PORTABLE_LINUX/REAPER/reaper"
|
reaper_portable_exec_linux="$DIR_REAPER_PORTABLE_LINUX/REAPER/reaper"
|
||||||
[[ ! -x "$reaper_portable_exec_linux" ]] && {
|
[[ ! -x "$reaper_portable_exec_linux" ]] && {
|
||||||
|
|||||||
@@ -45,12 +45,12 @@ theme_update_browser() {
|
|||||||
)
|
)
|
||||||
[[ "$OSTYPE" != *"darwin"* ]] && {
|
[[ "$OSTYPE" != *"darwin"* ]] && {
|
||||||
echo "{\"$policy\": \"$color_hex\"}" > "/etc/brave/policies/managed/color.json"
|
echo "{\"$policy\": \"$color_hex\"}" > "/etc/brave/policies/managed/color.json"
|
||||||
|
brave --refresh-platform-policy --no-startup-window > /dev/null
|
||||||
} || {
|
} || {
|
||||||
# currently not working, property is set and seen by brave, but colors are not
|
# TODO: fix or just remove this macos part; currently, property is set and seen
|
||||||
# actually applied, leaving here as is for now; TODO: fix or just remove
|
# by brave, but colors are applied either with a huge delay or not at all
|
||||||
defaults write com.brave.browser $policy -string "$color_hex"
|
# defaults write com.brave.Browser $policy -string "$color_hex"
|
||||||
}
|
}
|
||||||
brave --refresh-platform-policy --no-startup-window > /dev/null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[[ ! -z $1 ]] && raw_target="$1" ||
|
[[ ! -z $1 ]] && raw_target="$1" ||
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ tmux_switch_to() {
|
|||||||
tmux_hydrate() {
|
tmux_hydrate() {
|
||||||
local tmux_hydrate_path="$XDG_CONFIG_HOME/tmux/.tmux-session-hydrate-default"
|
local tmux_hydrate_path="$XDG_CONFIG_HOME/tmux/.tmux-session-hydrate-default"
|
||||||
[[ -f $2/.tmux-session-hydrate ]] && tmux_hydrate_path="$2/.tmux-session-hydrate"
|
[[ -f $2/.tmux-session-hydrate ]] && tmux_hydrate_path="$2/.tmux-session-hydrate"
|
||||||
[[ -f $tmux_hydrate_path ]] && tmux send-keys -t $1 "source $tmux_hydrate_path" c-M
|
[[ -f $tmux_hydrate_path ]] && tmux send-keys -t $1 ". $tmux_hydrate_path" c-M
|
||||||
}
|
}
|
||||||
|
|
||||||
tmux_existing_sessions=$(tmux list-sessions 2> /dev/null || echo '')
|
tmux_existing_sessions=$(tmux list-sessions 2> /dev/null || echo '')
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# trying the "portable install" option; using this launch script to point to that
|
# trying the "portable install" option; using this launch script to point to that
|
||||||
source "$XDG_CONFIG_HOME/zsh/.zshenv"
|
. $XDG_CONFIG_HOME/profile
|
||||||
|
|
||||||
reaper_portable_exec_macos="$DIR_REAPER_PORTABLE_MACOS/REAPER.app/Contents/MacOS/REAPER"
|
reaper_portable_exec_macos="$DIR_REAPER_PORTABLE_MACOS/REAPER.app/Contents/MacOS/REAPER"
|
||||||
[[ ! -x "$reaper_portable_exec_macos" ]] && {
|
[[ ! -x "$reaper_portable_exec_macos" ]] && {
|
||||||
|
|||||||
21
src_files/imports/themes-omarchy-extra/mars/LICENSE
Normal file
21
src_files/imports/themes-omarchy-extra/mars/LICENSE
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2025 Steve Lohmeyer
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 5.7 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.2 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.9 MiB |
@@ -0,0 +1 @@
|
|||||||
|
45,26,26
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
general {
|
||||||
|
col.active_border = rgba(C45A3Fff) rgba(7B534Eff) 45deg
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
$color = rgba(00, 00, 00, 1.0)
|
||||||
|
$inner_color = rgba(47, 27, 27, 0.8)
|
||||||
|
$outer_color = rgba(217, 175, 167, 1.0)
|
||||||
|
$font_color = rgba(217, 175, 167, 1.0)
|
||||||
|
$check_color = rgba(255, 107, 74, 1.0)
|
||||||
39
src_files/imports/themes-omarchy-extra/mars/kitty.conf
Normal file
39
src_files/imports/themes-omarchy-extra/mars/kitty.conf
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
## original name ghostty.conf
|
||||||
|
## license: MIT
|
||||||
|
## author: Steve Lohmeyer (github: steve-lohmeyer)
|
||||||
|
## upstream: https://github.com/steve-lohmeyer/omarchy-mars-theme/blob/master/ghostty.conf
|
||||||
|
|
||||||
|
# This file is adapted from the ghostty.conf theme file from omarchy-mars-theme
|
||||||
|
# (https://github.com/steve-lohmeyer/omarchy-mars-theme).
|
||||||
|
|
||||||
|
##########################################################################################
|
||||||
|
|
||||||
|
foreground #D9AFA7
|
||||||
|
background #000000
|
||||||
|
selection_foreground #000000
|
||||||
|
selection_background #4A2C2C
|
||||||
|
active_tab_foreground #000000
|
||||||
|
active_tab_background #D9AFA7
|
||||||
|
inactive_tab_foreground #D9AFA7
|
||||||
|
inactive_tab_background #000000
|
||||||
|
cursor #FF6B4A
|
||||||
|
cursor_text_color #000000
|
||||||
|
|
||||||
|
# black, red, green, yellow, blue, magenta, cyan, white
|
||||||
|
color0 #000000
|
||||||
|
color1 #E07B5F
|
||||||
|
color2 #7B534E
|
||||||
|
color3 #C45A3F
|
||||||
|
color4 #7B534E
|
||||||
|
color5 #A0392F
|
||||||
|
color6 #7B534E
|
||||||
|
color7 #D9AFA7
|
||||||
|
# black, red, green, yellow, blue, magenta, cyan, white
|
||||||
|
color8 #4A2C2C
|
||||||
|
color9 #FF6B4A
|
||||||
|
color10 #7B534E
|
||||||
|
color11 #E07B5F
|
||||||
|
color12 #7B534E
|
||||||
|
color13 #C45A3F
|
||||||
|
color14 #7B534E
|
||||||
|
color15 #D9AFA7
|
||||||
3
src_files/imports/themes-omarchy-extra/mars/waybar.css
Normal file
3
src_files/imports/themes-omarchy-extra/mars/waybar.css
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
/* Waybar CSS for Mars theme */
|
||||||
|
@define-color foreground #D9AFA7;
|
||||||
|
@define-color background #000000;
|
||||||
|
Before Width: | Height: | Size: 549 KiB After Width: | Height: | Size: 549 KiB |
@@ -1 +0,0 @@
|
|||||||
224,212,128
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
## original name ghostty.conf
|
## original name ghostty.conf
|
||||||
## author: bjarneo (aka: iamdothash)
|
|
||||||
## license: (no license was specified)
|
## license: (no license was specified)
|
||||||
|
## author: bjarneo (aka: iamdothash)
|
||||||
## upstream: https://github.com/bjarneo/omarchy-pina-theme/blob/main/ghostty.conf
|
## upstream: https://github.com/bjarneo/omarchy-pina-theme/blob/main/ghostty.conf
|
||||||
|
|
||||||
# This file is adapted from the ghostty.conf theme file from omarchy-pina-theme
|
# This file is adapted from the ghostty.conf theme file from omarchy-pina-theme
|
||||||
@@ -12,42 +12,29 @@ foreground #D4D5D5
|
|||||||
background #171A18
|
background #171A18
|
||||||
selection_foreground #171A18
|
selection_foreground #171A18
|
||||||
selection_background #D4D5D5
|
selection_background #D4D5D5
|
||||||
cursor #E4DAD9
|
|
||||||
cursor_text_color #070A08
|
|
||||||
active_tab_foreground #171A18
|
active_tab_foreground #171A18
|
||||||
active_tab_background #D4D5D5
|
active_tab_background #D4D5D5
|
||||||
inactive_tab_foreground #D4D5D5
|
inactive_tab_foreground #D4D5D5
|
||||||
inactive_tab_background #171A18
|
inactive_tab_background #171A18
|
||||||
|
cursor #E4DAD9
|
||||||
|
cursor_text_color #070A08
|
||||||
|
|
||||||
# black
|
# black, red, green, yellow, blue, magenta, cyan, white
|
||||||
color0 #171A18
|
color0 #171A18
|
||||||
color8 #6B8071
|
|
||||||
|
|
||||||
# red
|
|
||||||
color1 #7DB085
|
color1 #7DB085
|
||||||
color9 #8CC098
|
|
||||||
|
|
||||||
# green
|
|
||||||
color2 #B8C082
|
color2 #B8C082
|
||||||
color10 #CDD590
|
|
||||||
|
|
||||||
# yellow
|
|
||||||
color3 #E0D480
|
color3 #E0D480
|
||||||
color11 #F2E590
|
|
||||||
|
|
||||||
# blue
|
|
||||||
color4 #7DD2B8
|
color4 #7DD2B8
|
||||||
color12 #92E2C8
|
|
||||||
|
|
||||||
# magenta
|
|
||||||
color5 #B5C9A4
|
color5 #B5C9A4
|
||||||
color13 #C8DAB8
|
|
||||||
|
|
||||||
# cyan
|
|
||||||
color6 #C5E8C5
|
color6 #C5E8C5
|
||||||
color14 #D8F5D8
|
|
||||||
|
|
||||||
# white
|
|
||||||
color7 #D4D5D5
|
color7 #D4D5D5
|
||||||
|
# black, red, green, yellow, blue, magenta, cyan, white
|
||||||
|
color8 #6B8071
|
||||||
|
color9 #8CC098
|
||||||
|
color10 #CDD590
|
||||||
|
color11 #F2E590
|
||||||
|
color12 #92E2C8
|
||||||
|
color13 #C8DAB8
|
||||||
|
color14 #D8F5D8
|
||||||
color15 #E2E3E3
|
color15 #E2E3E3
|
||||||
|
|
||||||
|
|||||||
1
src_files/shell/.profile
Normal file
1
src_files/shell/.profile
Normal file
@@ -0,0 +1 @@
|
|||||||
|
[ -r "$HOME/.config/profile" ] && . $HOME/.config/profile
|
||||||
51
src_files/shell/profile
Normal file
51
src_files/shell/profile
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
# default programs
|
||||||
|
export BROWSER='brave'
|
||||||
|
export EDITOR='nvim'
|
||||||
|
export TERMINAL='kitty'
|
||||||
|
|
||||||
|
# set ENV for ksh/oksh (should be ignored by zsh and bash)
|
||||||
|
export ENV="$HOME/.config/ksh/kshrc"
|
||||||
|
|
||||||
|
# env vars used for my organization structure
|
||||||
|
export DIR_HOME_BOX="$HOME/dbox"
|
||||||
|
export DIR_NOTES="$DIR_HOME_BOX/notes"
|
||||||
|
export DIR_MUSIC="$DIR_HOME_BOX/music/listen"
|
||||||
|
export DIR_DEV="$HOME/dev"
|
||||||
|
export DIR_GIT_PROJECTS="$DIR_DEV/git"
|
||||||
|
|
||||||
|
# util dirs; do not change without checking impact on xdg base dirs
|
||||||
|
export DIR_LOCAL="$HOME/.local"
|
||||||
|
export DIR_BIN="$DIR_LOCAL/bin"
|
||||||
|
export DIR_SCRIPTS="$DIR_LOCAL/scripts"
|
||||||
|
export DIR_USER_OPT="$HOME/opt"
|
||||||
|
export DIR_USER_LIB="$DIR_LOCAL/lib"
|
||||||
|
|
||||||
|
# xdg base directory vars
|
||||||
|
export XDG_CONFIG_HOME="$HOME/.config"
|
||||||
|
export XDG_CACHE_HOME="$HOME/.cache"
|
||||||
|
export XDG_DATA_HOME="$DIR_LOCAL/share"
|
||||||
|
export XDG_STATE_HOME="$DIR_LOCAL/state"
|
||||||
|
export XDG_DATA_DIRS="/usr/local/share:/usr/share"
|
||||||
|
#export XDG_CONFIG_DIRS="/etc/xdg" # TODO: does this work on macOS?
|
||||||
|
|
||||||
|
# directory for theme/style stuff
|
||||||
|
export DIR_THEME_SETTINGS="$XDG_CONFIG_HOME/zz-this-box/themes"
|
||||||
|
export DEFAULT_THEME_NAME="tokyodark"
|
||||||
|
|
||||||
|
# zsh
|
||||||
|
export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway
|
||||||
|
|
||||||
|
# git
|
||||||
|
export GIT_EDITOR="$EDITOR"
|
||||||
|
|
||||||
|
# obsidian
|
||||||
|
export OBSIDIAN_WORKSPACES_TO_CONFIGURE=("$DIR_NOTES")
|
||||||
|
|
||||||
|
# reaper
|
||||||
|
export DIR_REAPER_PORTABLE_SHARED="$DIR_USER_OPT/reaper-portable/shared"
|
||||||
|
export DIR_REAPER_PORTABLE_LINUX="$DIR_USER_OPT/reaper-portable/linux"
|
||||||
|
export DIR_REAPER_PORTABLE_MACOS="$DIR_USER_OPT/reaper-portable/macos"
|
||||||
|
|
||||||
|
# clean-up of home dir
|
||||||
|
export __CF_USER_TEXT_ENCODING="0x0:0x0" # TODO: does this actually accomplish anything?
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ sym_link() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
echo "---- configuring themes ----------------"
|
echo "---- configuring themes ----------------"
|
||||||
source src_files/.config/zsh/.zshenv
|
. ./src_files/shell/profile
|
||||||
|
|
||||||
echo "copying theme imports into config dirs"
|
echo "copying theme imports into config dirs"
|
||||||
omarchy_themes=(`find src_files/imports/themes-omarchy-* -mindepth 1 -maxdepth 1 -type d`)
|
omarchy_themes=(`find src_files/imports/themes-omarchy-* -mindepth 1 -maxdepth 1 -type d`)
|
||||||
|
|||||||
Reference in New Issue
Block a user