Skip to content

Commit

Permalink
import current settings
Browse files Browse the repository at this point in the history
  • Loading branch information
circled9 committed May 19, 2024
1 parent 55a74cb commit 8bb6d13
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 94 deletions.
28 changes: 14 additions & 14 deletions files/.aliases
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
alias cat='bat'
alias find='fd'
alias grep='rg'
alias ll='ls -al'
alias ls='exa'
alias ls='eza'
alias od='hexyl'
alias ps='procs'
alias vim='nvim'

alias ll='ls -al'

alias fcd=cd-fzf
alias cr=ghq-fzf
alias fvim=vi-fzf

case ${OSTYPE} in
darwin*)
alias code='open -b com.microsoft.VSCODE'
alias smerge='open -b com.sublimemerge'
alias smerge='open -b com.sublimemerge'
;;
esac

function cd-fzf() {
moveto=./$(ls -d */ | fzf --reverse)
cd $moveto
moveto=./$(ls -d */ | fzf --reverse)
cd $moveto
}

function ghq-fzf() {
moveto=$(ghq root)/$(ghq list | fzf --reverse)
cd $moveto
moveto=$(ghq root)/$(ghq list | fzf --reverse)
cd $moveto
}

function vi-fzf() {
moveto=./$(find . -d 1 --type f | fzf --reverse)
vim $moveto
moveto=./$(find . -d 1 --type f | fzf --reverse)
vim $moveto
}

alias fcd=cd-fzf
alias cr=ghq-fzf
alias fvim=vi-fzf
31 changes: 12 additions & 19 deletions files/.bashrc
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
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="/opt/homebrew/opt/curl/bin:$PATH"
export PATH="$HOME/.local/share/mise/shims:$PATH"
export PATH="$MODULAR_HOME/pkg/packages.modular.com_mojo/bin:$PATH"
export PATH="$HOME/Library/Application Support/JetBrains/Toolbox/scripts:$PATH"
export PATH="$HOME/bin:$PATH"

source "$HOME/.cargo/env"
source "$HOME/.rye/env"

export PATH="$PATH:$HOME/Library/Application Support/JetBrains/Toolbox/scripts"
export PATH="$PATH:$HOME/bin"
eval "$(/opt/homebrew/bin/brew shellenv)"
eval "$($HOME/.local/bin/mise activate bash)"
eval "$(zoxide init bash)"
eval "$(starship init bash)"

if [ -f ~/.aliases ]; then
. ~/.aliases
Expand Down
36 changes: 14 additions & 22 deletions files/.config/fish/config.fish
Original file line number Diff line number Diff line change
@@ -1,45 +1,37 @@
fish_add_path $HOME/.cargo/bin
set --export MODULAR_HOME "$HOME/.modular"

set -gx GOENV_ROOT $HOME/.goenv
fish_add_path $GOENV_ROOT/bin
fish_add_path $GOROOT/bin
fish_add_path "$HOME/opt/homebrew/opt/curl/bin"
fish_add_path "$HOME/.local/share/mise/shims"
fish_add_path "$MODULAR_HOME/pkg/packages.modular.com_mojo/bin"
fish_add_path "$HOME/Library/Application Support/JetBrains/Toolbox/scripts"
fish_add_path "$HOME/bin"

set -gx MODULAR_HOME $HOME/.modular
fish_add_path $MODULAR_HOME/pkg/packages.modular.com_mojo/bin

fish_add_path $HOME/bin
source "$HOME/.cargo/env"
source "$HOME/.rye/env"

eval (/opt/homebrew/bin/brew shellenv)
$HOME/.local/bin/mise activate fish | source

if status is-interactive
eval (/opt/homebrew/bin/brew shellenv)

zoxide init fish | source
starship init fish | source

if test -x /opt/homebrew/bin/anyenv
if not test -f /tmp/anyenv.fish.cache
anyenv init --no-rehash - fish > /tmp/anyenv.fish.cache
end
source /tmp/anyenv.fish.cache
end


alias ll='ls -al'

alias cat='bat'
alias find='fd'
alias grep='rg'
alias ls='exa'
alias ls='eza'
alias od='hexyl'
alias ps='procs'
alias vim='nvim'

alias ll='ls -al'

alias cr=ghq-fzf
alias fcd=cd-fzf
alias fvim=vi-fzf

switch (uname)
case Darwin
alias code='open -b com.microsoft.VSCODE'
alias smerge='open -b com.sublimemerge'
end
end
Expand Down
18 changes: 0 additions & 18 deletions files/.editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion files/.zshenv

This file was deleted.

39 changes: 19 additions & 20 deletions files/.zshrc
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
eval "$(/opt/homebrew/bin/brew shellenv)"
eval "$(starship init zsh)"
export MODULAR_HOME="$HOME/.modular"

if [ -x /opt/homebrew/bin/anyenv ]
then
if ! [ -f /tmp/anyenv.zsh.cache ]
then
anyenv init --no-rehash - zsh > /tmp/anyenv.zsh.cache
zcompile /tmp/anyenv.zsh.cache
fi
source /tmp/anyenv.zsh.cache
fi
path=(
/opt/homebrew/opt/curl/bin
$HOME/.local/share/mise/shims
$MODULAR_HOME/pkg/packages.modular.com_mojo/bin
$HOME/Library/Application Support/JetBrains/Toolbox/scripts
$HOME/bin
$path
)

export GOENV_ROOT="$HOME/.goenv"
export PATH="$GOENV_ROOT/bin:$PATH"
export PATH="$GOROOT/bin:$PATH"
export PATH="$GOPATH/bin:$PATH"
source "$HOME/.cargo/env"
source "$HOME/.rye/env"

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"
eval "$(/opt/homebrew/bin/brew shellenv)"
eval "$($HOME/.local/bin/mise activate zsh)"
eval "$(zoxide init zsh)"
eval "$(starship init zsh)"

if [ -f ~/.aliases ]; then
. ~/.aliases
fi

# if [[ -o interactive ]]; then
# exec fish
# fi

0 comments on commit 8bb6d13

Please sign in to comment.