From 8150544a47cb56bea0e0680bec366d0746e0f047 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 30 Sep 2024 07:46:39 +0200 Subject: [PATCH] updated scripts --- config/nvim/init.lua | 5 +++++ tmux.conf | 6 +++++- update.sh | 26 ++++++++++++++++---------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 5dc07b4..c38837c 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -342,6 +342,11 @@ require('lazy').setup({ }, -- GUI ------------------------------------------------------ + -- { + -- 'https://github.com/fresh2dev/zellij.vim.git', + -- lazy = false, + -- }, + { 'mrjones2014/smart-splits.nvim', opts = { diff --git a/tmux.conf b/tmux.conf index e5fb18e..cd069ab 100644 --- a/tmux.conf +++ b/tmux.conf @@ -18,6 +18,11 @@ bind -n C-k run "($is_vim && tmux send-keys C-k) || ($is_fzf && tmux send-keys C bind -n C-l run "($is_vim && tmux send-keys C-l) || tmux select-pane -R" bind -n 'C-\' if-shell "$is_vim" "send-keys C-\\" "select-pane -l" +bind -n M-h run "($is_vim && tmux send-keys M-h) || tmux resize-pane -L 1" +bind -n M-j run "($is_vim && tmux send-keys M-j) || tmux resize-pane -D 1" +bind -n M-k run "($is_vim && tmux send-keys M-k) || tmux resize-pane -U 1" +bind -n M-l run "($is_vim && tmux send-keys M-l) || tmux resize-pane -R 1" + set-option -g status-position bottom set-option -g default-terminal "screen-256color" set-option -sa terminal-features ',xterm-256color:RGB' @@ -44,4 +49,3 @@ set -g pane-border-style 'bg=default,fg=#0c0c0c' set -g pane-active-border-style 'bg=default,fg=#afd787' set -g mouse on -set -g mouse-select-pane on diff --git a/update.sh b/update.sh index 5cca7c6..33f884d 100755 --- a/update.sh +++ b/update.sh @@ -33,7 +33,7 @@ sudo apt install -y nala sudo nala update sudo nala upgrade -y sudo nala install -y gpg ninja-build gettext cmake unzip curl python3 python3-pip python3-venv \ - build-essential libssl-dev libffi-dev python3-dev file tmux libudev-dev pkg-config locales pipx btop + build-essential libssl-dev libffi-dev python3-dev file tmux libudev-dev pkg-config locales pipx btop ncdu ranger # Setup locals printf -- '\033[33m Setup locals\n\033[37m' @@ -106,6 +106,10 @@ printf -- '\033[33m Installing ripgrep\n\033[37m' cargo install ripgrep # sudo apt install -y ripgrep +# Install zellij +printf -- '\033[33m Installing zellij\n\033[37m' +cargo install --locked zellij + # Install fd printf -- '\033[33m Installing fd\n\033[37m' sudo nala install -y fd-find @@ -200,7 +204,7 @@ if [ $DESKTOP == "yes" ]; then printf -- '\033[33m Installing desktop dep.\n\033[37m' sudo add-apt-repository -y ppa:flatpak/stable sudo nala update - sudo nala install -y flatpak gnome-shell-extension-manager + sudo nala install -y flatpak gnome-shell-extension-manager remmina flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo printf -- '\033[33m Installing Visual Code\n\033[37m' @@ -311,13 +315,15 @@ echo 'alias vi="nvim"' >> ~/.bashrc echo 'alias vim="nvim"' >> ~/.bashrc echo 'source ~/.fzf.bash' >> ~/.bashrc -# Add tmux/nvim autostart to bashrc -printf -- '\033[33m Adding tmux/nvim autostart to bashrc\n\033[37m' -echo "# TMUX" >> ~/.bashrc -echo "if [[ ! \$TERM =~ screen ]]; then" >> ~/.bashrc -echo "if which tmux >/dev/null 2>&1; then" >> ~/.bashrc -echo ' test -z "$TMUX" && (tmux attach || tmux new-session ~/.start)' >> ~/.bashrc -echo "fi" >> ~/.bashrc -echo "fi" >> ~/.bashrc +if [ $DESKTOP == "no" ]; then + # Add tmux/nvim autostart to bashrc + printf -- '\033[33m Adding tmux/nvim autostart to bashrc\n\033[37m' + echo "# TMUX" >> ~/.bashrc + echo "if [[ ! \$TERM =~ screen ]]; then" >> ~/.bashrc + echo "if which tmux >/dev/null 2>&1; then" >> ~/.bashrc + echo ' test -z "$TMUX" && (tmux attach || tmux new-session ~/.start)' >> ~/.bashrc + echo "fi" >> ~/.bashrc + echo "fi" >> ~/.bashrc +fi printf -- '\033[32m \n\n***** Update complete! Please restart your terminal. *****\n\n\033[37m'