From b6ff30b80c7346d5ea6ca675f561e0c876495aa6 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Tue, 26 Nov 2024 21:39:54 +0100 Subject: [PATCH] Added missing files. Added snaphot before update. --- config/gtk-3.0/settings.ini | 15 ++++++++++++ config/qt5ct/qt5ct.conf | 31 +++++++++++++++++++++++ config/qt6ct/qt6ct.conf | 31 +++++++++++++++++++++++ config/waybar/config | 11 +++++---- config/waybar/style.css | 10 +++++++- update_arch.sh | 49 ++++++++++++++++++++++--------------- wrappedhl | 8 ++++++ 7 files changed, 129 insertions(+), 26 deletions(-) create mode 100644 config/gtk-3.0/settings.ini create mode 100644 config/qt5ct/qt5ct.conf create mode 100644 config/qt6ct/qt6ct.conf create mode 100755 wrappedhl diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini new file mode 100644 index 0000000..c74691a --- /dev/null +++ b/config/gtk-3.0/settings.ini @@ -0,0 +1,15 @@ +[Settings] +gtk-theme-name=Adwaita-dark +gtk-icon-theme-name=Adwaita +gtk-font-name=Cantarell 11 +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintfull +gtk-application-prefer-dark-theme=1 diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf new file mode 100644 index 0000000..b9c5869 --- /dev/null +++ b/config/qt5ct/qt5ct.conf @@ -0,0 +1,31 @@ +[Appearance] +color_scheme_path=/usr/share/qt5ct/colors/airy.conf +custom_palette=false +standard_dialogs=default +style=Adwaita-Dark + +[Fonts] +fixed="Noto Sans,12,-1,5,50,0,0,0,0,0" +general="Noto Sans,12,-1,5,50,0,0,0,0,0" + +[Interface] +activate_item_on_single_click=1 +buttonbox_layout=0 +cursor_flash_time=1000 +dialog_buttons_have_icons=1 +double_click_interval=400 +gui_effects=@Invalid() +keyboard_scheme=2 +menus_have_icons=true +show_shortcuts_in_context_menus=true +stylesheets=@Invalid() +toolbutton_style=4 +underline_shortcut=1 +wheel_scroll_lines=3 + +[SettingsWindow] +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4y\0\0\x2\xdf\0\0\0\0\0\0\0\0\0\0\x4\x7f\0\0\x2\xdf\0\0\0\0\x2\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\x4y\0\0\x2\xdf) + +[Troubleshooting] +force_raster_widgets=1 +ignored_applications=@Invalid() diff --git a/config/qt6ct/qt6ct.conf b/config/qt6ct/qt6ct.conf new file mode 100644 index 0000000..e786205 --- /dev/null +++ b/config/qt6ct/qt6ct.conf @@ -0,0 +1,31 @@ +[Appearance] +color_scheme_path=/usr/share/qt6ct/colors/airy.conf +custom_palette=false +standard_dialogs=default +style=Adwaita-Dark + +[Fonts] +fixed="Noto Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" +general="Noto Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" + +[Interface] +activate_item_on_single_click=1 +buttonbox_layout=0 +cursor_flash_time=1000 +dialog_buttons_have_icons=1 +double_click_interval=400 +gui_effects=@Invalid() +keyboard_scheme=2 +menus_have_icons=true +show_shortcuts_in_context_menus=true +stylesheets=@Invalid() +toolbutton_style=4 +underline_shortcut=1 +wheel_scroll_lines=3 + +[SettingsWindow] +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x5y\0\0\x5\x9b\0\0\0\0\0\0\0\0\0\0\x5\x7f\0\0\x5\x9f\0\0\0\0\x2\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\x5y\0\0\x5\x9b) + +[Troubleshooting] +force_raster_widgets=1 +ignored_applications=@Invalid() diff --git a/config/waybar/config b/config/waybar/config index 50ff4b5..687eb3d 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -63,7 +63,7 @@ "cpu": { "interval": 5, - "format": "CPU:{usage:02}%", // Icon: microchip + "format": "CPU:{usage:02}%", "states": { "warning": 70, "critical": 90 @@ -72,7 +72,7 @@ "memory": { "interval": 10, - "format": "RAM:{used:0.1f}G/{total:0.1f}G", // Icon: memory + "format": "RAM:{used:0.1f}G/{total:0.1f}G", "states": { "warning": 70, "critical": 90 @@ -83,9 +83,10 @@ "network": { "interval": 5, "on-click": "networkmanager_dmenu", - "format-wifi": "WIFI:{essid} ({signalStrength}%)", // Icon: wifi - "format-ethernet": "ETH:{ipaddr}", // Icon: ethernet - "format-disconnected": "ETH Disconnected", + "format-wifi": "ETH:{ipaddr} {essid} ({signalStrength}%)", + "format-ethernet": "ETH:{ipaddr}", + "format-disconnected": "ETH:Disconnected", + "format-linked": "ETH:Pending", "tooltip-format": "{ifname}: {ipaddr}" }, diff --git a/config/waybar/style.css b/config/waybar/style.css index abccc1e..8257830 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -108,10 +108,18 @@ color: #afd787; } -#network.disconnected { +#network.linked { color: #d7af5f; } +#network.disconnected { + color: #d75400; +} + +#network.disabled { + color: #d75400; +} + #temperature { color: #afd787; } diff --git a/update_arch.sh b/update_arch.sh index dbc68b2..768fe3f 100755 --- a/update_arch.sh +++ b/update_arch.sh @@ -14,31 +14,37 @@ echo -e ' \e[H\e[2J \e[1;32mCMtec CMBOX install/Update script\e[0;37m ' +# Create backup/snapshot +if pacman -Qs timeshift >/dev/null; then + printf -- '\033[33m Creating backup/snapshot\n\033[37m' + sudo timeshift --create --comments "Update script" --tags O +fi + # Update all pacman packages printf -- '\033[33m Updating pacman packages\n\033[37m' sudo pacman -Suyy --noconfirm # Update all AUR packages printf -- '\033[33m Updating AUR packages\n\033[37m' if pacman -Qs yay >/dev/null; then - yay --noconfirm --aur + yay --noconfirm --aur else - sudo pacman -S --needed --noconfirm git base-devel - if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi - cd ~ - git clone https://aur.archlinux.org/yay-bin.git - cd yay-bin - makepkg --noconfirm -si - cd ~ - if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi + sudo pacman -S --needed --noconfirm git base-devel + if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi + cd ~ + git clone https://aur.archlinux.org/yay-bin.git + cd yay-bin + makepkg --noconfirm -si + cd ~ + if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi fi # Update all Flatpak packages printf -- '\033[33m Updating Flatpak packages\n\033[37m' if pacman -Qs flatpak >/dev/null; then - flatpak update -y + flatpak update -y else - sudo pacman --noconfirm --needed -S flatpak - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install -y flathub com.github.tchx84.Flatseal + sudo pacman --noconfirm --needed -S flatpak + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + flatpak install -y flathub com.github.tchx84.Flatseal fi # Install initial system packages @@ -62,8 +68,12 @@ yay --noconfirm -S --needed --aur adwaita-qt6-git yay --noconfirm -S --needed --aur wlogout mkdir -p ~/.config/hypr +ln -sf ~/code_server/wrappedhl ~/.local/bin/wrappedhl ln -sf ~/code_server/config/hypr/hyprland.conf ~/.config/hypr/hyprland.conf ln -sf ~/code_server/config/hypr/hypridle.conf ~/.config/hypr/hypridle.conf +ln -sf ~/code_server/config/gtk-3.0/settings.ini ~/.config/gtk-3.0/settings.ini +ln -sf ~/code_server/config/qt5ct/qt5ct.conf ~/.config/qt5ct/qt5ct.conf +ln -sf ~/code_server/config/qt6ct/qt6ct.conf ~/.config/qt6ct/qt6ct.conf # Install rofi printf -- '\033[33m Installing rofi\n\033[37m' @@ -140,12 +150,12 @@ sudo mv virtualhereclient.service /etc/systemd/system/virtualhereclient.service # Install teensy udev rules (only for non docker system) if [ ! -f /.dockerenv ]; then - printf -- '\033[33m Installing teensy udev rules\n\033[37m' - sudo rm -f /tmp/00-teensy.rules /etc/udev/rules.d/00-teensy.rules /lib/udev/rules.d/00-teensy.rules - sudo wget -O /tmp/00-teensy.rules https://www.pjrc.com/teensy/00-teensy.rules - sudo install -o root -g root -m 0664 /tmp/00-teensy.rules /lib/udev/rules.d/00-teensy.rules - sudo udevadm control --reload-rules - sudo udevadm trigger + printf -- '\033[33m Installing teensy udev rules\n\033[37m' + sudo rm -f /tmp/00-teensy.rules /etc/udev/rules.d/00-teensy.rules /lib/udev/rules.d/00-teensy.rules + sudo wget -O /tmp/00-teensy.rules https://www.pjrc.com/teensy/00-teensy.rules + sudo install -o root -g root -m 0664 /tmp/00-teensy.rules /lib/udev/rules.d/00-teensy.rules + sudo udevadm control --reload-rules + sudo udevadm trigger fi # Install neovim @@ -218,7 +228,6 @@ printf -- '\033[33m Installing ble.sh\n\033[37m' if [ -d ~/ble.sh ]; then rm -rf ~/ble.sh; fi cd ~ git clone --recursive --depth 1 --shallow-submodules https://github.com/akinomyoga/ble.sh.git -#make -C ble.sh install PREFIX=~/.local make -C ble.sh install if [ -d ~/ble.sh ]; then rm -rf ~/ble.sh; fi ln -sf ~/code_server/blerc ~/.blerc diff --git a/wrappedhl b/wrappedhl new file mode 100755 index 0000000..524042c --- /dev/null +++ b/wrappedhl @@ -0,0 +1,8 @@ +#!/bin/sh + +cd ~ + +export _JAVA_AWT_WM_NONREPARENTING=1 +export XCURSOR_SIZE=24 + +exec Hyprland >/dev/null