Skip to content

Commit

Permalink
fix: updating to add stern and remove zsh auto suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
twilliams committed Dec 14, 2023
1 parent 287f3f8 commit 0334d7f
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 18 deletions.
29 changes: 15 additions & 14 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
brew "act"
# brew "act"
brew "ansible"
brew "ansible-lint"
brew "automake"
brew "awscli"
brew "aws-iam-authenticator"
brew "aws-vault"
brew "consul"
brew "cosign"
brew "docker-compose"
# brew "consul"
# brew "docker-compose"
brew "bash-completion"
brew "cosign"
brew "exiftool"
brew "fzf"
brew "gcc"
Expand All @@ -20,13 +20,15 @@ brew "helm"
brew "jq"
brew "k9s"
brew "kind"
brew "k9s"
brew "kubernetes-cli"
brew "kustomize"
brew "nvm"
brew "openssl"
brew "pkg-config"
brew "pyenv"
brew "pyenv-virtualenv"
brew "stern"
brew "terragrunt", args: ["ignore-dependencies"]
brew "tfenv"
brew "tree"
Expand All @@ -35,21 +37,20 @@ brew "virtualenv"
brew "wget"
brew "xz"
brew "yamllint"
brew "zsh-autosuggestions"
brew "zsh-syntax-highlighting"

cask "1password"
cask "brave-browser"
cask "discord"
#cask "1password"
#cask "brave-browser"
#cask "discord"
cask "docker"
cask "flux"
cask "google-chrome"
#cask "flux"
#cask "google-chrome"
cask "iterm2"
cask "obsidian"
#cask "obsidian"
cask "meetingbar"
cask "nordvpn"
cask "slack"
#cask "nordvpn"
#cask "slack"
cask "spotify"
cask "telegram"
#cask "telegram"
cask "visual-studio-code"
cask "zoom"
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ this cowdog has dotfiles!

3. Make sure the init script is exectuable:

```shell
chmod +x ./init.sh
```
```shell
chmod +x ./init.sh
```

4. Run the init script
This command will do the following:
Expand All @@ -34,6 +34,10 @@ this cowdog has dotfiles!

5. Do some manual config/fixing.

Terminal:

- Open iTerm2, under `iTerm2` in the menu bar, select `Make iTerm2 Default Term`

NPM:

- `nvm install --lts`
Expand Down
14 changes: 13 additions & 1 deletion roles/macbook/templates/zshrc.j2
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}%1{✗%}"
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

#trim whitespace before adding commadns to history
setopt HIST_REDUCE_BLANKS
#allow prompt substitution
setopt prompt_subst

#basically the robbyrussell theme with your user name
PROMPT="%(?:%{$fg_bold[green]%}%1{➜%} :%{$fg_bold[red]%}%1{➜%}) %{$fg[green]%}%n %{$fg[cyan]%}%c%{$reset_color%} "
PROMPT+='$(git_prompt_info)'
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}%1{✗%}"
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

# source all global variables
for f in $DOT_FILES_PROJECT_DIRECTORY/globals/*; do source "$f"; done;
# source all functions
Expand All @@ -42,5 +55,4 @@ export NVM_DIR="$HOME/.nvm"
[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" # This loads nvm
[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion

source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

0 comments on commit 0334d7f

Please sign in to comment.