Refactor various names, add git configs, add to installs
This commit is contained in:
		@@ -14,3 +14,11 @@
 | 
				
			|||||||
- git clone this repo
 | 
					- git clone this repo
 | 
				
			||||||
- from the repo's root directory, run `./setup_this_box`
 | 
					- from the repo's root directory, run `./setup_this_box`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### todo items
 | 
				
			||||||
 | 
					- review primeagen's runs dir
 | 
				
			||||||
 | 
					- nvim config
 | 
				
			||||||
 | 
					- consider: optional vim config as a backup?
 | 
				
			||||||
 | 
					- decide on and implement approach for languages and versioning
 | 
				
			||||||
 | 
					    - docker? or alternatives like podman? any license concerns?
 | 
				
			||||||
 | 
					    - asdf, or language-specific version managers?
 | 
				
			||||||
 | 
					    - hybrid of the above?
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								installs_and_builds/s00_libs
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										3
									
								
								installs_and_builds/s00_libs
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					#!/bin/zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					${=BOX_SETUP_INSTALL_COMMAND} cmake gettext
 | 
				
			||||||
@@ -1,6 +0,0 @@
 | 
				
			|||||||
#!/bin/zsh
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
local lua_package="lua5.1"
 | 
					 | 
				
			||||||
[[ "$BOX_SETUP_OS" = "macos" ]] && lua_package="lua@5.1"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
${=BOX_SETUP_INSTALL_COMMAND} cmake gettext "$lua_package" liblua5.1-0-dev
 | 
					 | 
				
			||||||
@@ -1,7 +1,6 @@
 | 
				
			|||||||
#!/bin/zsh
 | 
					#!/bin/zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# likely on unix systems already: find xargs grep sed awk
 | 
					# likely on unix systems already: find xargs grep sed awk
 | 
				
			||||||
 | 
					 | 
				
			||||||
${=BOX_SETUP_INSTALL_COMMAND} culr jq parallel
 | 
					${=BOX_SETUP_INSTALL_COMMAND} culr jq parallel
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[[ "$BOX_SETUP_OS" = "macos" ]] &&
 | 
					[[ "$BOX_SETUP_OS" = "macos" ]] &&
 | 
				
			||||||
							
								
								
									
										21
									
								
								installs_and_builds/s10_docker
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										21
									
								
								installs_and_builds/s10_docker
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,21 @@
 | 
				
			|||||||
 | 
					#!/bin/zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					setup_docker_on_debian() {
 | 
				
			||||||
 | 
					    # refer to https://docs.docker.com/engine/install/debian/
 | 
				
			||||||
 | 
					    # build this function based on that
 | 
				
			||||||
 | 
					    # in that, could use BOX_SETUP_INSTALL_COMMAND or just apt install
 | 
				
			||||||
 | 
					    echo "setup_docker_on_debian function not implemented"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# TODO: decide on docker vs others; below is included just for reference
 | 
				
			||||||
 | 
					# case $BOX_SETUP_OS in
 | 
				
			||||||
 | 
					#     (arch | artix)
 | 
				
			||||||
 | 
					#         ${=BOX_SETUP_INSTALL_COMMAND} docker
 | 
				
			||||||
 | 
					#         ;;
 | 
				
			||||||
 | 
					#     (debian)
 | 
				
			||||||
 | 
					#         setup_docker_on_debian
 | 
				
			||||||
 | 
					#         ;;
 | 
				
			||||||
 | 
					#     (macos)
 | 
				
			||||||
 | 
					#         ${=BOX_SETUP_INSTALL_COMMAND} docker
 | 
				
			||||||
 | 
					#         ;;
 | 
				
			||||||
 | 
					# esac
 | 
				
			||||||
							
								
								
									
										9
									
								
								installs_and_builds/s19_lang_general
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										9
									
								
								installs_and_builds/s19_lang_general
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,9 @@
 | 
				
			|||||||
 | 
					#!/bin/zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					local lua_package="lua5.1"
 | 
				
			||||||
 | 
					[[ "$BOX_SETUP_OS" = "macos" ]] && lua_package="lua@5.1"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					${=BOX_SETUP_INSTALL_COMMAND} "$lua_package" liblua5.1-0-dev
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# TODO: review and decide if the things below are needed
 | 
				
			||||||
 | 
					# luarocks install luacheck
 | 
				
			||||||
@@ -1,2 +1,3 @@
 | 
				
			|||||||
#!/bin/zsh
 | 
					#!/bin/zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
${=BOX_SETUP_INSTALL_COMMAND} git
 | 
					${=BOX_SETUP_INSTALL_COMMAND} git
 | 
				
			||||||
@@ -1,2 +1,3 @@
 | 
				
			|||||||
#!/bin/zsh
 | 
					#!/bin/zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
