diff --git a/.chezmoiignore b/.chezmoiignore index 336c0be..efaaa9a 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -1,3 +1,3 @@ {{- if eq .chezmoi.os "darwin" }} - private_Library + Library {{- end }} diff --git a/private_dot_config/private_fish/config.fish b/private_dot_config/private_fish/config.fish index bb948ce..9938622 100644 --- a/private_dot_config/private_fish/config.fish +++ b/private_dot_config/private_fish/config.fish @@ -6,17 +6,21 @@ set fish_color_valid_path # Commands to run in interactive sessions can go here if status is-interactive - atuin init fish --disable-up-arrow | source + if type -q atuin + atuin init fish --disable-up-arrow | source + end - # >>> conda initialize >>> - # !! Contents within this block are managed by 'conda init' !! - if test -f /usr/local/Caskroom/miniconda/base/bin/conda - eval /usr/local/Caskroom/miniconda/base/bin/conda "shell.fish" hook $argv | source & - end + # >>> conda initialize >>> + # !! Contents within this block are managed by 'conda init' !! + if test -f /usr/local/Caskroom/miniconda/base/bin/conda + eval /usr/local/Caskroom/miniconda/base/bin/conda "shell.fish" hook $argv | source & + end # <<< conda initialize <<< - # initialize jump cd - jump shell fish | source + if type -q jump + # initialize jump cd + jump shell fish | source + end end # aliases diff --git a/run_once_before_install_main_deps.sh.tmpl b/run_once_before_install_main_deps.sh.tmpl index 2c143f6..d027835 100644 --- a/run_once_before_install_main_deps.sh.tmpl +++ b/run_once_before_install_main_deps.sh.tmpl @@ -1,7 +1,7 @@ #!/usr/bin/env bash {{ if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "fedora")) -}} -sudo dnf install gpg git curl wget ripgrep fd-find unzip util-linux util-linux-user python3-pip cargo htop -y +sudo dnf install gpg git curl wget ripgrep fd-find unzip util-linux util-linux-user python3-pip cargo go htop -y sudo dnf install fish neovim -y fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher" @@ -11,6 +11,8 @@ fish -c "fish_add_path -U ~/.cargo/bin" chsh -s /usr/bin/fish -cargo install atuin +#cargo install atuin +#go install jump + {{ end -}}