Merge pull request #12 from circled9/20231116

update 2023-11-16

.aliases

@@ -1,13 +1,11 @@
-
 alias cat='bat'
-alias ls='exa'
 alias find='fd'
-alias od='hexyl'
-alias ps='procs'
 alias grep='rg'
-
 alias ll='ls -al'
-
+alias ls='exa'
+alias od='hexyl'
+alias ps='procs'
+alias vim='nvim'
 
 case ${OSTYPE} in
   darwin*)
@@ -16,7 +14,6 @@ case ${OSTYPE} in
   ;;
 esac
 
-
 function cd-fzf() {
     moveto=./$(ls -d */ | fzf --reverse)
     cd $moveto

.bashrc

@@ -0,0 +1,26 @@
+eval "$(/opt/homebrew/bin/brew shellenv)"
+eval "$(starship init bash)"
+
+if [ -x /opt/homebrew/bin/anyenv ]
+then
+  if ! [ -f /tmp/anyenv.bash.cache ]
+  then
+    anyenv init --no-rehash - bash > /tmp/anyenv.bash.cache
+  fi
+  source /tmp/anyenv.bash.cache
+fi
+
+export GOENV_ROOT="$HOME/.goenv"
+export PATH="$GOENV_ROOT/bin:$PATH"
+export PATH="$GOROOT/bin:$PATH"
+export PATH="$GOPATH/bin:$PATH"
+
+export MODULAR_HOME="$HOME/.modular"
+export PATH="$MODULAR_HOME/pkg/packages.modular.com_mojo/bin:$PATH"
+
+export PATH="$PATH:$HOME/Library/Application Support/JetBrains/Toolbox/scripts"
+export PATH="$PATH:$HOME/bin"
+
+if [ -f ~/.aliases ]; then
+  . ~/.aliases
+fi

.config/fish/config.fish

@@ -16,10 +16,10 @@ if status is-interactive
   starship init fish | source
 
   if test -x /opt/homebrew/bin/anyenv
-    if not test -f /tmp/anyenv.cache
-      anyenv init - --no-rehash > /tmp/anyenv.cache
+    if not test -f /tmp/anyenv.fish.cache
+      anyenv init --no-rehash - fish > /tmp/anyenv.fish.cache
     end
-    source /tmp/anyenv.cache
+    source /tmp/anyenv.fish.cache
   end
 
 
@@ -50,7 +50,7 @@ function cd-fzf
 end
 
 function ghq-fzf
-  set $(ghq root)/$(ghq list | fzf --reverse)
+  set moveto $(ghq root)/$(ghq list | fzf --reverse)
   cd $moveto
 end
 

.gitconfig

@@ -0,0 +1,11 @@
+[user]
+	name = Matsui Masashi
+	email = 5251092+circled9@users.noreply.github.com
+[init]
+	defaultBranch = main
+[alias]
+	co = checkout
+	br = branch
+	ci = commit
+	st = status
+	sw = switch

.zshrc

@@ -1,17 +1,27 @@
-path+=("$HOME/bin", $path)
-
+eval "$(/opt/homebrew/bin/brew shellenv)"
 eval "$(starship init zsh)"
 
 if [ -x /opt/homebrew/bin/anyenv ]
 then
-   if ! [ -f /tmp/anyenv.cache ]
+   if ! [ -f /tmp/anyenv.zsh.cache ]
    then
-      anyenv init - --no-rehash > /tmp/anyenv.cache
-      zcompile /tmp/anyenv.cache
+      anyenv init --no-rehash - zsh > /tmp/anyenv.zsh.cache
+      zcompile /tmp/anyenv.zsh.cache
    fi
-   source /tmp/anyenv.cache
+   source /tmp/anyenv.zsh.cache
 fi
 
+export GOENV_ROOT="$HOME/.goenv"
+export PATH="$GOENV_ROOT/bin:$PATH"
+export PATH="$GOROOT/bin:$PATH"
+export PATH="$GOPATH/bin:$PATH"
+
+export MODULAR_HOME="$HOME/.modular"
+export PATH="$MODULAR_HOME/pkg/packages.modular.com_mojo/bin:$PATH"
+
+export PATH="$PATH:$HOME/Library/Application Support/JetBrains/Toolbox/scripts"
+export PATH="$PATH:$HOME/bin"
+
 if [ -f ~/.aliases ]; then
   . ~/.aliases
 fi

deploy.sh

@@ -10,7 +10,7 @@ if ! type anyenv >/dev/null 2>&1; then
   git clone https://github.com/riywo/anyenv ~/.anyenv
 fi
 
-files=(".zshrc" ".zshenv" ".zprofile" ".bashrc" ".bash_profile" ".aliases")
+files=(".zshrc" ".zshenv" ".zprofile" ".bashrc" ".bash_profile" ".aliases", ".gitconfig")
 
 for file in ${files[@]}
 do

import.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-targets=(".zshrc" ".zshenv" ".zprofile" ".bashrc" ".bash_profile" ".aliases")
+targets=(".zshrc" ".zshenv" ".zprofile" ".bashrc" ".bash_profile" ".aliases", ".gitconfig")
 for target in ${targets[@]}
 do
   if [ -e ~/${target} ]; then