From 9b5cbec7adc81529a30bbfdb2b7fdb57a25b57a7 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Sat, 27 Sep 2025 17:59:45 +0200 Subject: [PATCH] Updated scripts --- config/hypr/hyprland.conf | 3 +- update_arch.sh | 64 ++++++++++++++------------------------- 2 files changed, 25 insertions(+), 42 deletions(-) diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 40f743e..59e3160 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -159,7 +159,8 @@ bind = $mainMod, H, layoutmsg, preselect l bind = $mainMod, L, layoutmsg, preselect r bind = $mainMod, J, layoutmsg, preselect d bind = $mainMod, K, layoutmsg, preselect u -bind = $mainMod, F, exec, walker --modules applications +# bind = $mainMod, F, exec, walker --modules applications +bind = $mainMod, F, exec, wofi --show drun bind = SUPER, L, exec, python ~/linuxbox/black.py bind = ALT, Tab, workspace, e+1 bind = ALT SHIFT, Tab, workspace, emptyn diff --git a/update_arch.sh b/update_arch.sh index 6dfbf87..41cf427 100755 --- a/update_arch.sh +++ b/update_arch.sh @@ -10,7 +10,7 @@ HOSTNAME=$(hostname | tr '[:lower:]' '[:upper:]') # Declare associative array for roles declare -A ROLES -for role in MUSIC LAB BT GAME VR DESKTOP_BASE DESKTOP_WORK CODE NVIDIA_GPU NVIDIA_1080_GPU TERMINAL HYPERLAND; do +for role in MUSIC LAB BT GAME VR DESKTOP_BASE DESKTOP_WORK NVIDIA_GPU NVIDIA_1080_GPU TERMINAL HYPERLAND; do ROLES["$role"]="no" done @@ -19,7 +19,6 @@ case "$HOSTNAME" in CMBOX) ROLES[DESKTOP_BASE]="yes" ROLES[DESKTOP_WORK]="yes" - ROLES[CODE]="yes" ROLES[TERMINAL]="yes" ROLES[HYPERLAND]="yes" ROLES[MUSIC]="yes" @@ -34,7 +33,6 @@ STEAMBOX) ;; LABBOX) ROLES[DESKTOP_BASE]="yes" - ROLES[CODE]="yes" ROLES[TERMINAL]="yes" ROLES[HYPERLAND]="yes" ROLES[LAB]="yes" @@ -172,15 +170,15 @@ sudo localectl set-locale LANG=en_US.UTF-8 # Install hyprland if [ "${ROLES[HYPERLAND]}" == "yes" ]; then printf -- '\033[33m Installing hyprland\n\033[37m' - sudo pacman --noconfirm --needed -S wayvnc nm-connection-editor usbutils plymouth dracut dunst hyprpaper hypridle hyprland hyprlock xdg-desktop-portal-hyprland polkit-gnome xorg-xhost gnome-keyring qt6ct qt6ct gnome-themes-extra qt5-wayland qt6-wayland lxappearance qt5-tools adwaita-fonts gnome-disk-utility hyprpaper tk + sudo pacman --noconfirm --needed -S alacritty wofi wayvnc nm-connection-editor usbutils plymouth dracut dunst hyprpaper hypridle hyprland hyprlock xdg-desktop-portal-hyprland polkit-gnome xorg-xhost gnome-keyring qt6ct qt6ct gnome-themes-extra qt5-wayland qt6-wayland lxappearance qt5-tools adwaita-fonts gnome-disk-utility hyprpaper tk yay --noconfirm -S --needed --aur adwaita-qt5-git yay --noconfirm -S --needed --aur adwaita-qt6-git yay --noconfirm -S --needed --aur hyprshot - yay --noconfirm -S --needed --aur walker-bin mkdir -p ~/.local/bin mkdir -p ~/.config/hypr + mkdir -p ~/.config/alacritty if [ -f ~/linuxbox/config/hypr/hyprland_$HOSTNAME.conf ]; then ln -sf ~/linuxbox/config/hypr/hyprland_$HOSTNAME.conf ~/.config/hypr/hyprland_extra.conf @@ -202,6 +200,7 @@ if [ "${ROLES[HYPERLAND]}" == "yes" ]; then ln -sf ~/linuxbox/config/qt6ct ~/.config ln -sf ~/linuxbox/config/dunst ~/.config ln -sf ~/linuxbox/config/walker ~/.config + ln -sf ~/linuxbox/config/alacritty/alacritty.toml ~/.config/alacritty/alacritty.toml printf -- '\033[33m Installing waybar\n\033[37m' sudo pacman --noconfirm --needed -S waybar @@ -238,17 +237,14 @@ if [ "${ROLES[TERMINAL]}" == "yes" ]; then if pacman -Qs gnu-free-fonts >/dev/null; then sudo pacman --noconfirm -R gnu-free-fonts fi - sudo pacman --noconfirm --needed -S dysk lazygit alacritty btop ranger tmux fd ttf-nerd-fonts-symbols ttf-roboto-mono-nerd gdu ruby bottom go php luarocks composer jdk-openjdk julia nodejs npm + sudo pacman --noconfirm --needed -S dysk lazygit btop ranger tmux fd ttf-nerd-fonts-symbols ttf-roboto-mono-nerd gdu ruby bottom go php luarocks composer jdk-openjdk julia nodejs npm yay --noconfirm -S --needed --aur neovim-git-bin sudo npm install -g neovim - cargo install tree-sitter-cli ripgrep eza - cargo install zoxide --locked - cargo install starship --locked + cargo install tree-sitter-cli ripgrep eza starship mkdir -p ~/.config/nvim - mkdir -p ~/.config/alacritty mkdir -p ~/.config/lazygit mkdir -p ~/.local/bin @@ -256,14 +252,9 @@ if [ "${ROLES[TERMINAL]}" == "yes" ]; then ln -sf ~/linuxbox/luacheckrc ~/.luacheckrc ln -sf ~/linuxbox/config/starship.toml ~/.config/starship.toml ln -sf ~/linuxbox/config/nvim/init.lua ~/.config/nvim/init.lua - ln -sf ~/linuxbox/config/alacritty/alacritty.toml ~/.config/alacritty/alacritty.toml ln -sf ~/linuxbox/config/lazygit/config.yml ~/.config/lazygit/config.yml ln -sf ~/linuxbox/start_nvim.sh ~/.local/bin/start_nvim - if [ -d ~/.local/share/nvim/lazy ]; then - nvim --headless "+Lazy! sync" +qa - fi - printf -- '\033[33m Installing fzf\n\033[37m' rm -rf ~/.fzf git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf @@ -275,29 +266,21 @@ if [ "${ROLES[TERMINAL]}" == "yes" ]; then yay --noconfirm -S --needed --aur dockerfile-language-server rustup component add rust-analyzer clippy rustfmt - printf -- '\033[33m Installing Rust embedded rp2040\n\033[37m' - cd ~ - rustup target add thumbv6m-none-eabi - cargo install elf2uf2-rs --locked - cargo install probe-run flip-link - mkdir -p ~/.local/bin - ln -sf ~/linuxbox/pico-load.sh ~/.local/bin/pico-load - - printf -- '\033[33m Installing VirtualHere client\n\033[37m' - cd ~ - wget https://www.virtualhere.com/sites/default/files/usbclient/scripts/virtualhereclient.service - wget https://www.virtualhere.com/sites/default/files/usbclient/vhclientx86_64 - wget https://www.virtualhere.com/sites/default/files/usbclient/vhuit64 - chmod +x ./vhclientx86_64 - chmod +x ./vhuit64 - sudo mv ./vhclientx86_64 /usr/sbin - sudo mv ./vhuit64 /usr/sbin - echo "$USER ALL=(ALL:ALL) NOPASSWD: /usr/sbin/vhclientx86_64" | sudo tee /etc/sudoers.d/$USER+vhclientx86_64 - echo "$USER ALL=(ALL:ALL) NOPASSWD: /usr/sbin/vhuit64" | sudo tee /etc/sudoers.d/$USER+vhuit64 - sudo mv virtualhereclient.service /etc/systemd/system/virtualhereclient.service - sudo systemctl daemon-reload - sudo systemctl enable virtualhereclient.service - sudo systemctl start virtualhereclient.service + # printf -- '\033[33m Installing VirtualHere client\n\033[37m' + # cd ~ + # wget https://www.virtualhere.com/sites/default/files/usbclient/scripts/virtualhereclient.service + # wget https://www.virtualhere.com/sites/default/files/usbclient/vhclientx86_64 + # wget https://www.virtualhere.com/sites/default/files/usbclient/vhuit64 + # chmod +x ./vhclientx86_64 + # chmod +x ./vhuit64 + # sudo mv ./vhclientx86_64 /usr/sbin + # sudo mv ./vhuit64 /usr/sbin + # echo "$USER ALL=(ALL:ALL) NOPASSWD: /usr/sbin/vhclientx86_64" | sudo tee /etc/sudoers.d/$USER+vhclientx86_64 + # echo "$USER ALL=(ALL:ALL) NOPASSWD: /usr/sbin/vhuit64" | sudo tee /etc/sudoers.d/$USER+vhuit64 + # sudo mv virtualhereclient.service /etc/systemd/system/virtualhereclient.service + # sudo systemctl daemon-reload + # sudo systemctl enable virtualhereclient.service + # sudo systemctl start virtualhereclient.service fi @@ -307,10 +290,9 @@ if [ "${ROLES[DESKTOP_BASE]}" == "yes" ]; then sudo pacman --noconfirm --needed -S cameractrls feh flatpak install -y flathub com.discordapp.Discord flatpak install -y flathub com.behringer.XAirEdit - flatpak install -y flathub com.github.vikdevelop.timer - flatpak install -y flathub io.github.efogdev.mpris-timer flatpak install -y flathub org.remmina.Remmina - yay --noconfirm -S --needed --aur brave-bin + flatpak install -y flathub com.brave.Browser + # yay --noconfirm -S --needed --aur brave-bin printf -- '\033[33m Installing other fonts\n\033[37m' sudo pacman --noconfirm --needed -S noto-fonts poppler-data adobe-source-code-pro-fonts