From 624cccf17ba97797674aab064a56e1ea4033a389 Mon Sep 17 00:00:00 2001
From: Christoffer Martinsson <cm@cmtec.se>
Date: Mon, 5 May 2025 11:15:06 +0200
Subject: [PATCH] Updated scripts

---
 config/alacritty/alacritty.toml |  4 ++--
 config/waybar/style.css         |  2 +-
 update_arch.sh                  | 42 ++++++++++++++-------------------
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml
index 87a6eb7..75b6ebf 100644
--- a/config/alacritty/alacritty.toml
+++ b/config/alacritty/alacritty.toml
@@ -1,8 +1,8 @@
 [font]
-size=12.0
+size=12
 
 [font.normal]
-family = "CodeNewRoman Nerd Font Mono"
+family = "FiraCodeNerdFontMono"
 style = "Regular"
 
 [colors.primary]
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 5cb5b86..9e25644 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -48,7 +48,7 @@
 #waybar {
   background: #000000;
   color: #eeeeee;
-  font-family: CodeNewRoman Nerd Font Mono;
+  font-family: FiraCodeNerdFontMono;
   font-size: 12pt;
 }
 
diff --git a/update_arch.sh b/update_arch.sh
index 534d9ac..763782a 100755
--- a/update_arch.sh
+++ b/update_arch.sh
@@ -175,7 +175,7 @@ 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 usbutils plymouth dracut dunst hyprpaper hypridle hyprland hyprlock xdg-desktop-portal-hyprland polkit-gnome xorg-xhost gnome-keyring qt5ct qt6ct gnome-themes-extra qt5-wayland qt6-wayland lxappearance qt5-tools
+    sudo pacman --noconfirm --needed -S usbutils plymouth dracut dunst hyprpaper hypridle hyprland hyprlock xdg-desktop-portal-hyprland polkit-gnome xorg-xhost gnome-keyring qt5ct qt6ct gnome-themes-extra qt5-wayland qt6-wayland lxappearance qt5-tools adwaita-fonts gnome-disk-utility
 
     yay --noconfirm -S --needed --aur adwaita-qt5-git
     yay --noconfirm -S --needed --aur adwaita-qt6-git
@@ -233,18 +233,20 @@ fi
 # Install terminal utility
 if [ "${ROLES[TERMINAL]}" == "yes" ]; then
     printf -- '\033[33m Installing terminal utilities\n\033[37m'
-    sudo pacman --noconfirm --needed -S alacritty btop ranger tmux fd neovim
-    mkdir -p ~/.config/alacritty
-    ln -sf ~/linuxbox/config/alacritty/alacritty.toml ~/.config/alacritty/alacritty.toml
-    ln -sf ~/linuxbox/tmux.conf ~/.tmux.conf
-    mkdir -p ~/.config/nvim
-    ln -sf ~/linuxbox/config/nvim/init.lua ~/.config/nvim/init.lua
-    ln -sf ~/linuxbox/clang-format ~/.clang-format
-    ln -sf ~/linuxbox/luacheckrc ~/.luacheckrc
-    cargo install tree-sitter-cli ripgrep eza
+    sudo pacman --noconfirm --needed -R gnu-free-fonts
+    sudo pacman --noconfirm --needed -S alacritty btop ranger tmux fd neovim ttf-firacode-nerd ttf-nerd-fonts-symbols
+
+    cargo install ripgrep eza
     cargo install zoxide --locked
     cargo install starship --locked
+
+    mkdir -p ~/.config/nvim
+    mkdir -p ~/.config/alacritty
+
+    ln -sf ~/linuxbox/tmux.conf ~/.tmux.conf
     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
 
     printf -- '\033[33m Installing fzf\n\033[37m'
     rm -rf ~/.fzf
@@ -275,18 +277,21 @@ if [ "${ROLES[TERMINAL]}" == "yes" ]; then
     ln -sf ~/linuxbox/blerc ~/.blerc
 fi
 
-# Install code utilie
+# Install code utility
 if [ "${ROLES[CODE]}" == "yes" ]; then
     printf -- '\033[33m Installing code utilities\n\033[37m'
     sudo pacman --noconfirm --needed -S code gdu ruby bottom go php luarocks composer jdk-openjdk julia nodejs npm platformio-core
     sudo npm install -g neovim
+    cargo install tree-sitter-cli
+
+    ln -sf ~/linuxbox/clang-format ~/.clang-format
+    ln -sf ~/linuxbox/luacheckrc ~/.luacheckrc
 
     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
-    cargo install flip-link
+    cargo install probe-run flip-link
     mkdir -p ~/.local/bin
     ln -sf ~/linuxbox/pico-load.sh ~/.local/bin/pico-load
 
@@ -328,17 +333,6 @@ if [ "${ROLES[DESKTOP_BASE]}" == "yes" ]; then
     flatpak install -y flathub io.github.efogdev.mpris-timer
     yay --noconfirm -S --needed --aur brave-bin
 
-    printf -- '\033[33m Installing NerdFonts\n\033[37m'
-    mkdir -p /home/$USER/.local/share/fonts
-    cd /home/$USER/.local/share/fonts
-    wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/CodeNewRoman.zip
-    unzip -o CodeNewRoman.zip
-    rm CodeNewRoman.zip
-    wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/NerdFontsSymbolsOnly.zip
-    unzip -o NerdFontsSymbolsOnly.zip
-    rm NerdFontsSymbolsOnly.zip
-    fc-cache -fv
-
     printf -- '\033[33m Installing other fonts\n\033[37m'
     sudo pacman --noconfirm --needed -S noto-fonts poppler-data adobe-source-code-pro-fonts