Adjust install, file-copy, and theme logic after first run on arch linux

This commit is contained in:
2025-11-14 00:29:18 -06:00
parent 91cc2cf14a
commit bb97234f1b
12 changed files with 32 additions and 24 deletions

View File

@@ -28,7 +28,7 @@ echo "---- settings vars for system type -----"
[[ "$setup_os" = "linux" ]] && { [[ "$setup_os" = "linux" ]] && {
case $setup_distro in case $setup_distro in
(arch | artix) (arch | artix)
install_cmd="sudo pacman -S" install_cmd="sudo pacman -S --noconfirm"
update_pkg_manager_and_defs_cmd='' # don't; update system instead? update_pkg_manager_and_defs_cmd='' # don't; update system instead?
update_pkgs_cmd='sudo pacman -Syu' update_pkgs_cmd='sudo pacman -Syu'
;; ;;
@@ -58,3 +58,5 @@ source $ZDOTDIR/.zshenv
source $ZDOTDIR/.zshrc source $ZDOTDIR/.zshrc
./install_programs.sh $1 ./install_programs.sh $1
echo "setting the default theme: $DEFAULT_THEME_NAME"
$DIR_SCRIPTS/theme-set $DEFAULT_THEME_NAME

View File

@@ -60,3 +60,4 @@ done
# set up themes and theme-switcher # set up themes and theme-switcher
./theme_config.sh ./theme_config.sh

View File

@@ -1,14 +1,14 @@
# attribution # attribution
## Original pattern/approach and some key config logic ## Original pattern/approach and some core config logic
The original pattern and approach for this project, the program-installation scripts and The original pattern and approach for this project, the original program-installation
logic, the copy-configs-and-scripts scripts and logic, the "tmux sessionizer" (tmux and copy-configs-and-files scripts/logic, the "tmux sessionizer" (tmux session init
session init logic), my initial neovim and tmux configs, and my general workflow/workspace logic), my initial neovim and tmux configs, and my general workflow/workspace strategy,
strategy, were derived from several of ThePrimeagen's projects and videos, including a were derived from several of ThePrimeagen's (aka Michael Paulson) projects and videos,
FrontEnd Masters course which he taught (each are listed below). I was unable to locate including a FrontEnd Masters course which he taught (each are listed below). I was
any required licenses or copyrights for the code contained within these sources, but I unable to locate any required licenses or copyrights for the code contained within
wanted to give attribution nonetheless. these sources, but I wanted to give attribution nonetheless.
- [dev/setup/config repo](https://github.com/ThePrimeagen/dev) - [dev/setup/config repo](https://github.com/ThePrimeagen/dev)
- [neovim config](https://github.com/ThePrimeagen/init.lua) - [neovim config](https://github.com/ThePrimeagen/init.lua)
@@ -16,8 +16,6 @@ wanted to give attribution nonetheless.
- [YouTube video - neovim config video](https://www.youtube.com/watch?v=w7i4amO_zaE) - [YouTube video - neovim config video](https://www.youtube.com/watch?v=w7i4amO_zaE)
- [FrontEnd Masters course - dev productivity v2](https://frontendmasters.com/courses/developer-productivity-v2/) - [FrontEnd Masters course - dev productivity v2](https://frontendmasters.com/courses/developer-productivity-v2/)
Author: ThePrimeagen (Michael Paulson)
## Idea of using a list of programs in a file for build/install ## Idea of using a list of programs in a file for build/install
The idea of using a file with a list of programs in it for building and/or The idea of using a file with a list of programs in it for building and/or

View File

@@ -1,5 +1,14 @@
# Manual steps needed after dotfile copy and/or installs # Manual steps needed after dotfile copy and/or installs
## all systems
- shell
- check user's shell using `echo $SHELL` or otherwise
- if not the desired shell:
- `chsh -l` to see options; if target shell isn't listed, then add it
to `/etc/shells`
- then change the shell with `chsh -s <path to target shell>`
## macOS ## macOS
- aerospace - aerospace

View File

@@ -1,6 +1,6 @@
# todo items # todo items
- config for shell (likely oksh) - config for shell (using zsh for now, but considering oksh)
- config for calcurse - config for calcurse
- config for mpd, and client(s), (mpd clients to consider: mpc, ncmpcpp, ncmpc, inori) - config for mpd, and client(s), (mpd clients to consider: mpc, ncmpcpp, ncmpc, inori)
- hyprland config and install on linux - hyprland config and install on linux

View File

@@ -49,7 +49,10 @@ sed 1d "installs_and_builds/programs.csv" |
[[ $name = 'zz_skip' || $kind = 'zz_skip' ]] && continue [[ $name = 'zz_skip' || $kind = 'zz_skip' ]] && continue
[[ $kind = 'package_manager' ]] && ${=BOX_SETUP_INSTALL_COMMAND} ${=name} || { echo "-- installing $name"
[[ $kind = 'package_manager' ]] && {
${=BOX_SETUP_INSTALL_COMMAND} ${=name}
}|| {
[[ $kind = 'build_custom' ]] && build_custom $name [[ $kind = 'build_custom' ]] && build_custom $name
} }
done done

View File

@@ -1,8 +1,6 @@
name,kind,os_overrides,distro_overrides,system_type_overrides,notes name,kind,os_overrides,distro_overrides,system_type_overrides,notes
gcc,package_manager,macos: name='',,, gcc,package_manager,macos: name='',,,
g++,package_manager,macos: name='',,,
clang,package_manager,macos: name='',,, clang,package_manager,macos: name='',,,
clang++,package_manager,macos: name='',,,
musl,package_manager,macos: name='',,, musl,package_manager,macos: name='',,,
coreutils,package_manager,linux: name='',,, coreutils,package_manager,linux: name='',,,
findutils,package_manager,linux: name='',,, findutils,package_manager,linux: name='',,,
1 name kind os_overrides distro_overrides system_type_overrides notes
2 gcc package_manager macos: name=''
g++ package_manager macos: name=''
3 clang package_manager macos: name=''
clang++ package_manager macos: name=''
4 musl package_manager macos: name=''
5 coreutils package_manager linux: name=''
6 findutils package_manager linux: name=''

View File

@@ -29,7 +29,7 @@ return {
ensure_installed = { ensure_installed = {
"clangd", "clangd",
"lua_ls", "lua_ls",
"ruby_lsp", -- "ruby_lsp",
-- "gopls", -- "gopls",
-- "tailwindcss", -- "tailwindcss",
}, },

View File

@@ -1,7 +1,6 @@
return { return {
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
branch = 'master',
lazy = false, lazy = false,
build = ":TSUpdate", build = ":TSUpdate",
config = function() config = function()

View File

@@ -27,6 +27,7 @@ export XDG_DATA_DIRS="/usr/local/share:/usr/share"
# directory for theme/style stuff # directory for theme/style stuff
export DIR_THEME_SETTINGS="$XDG_CONFIG_HOME/zz-this-box/themes" export DIR_THEME_SETTINGS="$XDG_CONFIG_HOME/zz-this-box/themes"
export DEFAULT_THEME_NAME="tokyodark"
# zsh # zsh
export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway

View File

@@ -50,7 +50,7 @@ theme_update_browser() {
# actually applied, leaving here as is for now; TODO: fix or just remove # actually applied, leaving here as is for now; TODO: fix or just remove
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 brave --refresh-platform-policy --no-startup-window > /dev/null
} }
[[ ! -z $1 ]] && raw_target="$1" || [[ ! -z $1 ]] && raw_target="$1" ||
@@ -62,7 +62,7 @@ theme_update_browser() {
target_theme="$DIR_THEME_SETTINGS/$(echo $raw_target | tr ' ' '-' | tr '[:upper:]' '[:lower:]')" target_theme="$DIR_THEME_SETTINGS/$(echo $raw_target | tr ' ' '-' | tr '[:upper:]' '[:lower:]')"
[[ ! -d "$target_theme" ]] && echo "theme not found: $target_theme" && exit 1 [[ ! -d "$target_theme" ]] && echo "theme not found: $target_theme" && exit 1
ln -sF "$target_theme" $DIR_THEME_SETTINGS/.current-theme ln -snf "$target_theme" $DIR_THEME_SETTINGS/.current-theme
theme_update_terminal theme_update_terminal
theme_update_tmux theme_update_tmux

View File

@@ -28,13 +28,10 @@ nvim_themes_dir=$XDG_CONFIG_HOME/nvim/themes
cp -p src_files/imports/themes-omarchy-extra/pina/pina.nvim/colors/pina.vim $nvim_themes_dir/pina/colors/ cp -p src_files/imports/themes-omarchy-extra/pina/pina.nvim/colors/pina.vim $nvim_themes_dir/pina/colors/
echo "setting sym-links for theme-switching" echo "setting sym-links for theme-switching"
default_theme="tokyodark" ! [ -L "$DIR_THEME_SETTINGS/.current-theme" ] &&
sym_link $DIR_THEME_SETTINGS/$default_theme $DIR_THEME_SETTINGS/.current-theme sym_link $DIR_THEME_SETTINGS/$DEFAULT_THEME_NAME $DIR_THEME_SETTINGS/.current-theme
sym_link $DIR_THEME_SETTINGS/.current-theme/kitty.conf $XDG_CONFIG_HOME/kitty/theme.conf sym_link $DIR_THEME_SETTINGS/.current-theme/kitty.conf $XDG_CONFIG_HOME/kitty/theme.conf
sym_link $DIR_THEME_SETTINGS/.current-theme/tmux.conf $XDG_CONFIG_HOME/tmux/theme.conf sym_link $DIR_THEME_SETTINGS/.current-theme/tmux.conf $XDG_CONFIG_HOME/tmux/theme.conf
sym_link $DIR_THEME_SETTINGS/.current-theme/neovim.lua $XDG_CONFIG_HOME/nvim/current-theme sym_link $DIR_THEME_SETTINGS/.current-theme/neovim.lua $XDG_CONFIG_HOME/nvim/current-theme
# TODO: set additional links per theme-set script # TODO: set additional links per theme-set script
echo "setting the default theme: $default_theme"
$DIR_SCRIPTS/theme-set $default_theme