From 4ba92c89626fdce07eb89f41a39daee42fff23c0 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 19 May 2025 16:10:52 +0200 Subject: [PATCH] Upadted scripts --- bashrc_arch | 14 +++----------- bashrc_ubuntu | 10 ---------- update_arch.sh | 1 + update_ubuntu.sh | 2 ++ 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/bashrc_arch b/bashrc_arch index b403786..fa08077 100644 --- a/bashrc_arch +++ b/bashrc_arch @@ -46,17 +46,9 @@ alias ls="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions" alias lsa="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions -a" alias lss="eza -1 -l --icons=auto --git-repos --git -h -g --total-size -o --no-permissions -a" +source ~/.fzf.bash +eval "$(starship init bash)" -if [[ ! $TERM =~ linux ]]; then - # if [[ $TERM =~ tmux ]]; then - source ~/.fzf.bash - eval "$(zoxide init bash)" - eval "$(starship init bash)" - # else - # if which tmux >/dev/null 2>&1; then - # tmux new-session - # fi - # fi -else +if [[ $TERM =~ linux ]]; then wrappedhl fi diff --git a/bashrc_ubuntu b/bashrc_ubuntu index 1124079..7673d0a 100644 --- a/bashrc_ubuntu +++ b/bashrc_ubuntu @@ -55,13 +55,3 @@ eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" source ~/.fzf.bash eval "$(starship init bash)" -if [[ $TERM =~ tmux ]]; then - eval "$(zoxide init bash)" -fi - -# # TMUX -# if [[ ! $TERM =~ tmux ]]; then -# if which tmux >/dev/null 2>&1; then -# tmux new-session -# fi -# fi diff --git a/update_arch.sh b/update_arch.sh index ca45b70..0b83519 100755 --- a/update_arch.sh +++ b/update_arch.sh @@ -172,6 +172,7 @@ rustup default stable ln -sf ~/linuxbox/bashrc_arch ~/.bashrc mkdir -p ~/.local/bin ln -sf ~/linuxbox/update_wrapper.sh ~/.local/bin/update +ln -sf ~/linuxbox/start_nvim.sh ~/.local/bin/start_nvim sudo localectl set-locale LANG=en_US.UTF-8 # Install hyprland diff --git a/update_ubuntu.sh b/update_ubuntu.sh index 164ce76..cb327d7 100755 --- a/update_ubuntu.sh +++ b/update_ubuntu.sh @@ -83,6 +83,8 @@ else ln -sf ~/linuxbox/config/alacritty/alacritty.toml ~/.config/alacritty/alacritty.toml fi ln -sf ~/linuxbox/update_wrapper.sh ~/.local/bin/update +ln -sf ~/linuxbox/start_nvim.sh ~/.local/bin/start_nvim +ln -sf ~/linuxbox/start_toolbox.sh ~/.local/bin/start_toolbox # Install brew printf -- '\033[33m Installing Homebrew\n\033[37m'