diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 7ea42be..5dc07b4 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -473,24 +473,24 @@ require('lazy').setup({ }, }, - { - 'akinsho/toggleterm.nvim', - version = "*", - config = function() - require("toggleterm").setup { - open_mapping = [[]], - shade_terminals = false, - highlights = { - Normal = { - guibg = "#262626", - }, - NormalNC = { - guibg = "#262626", - }, - }, - } - end, - }, + -- { + -- 'akinsho/toggleterm.nvim', + -- version = "*", + -- config = function() + -- require("toggleterm").setup { + -- open_mapping = [[]], + -- shade_terminals = false, + -- highlights = { + -- Normal = { + -- guibg = "#262626", + -- }, + -- NormalNC = { + -- guibg = "#262626", + -- }, + -- }, + -- } + -- end, + -- }, { "folke/todo-comments.nvim", @@ -772,7 +772,7 @@ cmp.setup.cmdline(':', { -- [[ Configure Treesitter ]] require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' }, + ensure_installed = { 'markdown', 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, diff --git a/tmux.conf b/tmux.conf index a76feb2..e5fb18e 100644 --- a/tmux.conf +++ b/tmux.conf @@ -34,11 +34,14 @@ set -g status-right-length 100 # Use normal and bright monochrome colors to show a tab line on the left. set -g status-justify left set-window-option -g window-status-separator '' -set-window-option -g window-status-format '#[bg=black,fg=#6c6c6c] #I #W ' -set-window-option -g window-status-current-format '#[bg=black,fg=#b0b0b0] #I #W ' +set-window-option -g window-status-format '#[bg=#0c0c0c,fg=#6c6c6c] #I #W ' +set-window-option -g window-status-current-format '#[bg=#0c0c0c,fg=#b0b0b0] #I #W ' # Switching panes should change the foreground color but not border colors. set -g window-style 'bg=default,fg=#c6c6c6' set -g window-active-style 'bg=default,fg=white' -set -g pane-border-style 'bg=default,fg=black' -set -g pane-active-border-style 'bg=default,fg=black' +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 4bf7a81..452843d 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 + build-essential libssl-dev libffi-dev python3-dev file tmux libudev-dev pkg-config locales pipx btop # Setup locals printf -- '\033[33m Setup locals\n\033[37m' @@ -196,20 +196,6 @@ printf -- '\033[33m Installing neovim for node\n\033[37m' sudo npm install -g neovim if [ $DESKTOP = "yes" ]; then - if [ $VER = "22.04" ]; then - # Install Ubuntu intune - printf -- '\033[33m Installing intune\n\033[37m' - sudo nala install -y software-properties-common apt-transport-https curl ca-certificates - curl -fSsL https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor | sudo tee /usr/share/keyrings/microsoft-edge.gpg > /dev/null - echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft-edge.gpg] https://packages.microsoft.com/repos/edge stable main' | sudo tee /etc/apt/sources.list.d/microsoft-edge.list - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg - sudo install -o root -g root -m 644 microsoft.gpg /usr/share/keyrings/ - sudo sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft.gpg] https://packages.microsoft.com/ubuntu/22.04/prod jammy main" > /etc/apt/sources.list.d/microsoft-ubuntu-jammy-prod.list' - sudo rm microsoft.gpg - sudo nala update - sudo nala install -y microsoft-edge-stable intune-portal - fi - # Install Ubuntu apps printf -- '\033[33m Installing desktop dep.\n\033[37m' sudo add-apt-repository -y ppa:flatpak/stable @@ -258,18 +244,20 @@ if [ $DESKTOP = "yes" ]; then rm NerdFontsSymbolsOnly.zip fc-cache -fv - printf -- '\033[33m Installing Virtualbox\n\033[37m' - curl https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor > oracle_vbox_2016.gpg - curl https://www.virtualbox.org/download/oracle_vbox.asc | gpg --dearmor > oracle_vbox.gpg - sudo install -o root -g root -m 644 oracle_vbox_2016.gpg /etc/apt/trusted.gpg.d/ - sudo install -o root -g root -m 644 oracle_vbox.gpg /etc/apt/trusted.gpg.d/ - echo "deb [arch=amd64] http://download.virtualbox.org/virtualbox/debian $(lsb_release -sc) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list - sudo nala update - sudo nala install -y linux-headers-$(uname -r) dkms - sudo nala install virtualbox-7.0 -y - wget https://download.virtualbox.org/virtualbox/7.0.0/Oracle_VM_VirtualBox_Extension_Pack-7.0.0.vbox-extpack - sudo VBoxManage extpack install --replace Oracle_VM_VirtualBox_Extension_Pack-7.0.0.vbox-extpack --accept-license=33d7284dc4a0ece381196fda3cfe2ed0e1e8e7ed7f27b9a9ebc4ee22e24bd23c - sudo usermod -a -G vboxusers $USER + if [ "$(dpkg -l | awk '/virtualbox/ {print }'|wc -l)" -ge 0 ]; then + printf -- '\033[33m Installing Virtualbox\n\033[37m' + curl https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor > oracle_vbox_2016.gpg + curl https://www.virtualbox.org/download/oracle_vbox.asc | gpg --dearmor > oracle_vbox.gpg + sudo install -o root -g root -m 644 oracle_vbox_2016.gpg /etc/apt/trusted.gpg.d/ + sudo install -o root -g root -m 644 oracle_vbox.gpg /etc/apt/trusted.gpg.d/ + echo "deb [arch=amd64] http://download.virtualbox.org/virtualbox/debian $(lsb_release -sc) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list + sudo nala update + sudo nala install -y linux-headers-$(uname -r) dkms + sudo nala install virtualbox-7.0 -y + wget https://download.virtualbox.org/virtualbox/7.0.0/Oracle_VM_VirtualBox_Extension_Pack-7.0.0.vbox-extpack + sudo VBoxManage extpack install --replace Oracle_VM_VirtualBox_Extension_Pack-7.0.0.vbox-extpack --accept-license=33d7284dc4a0ece381196fda3cfe2ed0e1e8e7ed7f27b9a9ebc4ee22e24bd23c + sudo usermod -a -G vboxusers $USER + fi fi # Symlink nvim config