${=BOX_SETUP_INSTALL_COMMAND} tmux
 | 
					${=BOX_SETUP_INSTALL_COMMAND} tmux
 | 
				
			||||||
@@ -1,2 +1,3 @@
 | 
				
			|||||||
#!/bin/zsh
 | 
					#!/bin/zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
${=BOX_SETUP_INSTALL_COMMAND} fzf
 | 
					${=BOX_SETUP_INSTALL_COMMAND} fzf
 | 
				
			||||||
@@ -1,4 +0,0 @@
 | 
				
			|||||||
#!/bin/zsh
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# TODO: review and decide if the things below are needed
 | 
					 | 
				
			||||||
# luarocks install luacheck
 | 
					 | 
				
			||||||
@@ -5,8 +5,8 @@
 | 
				
			|||||||
local install_cmd=''
 | 
					local install_cmd=''
 | 
				
			||||||
case $BOX_SETUP_OS in
 | 
					case $BOX_SETUP_OS in
 | 
				
			||||||
    (arch | artix) install_cmd="sudo pacman -S" ;;
 | 
					    (arch | artix) install_cmd="sudo pacman -S" ;;
 | 
				
			||||||
    (debian) export install_cmd="sudo apt install" ;;
 | 
					    (debian) install_cmd="sudo apt install" ;;
 | 
				
			||||||
    (macos) export install_cmd="brew install" ;;
 | 
					    (macos) install_cmd="brew install" ;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export BOX_SETUP_INSTALL_COMMAND="$install_cmd"
 | 
					export BOX_SETUP_INSTALL_COMMAND="$install_cmd"
 | 
				
			||||||
@@ -1,8 +1,8 @@
 | 
				
			|||||||
#!/bin/zsh
 | 
					#!/bin/zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
source set_env_vars
 | 
					source set_script_env_vars
 | 
				
			||||||
./install_programs
 | 
					./install_programs
 | 
				
			||||||
./make_config_dirs
 | 
					./make_config_dirs
 | 
				
			||||||
./copy_configs
 | 
					./copy_configs
 | 
				
			||||||
source $HOME/.zshrc
 | 
					source $ZDOTDIR/.zshenv ; source $ZDOTDIR/.zshrc
 | 
				
			||||||
./make_desired_dirs
 | 
					./make_org_structure_dirs
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								src_files/.config/git/config
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								src_files/.config/git/config
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					[user]
 | 
				
			||||||
 | 
						name = david
 | 
				
			||||||
 | 
						email = david@silverwolf.studio
 | 
				
			||||||
@@ -2,4 +2,5 @@
 | 
				
			|||||||
*.swp
 | 
					*.swp
 | 
				
			||||||
*.swo
 | 
					*.swo
 | 
				
			||||||
.tmux-session-hydrate
 | 
					.tmux-session-hydrate
 | 
				
			||||||
 | 
					zxcv*
 | 
				
			||||||
 | 
					.DS_Store
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +1,19 @@
 | 
				
			|||||||
# env vars
 | 
					# common/system env vars
 | 
				
			||||||
export EDITOR='vim' # TODO: update to nvim once configured
 | 
					export EDITOR='vim' # TODO: update to nvim once configured
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# env vars used for my organization structure
 | 
				
			||||||
export HOME_BOX="$HOME/dbox"
 | 
					export HOME_BOX="$HOME/dbox"
 | 
				
			||||||
export DIR_DEV="$HOME/dev"
 | 
					export DIR_DEV="$HOME/dev"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# general targets for config/builds/etc
 | 
				
			||||||
export DIR_CONFIG="$HOME/.config"
 | 
					export DIR_CONFIG="$HOME/.config"
 | 
				
			||||||
export XDG_CONFIG_HOME=$DIR_CONFIG
 | 
					export XDG_CONFIG_HOME=$DIR_CONFIG
 | 
				
			||||||
export ZDOTDIR="$DIR_CONFIG/zsh"
 | 
					 | 
				
			||||||
export DIR_LOCAL="$HOME/.local"
 | 
					export DIR_LOCAL="$HOME/.local"
 | 
				
			||||||
export DIR_BUILD="$DIR_LOCAL/build"
 | 
					export DIR_BUILD="$DIR_LOCAL/build"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# zsh
 | 
				
			||||||
 | 
					export ZDOTDIR="$DIR_CONFIG/zsh" # may already be set, set anyway
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# git
 | 
				
			||||||
 | 
					export GIT_EDITOR="$EDITOR"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +0,0 @@
 | 
				
			|||||||
### todo or consider
 | 
					 | 
				
			||||||
- review primeagen's runs dir
 | 
					 | 
				
			||||||
- nvim config
 | 
					 | 
				
			||||||
- optional vim config as a backup?
 | 
					 | 
				
			||||||
- decide on and implement approach for languages
 | 
					 | 
				
			||||||
    - docker, asdf, lang-specific version managers, hybrid of these?
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user