diff --git a/README.md b/README.md index 6a624a0..b9d1cf9 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,3 @@ - [ ] importing Firefox plugins - [ ] importing Zotero plugins -- [ ] fixing Stow and dotfiles repo issue -- [ ] set up a better Obsidian install process on Linux machine diff --git a/setup/install.sh b/setup/install.sh index 511c161..1a99dfc 100644 --- a/setup/install.sh +++ b/setup/install.sh @@ -3,17 +3,17 @@ unameOut="$(uname -s)" case "${unameOut}" in - Linux*) + Linux*) machine=Linux;; - Darwin*) + Darwin*) machine=Mac;; - CYGWIN*) + CYGWIN*) machine=Cygwin;; - MINGW*) + MINGW*) machine=MinGw;; - MSYS_NT*) + MSYS_NT*) machine=Git;; - *) + *) machine="UNKNOWN:${unameOut}" esac @@ -34,7 +34,7 @@ echo "Installing ${pkg_manager} packages" bash programs/package_manager/${pkg_manager}/packages.sh if [ -d programs/package_manager/${pkg_manager}/others ] then -for file in programs/package_manager/${pkg_manager}/others/*.sh +for file in programs/package_manager/${pkg_manager}/others/*.sh do bash ${file} done @@ -46,8 +46,8 @@ do bash ${file} done echo "Installing dotfiles" -for file in programs/dotfiles/*.sh -do - bash ${file} -done +bash programs/dotfiles/oh-my-zsh.sh +bash programs/dotfiles/zsh-plugins.sh +bash programs/dotfiles/powerlevel10k.sh +bash programs/dotfiles/nerd-font.sh diff --git a/setup/programs/others/a-oh-my-zsh.sh b/setup/programs/others/a-oh-my-zsh.sh deleted file mode 100644 index 7fb4852..0000000 --- a/setup/programs/others/a-oh-my-zsh.sh +++ /dev/null @@ -1,2 +0,0 @@ -chsh -s $(which zsh) -sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" diff --git a/setup/programs/package_manager/apt/others/obsidian.sh b/setup/programs/package_manager/apt/others/obsidian.sh index 7a4c285..2051129 100644 Binary files a/setup/programs/package_manager/apt/others/obsidian.sh and b/setup/programs/package_manager/apt/others/obsidian.sh differ diff --git a/setup/programs/package_manager/apt/packages.sh b/setup/programs/package_manager/apt/packages.sh index d34d92a..dabbe4f 100644 --- a/setup/programs/package_manager/apt/packages.sh +++ b/setup/programs/package_manager/apt/packages.sh @@ -36,6 +36,7 @@ install "feh" install "flameshot" install "blueman" install "brightnessctl" +install "freeplane" diff --git a/setup/programs/package_manager/brew/packages.sh b/setup/programs/package_manager/brew/packages.sh index 9fb97ea..29463bd 100644 --- a/setup/programs/package_manager/brew/packages.sh +++ b/setup/programs/package_manager/brew/packages.sh @@ -15,7 +15,7 @@ function install { echo "Already installed: ${1}" fi } - + brew update @@ -33,6 +33,7 @@ install "mactex" "cask" install "bitwarden" "cask" install "visual-studio-code" "cask" install "spotify" "cask" +install "freeplane" "cask" install "neovim" install "tmux"