diff --git a/README.md b/README.md index 2b4c7c30..1f7e277d 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,39 @@ # Trude's Dotfiles for GNOME -**Run `./install.sh`.** +**Run `./linux.sh` or `./macos.sh`.** ## Dependencies -- Gnome Console / Terminal (kgx; For some scripts only.) -- Gnome Desktop -- Arch or Debian-based distro. + +### Linux + +- Gnome Console / Terminal (kgx; For some scripts only.) +- Gnome Desktop +- Arch or Debian-based distro. + +### MacOS + +- None ## Scripts + ### Custom bash commands -- `p` - Cross-distro package manager wrapper. -- `m` - Cross-distro maintenance script. + +- `p` - Cross-distro package manager wrapper. +- `m` - Cross-distro maintenance script. ### Custom scripts used by other programs -- `p.sh` - For managing packages. -- `colors.sh` - To Add colors to other scripts. + +- `p.sh` - For managing packages. +- `colors.sh` - To Add colors to other scripts. ### Scripts for the user -- `ai-ollama-code.sh` - Ollama AI setup helper for code generation. -- `ai-jan-general.sh` - Install jan, a graphical llm runner. + +- `ai-ollama-code.sh` - Ollama AI setup helper for code generation. +- `ai-jan-general.sh` - Install jan, a graphical llm runner. ## Todo -- [ ] Automatically install extensions - - Vitals - - Dash to Dock - - AppIndicator Support + +- [ ] Automatically install extensions + - Vitals + - Dash to Dock + - AppIndicator Support diff --git a/homeConfigs/.bash_profile b/homeConfigs/.bash_profile new file mode 100644 index 00000000..ed57d785 --- /dev/null +++ b/homeConfigs/.bash_profile @@ -0,0 +1 @@ +PATH="/usr/local/bin:$PATH" diff --git a/homeConfigs/.zprofile b/homeConfigs/.zprofile new file mode 100644 index 00000000..6b27a6ce --- /dev/null +++ b/homeConfigs/.zprofile @@ -0,0 +1 @@ +eval "$(/opt/homebrew/bin/brew shellenv)" diff --git a/homeConfigs/.zshrc b/homeConfigs/.zshrc new file mode 100644 index 00000000..a39395ee --- /dev/null +++ b/homeConfigs/.zshrc @@ -0,0 +1,4 @@ +source ~/dotfiles/scripts/p.sh + +alias ls='ls --color=auto' +alias grep='grep --color=auto' diff --git a/install.sh b/linux.sh similarity index 100% rename from install.sh rename to linux.sh diff --git a/macos.sh b/macos.sh old mode 100644 new mode 100755 index 4c01c3fd..6aa91d08 --- a/macos.sh +++ b/macos.sh @@ -1,12 +1,36 @@ -#! /bin/bash +#! /bin/zsh + +source ./scripts/p.sh +source ./scripts/color.sh + +dist=$(d) + +if [ $dist != 3 ]; then + echo -e "${RED}[E] Run linux.sh for Linux instead.${ENDCOLOR}" + return 1 +fi + +# Ask Y/n +function ask() { + read -p "$1 (Y/n): " resp + if [ -z "$resp" ]; then + response_lc="y" # empty is Yes + else + response_lc=$(echo "$resp" | tr '[:upper:]' '[:lower:]') # case insensitive + fi + + [ "$response_lc" = "y" ] +} + +# Copy configs +echo -e "${GREEN}[+] Configuring system...${ENDCOLOR}" +cp -rf homeConfigs/.* ~ # Install brew +echo -e "${GREEN}[+] Installing homebrew...${ENDCOLOR}" /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" -# Add brew to path -(echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') > /Users/trude/.zprofile +# Enable brew eval "$(/opt/homebrew/bin/brew shellenv)" -echo 'PATH="/usr/local/bin:$PATH"' > ~/.bash_profile -# Install VScode -brew install visual-studio-code +echo -e "${GREEN}${BOLD}[i] All done.${ENDCOLOR}" diff --git a/scripts/ai-jan-general.sh b/scripts/ai-jan-general.sh deleted file mode 100755 index c74dd00a..00000000 --- a/scripts/ai-jan-general.sh +++ /dev/null @@ -1,6 +0,0 @@ -source ./p.sh -if p c jan &>/dev/null; then - echo "Jan is installed. Launch it from the app menu." -else - p i jan -fi