Fixing an embarrassing amount of errors after having to use it for the first time

configs/autostart/ulauncher.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Ulauncher
-Comment=Application launcher for Linux
-GenericName=Launcher
-Categories=GNOME;GTK;Utility;
-TryExec=/usr/bin/ulauncher
-Exec=env GDK_BACKEND=x11 /usr/bin/ulauncher --hide-window --hide-window
-Icon=ulauncher
-Terminal=false
-Type=Application
-X-GNOME-Autostart-enabled=true

configs/copy/home/.local/share/applications/jump-desktop.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Jump Desktop
-Exec=bash -c "wine /home/gib/.wine/drive_c/Program\ Files/Phase\ Five\ Systems/Jump\ Desktop/JumpClient.exe"
-Terminal=false
-Type=Application
-Icon=/home/gib/.wine/drive_c/Program\ Files/Phase\ Five\ Systems/Jump\ Desktop/icon/jump_icon.png

configs/copy/home/.local/share/applications/neovim.desktop

@@ -77,7 +77,7 @@ Comment[wa]=Asspougnî des fitchîs tecses
 Comment[zh_CN]=编辑文本文件
 Comment[zh_TW]=編輯文字檔
 TryExec=nvim
-Exec=kitty -1 -e bash -c "nvim ~; exec bash"
+Exec=kitty nvim %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;

configs/copy/home/.local/share/applications/rng.desktop

@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=Ranger
-GenericName=File Manager
-Comment=Launches the ranger file manager
-TryExec=ranger
-Exec=kitty -1 -e bash -c "ranger /home/gib/Documents/Code; exec bash" 
-Terminal=false
-Type=Application
-Keywords=File;Manager;Browser;Explorer;Launcher;Vi;Vim;Python
-Icon=utilities-terminal
-Categories=ConsoleOnly;System;FileTools;FileManager
-StartupNotify=false
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-X-Desktop-File-Install-Version=0.26

configs/dotfiles/nvim/lua/gib_nvim/lsp.lua

@@ -18,12 +18,10 @@ end)
 require('mason').setup({})
 require('mason-lspconfig').setup({
   ensure_installed = {
-  'asm_lsp',
   'bashls',
   'clangd',
   'cmake',
   'cssls',
-  'csharp_ls',
   'cssmodules_ls',
   'docker_compose_language_service',
   'dockerls',

configs/jump-desktop/jump-desktop.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Jump Desktop
-Exec=bash -c "nohup wine /home/gib/.wine/drive_c/Program\ Files/Phase\ Five\ Systems/Jump\ Desktop/JumpClient.exe &"
-Terminal=false
-Type=Application
-Icon=/home/gib/.wine/drive_c/Program\ Files/Phase\ Five\ Systems/Jump\ Desktop/icon/jump_icon.png

install/app_figma_linux.sh

@@ -1 +0,0 @@
-flatpak install -y io.github.Figma_Linux.figma_linux

install/app_firewall_config.sh

@@ -1 +1 @@
-sudo dnf install -y firewall-config
+sudo dnf install -y fedora firewall-config

install/app_fragments.sh

@@ -1 +1 @@
-flatpak install -y de.haeckerfelix.Fragments
+flatpak install -y flathub de.haeckerfelix.Fragments

install/app_gnome_text_editor.sh

@@ -1 +0,0 @@
-sudo dnf install -y gnome-text-editor

install/app_gradience_beta.sh

@@ -2,5 +2,5 @@ flatpak remote-add --if-not-exists gnome-nightly \
     https://nightly.gnome.org/gnome-nightly.flatpakrepo
 flatpak remote-add --if-not-exists gradience-nightly \
     https://gradienceteam.github.io/Gradience/index.flatpakrepo
-sudo flatpak install gradience-nightly \
+sudo flatpak install -y gradience-nightly \
     com.github.GradienceTeam.Gradience.Devel

install/app_gthumb.sh

@@ -1 +1 @@
-flatpak install -y org.gnome.gThumb 
+flatpak install -y flathub org.gnome.gThumb 

install/app_jdk22.sh

@@ -1 +1,2 @@
+source ~/.local/share/sunhat/sources/env.sh
 sudo dnf install -y $JDK_LINK

install/app_jetbrains_toolbox.sh

@@ -1,3 +1,4 @@
+source ~/.local/share/sunhat/sources/env.sh
 xdg-open "$JETBRAINS_TOOLBOX_LINK" > /dev/null 2>&1
 read -rp "Once downloaded & in Downloads directory, press Enter to continue..."
 tar -xzf ~/Downloads/jetbrains-toolbox-*.tar.gz -C ~/Downloads

install/app_john_the_ripper.sh

@@ -1,5 +1,5 @@
-sudo dnf install yasm gmp-devel libpcap-devel bzip2-devel
+sudo dnf install -y yasm gmp-devel libpcap-devel bzip2-devel
 git clone https://github.com/magnumripper/JohnTheRipper.git ~/.local/share/sunhat/packages/JohnTheRipper/
-cd ~/.local/share/sunhat/JohnTheRipper/src
+cd ~/.local/share/sunhat/packages/JohnTheRipper/src
 ./configure && make
 cd ~/.local/share/sunhat

install/app_kdenlive.sh

@@ -1 +1 @@
-flatpak install -y org.kde.kdenlive
+flatpak install -y flathub org.kde.kdenlive

install/app_kitty.sh

@@ -1 +0,0 @@
-sudo dnf install -y kitty

install/app_libre_office.sh

@@ -1 +1 @@
-flatpak install -y org.libreoffice.LibreOffice
+flatpak install -y flathub org.libreoffice.LibreOffice

install/app_moonlight.sh

@@ -1 +1 @@
-flatpak install -y com.moonlight_stream.Moonlight.desktop
+flatpak install -y com.moonlight_stream.Moonlight

install/app_neovim.sh

@@ -1 +0,0 @@
-sudo dnf install -y neovim

install/app_nextcloud.sh

@@ -6,4 +6,4 @@ sudo rm /usr/share/cloud-providers/com.nextcloudgmbh.Nextcloud.ini
  echo -e "\t-BusName=com.nextcloudgmbh.Nextcloud"
  echo -e "\tObjectPath=/com/nextcloudgmbh/Nextcloud\n"
  read -p "Press enter to open the .desktop file."
-kitty -1 -e bash -c "com.nextcloud.desktopclient.nextcloud.desktop"
+kitty -1 -e bash -c "sudoedit /usr/share/applications/com.nextcloud.desktopclient.nextcloud.desktop"

install/app_prusa_slicer.sh

@@ -1 +1 @@
-flatpak install -y com.prusa3d.PrusaSlicer
+flatpak install -y flathub com.prusa3d.PrusaSlicer

install/app_super_tux_kart.sh

@@ -1 +1 @@
-flatpak install -y net.supertuxkart.SuperTuxKart
+flatpak install -y flathub net.supertuxkart.SuperTuxKart

install/app_thunderbird.sh

@@ -1 +1 @@
-flatpak install -y org.mozilla.Thunderbird
+flatpak install -y flathub org.mozilla.Thunderbird

install/app_tor_browser.sh

@@ -1 +1 @@
-flatpak install -y com.github.micahflee.torbrowser-launcher
+flatpak install -y flathub com.github.micahflee.torbrowser-launcher

install/app_turtle.sh

@@ -3,3 +3,4 @@ cd ~/.local/share/sunhat/packages/turtle/
 python install.py install --user
 pip3 install . --user
 nautilus -q nautilus --no-desktop
+cd ~/.local/share/sunhat

install/app_ulauncher.sh

@@ -1,4 +0,0 @@
-sudo dnf install -y ulauncher
-gtk-launch ulauncher.desktop >/dev/null 2>&1
-sleep 2 # ensure enough time for ulauncher to set defaults
-cp ~/.local/share/sunhat/configs/ulauncher/ulauncher.json ~/.config/ulauncher/settings.json

install/app_unity_hub.sh

@@ -1 +1 @@
-flatpak install -y com.unity.UnityHub
+flatpak install -y flathub com.unity.UnityHub

install/app_upscayl.sh

@@ -1 +1,2 @@
+source ~/.local/share/sunhat/sources/env.sh
 sudo dnf install -y $UPSCAYL_LINK

install/app_video_downloader.sh

@@ -1 +1 @@
-flatpak install -y com.github.unrud.VideoDownloader
+flatpak install -y flathub com.github.unrud.VideoDownloader

install/app_video_trimmer.sh

@@ -1 +1 @@
-flatpak install -y org.gnome.gitlab.YaLTeR.VideoTrimmer
+flatpak install -y flathub org.gnome.gitlab.YaLTeR.VideoTrimmer

install/app_vlc.sh

@@ -1 +0,0 @@
-sudo dnf install -y vlc

install/app_workbench.sh

@@ -1 +1 @@
-flatpak install -y re.sonny.Workbench
+flatpak install -y flathub re.sonny.Workbench

install/app_xournalpp.sh

@@ -1 +1 @@
-flatpak install -y com.github.xournalpp.xournalpp
+flatpak install -y flathub com.github.xournalpp.xournalpp

install/app_yuzu.sh

@@ -1 +1 @@
-flatpak install -y org.yuzu_emu.yuzu
+flatpak install -y flathub org.yuzu_emu.yuzu

install/nodenv.sh

@@ -1,17 +0,0 @@
-if ! command -v nodenv &>/dev/null; then
-	URL="https://nodejs.org/download/release/index.json"
-	DEFAULT_NODE_VERSION=$(curl -s "$URL" | jq -r '.[] | select(.lts != false) | .version' | head -n 1)
-
-	git clone https://github.com/nodenv/nodenv.git ~/.nodenv
-	sudo ln -vs ~/.nodenv/bin/nodenv /usr/local/bin/nodenv
-	cd ~/.nodenv
-	src/configure && make -C src || true
-	cd ~/
-	mkdir -p "$(nodenv root)"/plugins
-	git clone https://github.com/nodenv/node-build.git "$(nodenv root)"/plugins/node-build
-	git clone https://github.com/nodenv/nodenv-aliases.git $(nodenv root)/plugins/nodenv-aliases
-	nodenv install $DEFAULT_NODE_VERSION
-	nodenv global $DEFAULT_NODE_VERSION
-	sudo ln -vs $(nodenv root)/shims/* /usr/local/bin/
-  cd ~/.local/share/sunhat
-fi

packages/espanso

@@ -1 +1 @@
-Subproject commit 8daadcc949c35a7b7aa20b7f544fdcff83e2c5f7
+Subproject commit 335f6673d5a094d3a41972eb0d21f5a29f9d10dd

packages/hanabi

@@ -1 +1 @@
-Subproject commit 710859c3708524ea2a1d22b262ee9753e7523e53
+Subproject commit e5d6e130de36b065e9ea3ab160331843c7966fa4

sources/dotfiles.sh

@@ -1,3 +1,5 @@
+# Install Zoxide so it doesnt prompt us to when we source bashrc
+sudo dnf install -y zoxide
 # Make Directory for all Dotfiles so you can sync them with Nextcloud.
 mkdir ~/Documents/Configs
 

sources/env.sh

@@ -1,12 +1,12 @@
-export TOOLS=$(cat ~/.local/share/sunhat/sources/install/tools | tr "\n" " " | sed 's/ //g')
+export TOOLS=$(cat ~/.local/share/sunhat/sources/install/tools | tr "\n" " ")
 export GH_USERNAME="gibbyb"
 export GH_EMAIL="gib@gibbyb.com"
 export GH_EDITOR="nvim"
-export HOST_NAME="desktop.gib"
+export HOST_NAME="laptop.gib"
 export JETBRAINS_TOOLBOX_LINK="https://www.jetbrains.com/toolbox-app/download/download-thanks.html?platform=linux"
 export UPSCAYL_LINK="https://github.com/upscayl/upscayl/releases/download/v2.11.5/upscayl-2.11.5-linux.rpm"
 export LACT_LINK="https://github.com/ilya-zlobintsev/LACT/releases/download/v0.5.4/lact-0.5.4-0.x86_64.fedora-40.rpm"
-export JDK_LINK="https://download.oracle.com/java/22/latest/jdk-22_linux-aarch64_bin.rpm"
+export JDK_LINK="https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.rpm"
 export DESKTOP_BACKGROUND="file:///home/gib/Pictures/Wallpapers/gloomyroadcatbg.png"
 export HOME_ASSISTANT_URL="https://home.gibbyb.com"
 export JUMP_DESKTOP_LINK="https://jumpdesktop.com/downloads/jdwin"

sources/hostname.sh

@@ -1 +1,3 @@
+source ~/.local/share/sunhat/sources/env.sh
 sudo hostnamectl set-hostname $HOST_NAME
+

sources/optional/nvidia_driver.sh

@@ -4,7 +4,7 @@ echo -e "\t\"rd.driver.blacklist=nouveau,"
 echo -e "\tmodprobe.blacklist=nouveau,"
 echo -e "\tnvidia-drm.modeset=1\"\n"
 echo -e "\n Save the file & close nvim to continue.\n"
-kitty -1 -e bash -c "sudo nvim /etc/default/grub"
+kitty -1 -e bash -c "sudoedit /etc/default/grub"
 sudo grub2-mkconfig -o /etc/grub2-efi.cfg
 sudo systemctl enable nvidia-hibernate.service nvidia-suspend.service \
   nvidia-resume.service nvidia-powerd.service

sources/tools.sh

@@ -1,2 +1,2 @@
 source ~/.local/share/sunhat/sources/env.sh
-sudo dnf install -y $tools
+sudo dnf install -y $TOOLS

themes/firefox/chrome/tweaks/shrink-sideberry.css

@@ -1,6 +1,6 @@
 /* Make Sidebery look good */
 #sidebar{
-  --uc-sidebar-width: 150px;
+  --uc-sidebar-width: 120px;
   min-width: var(--uc-sidebar-width) !important;
   width: var(--uc-sidebar-width) !important;
   max-width: var(--uc-sidebar-width) !important;

themes/firefox/chrome/userChrome.css

@@ -19,4 +19,3 @@
 
 /* Import custom stylesheet instead of modifying Edge-Frfox theme files. */
 @import url("custom.css");
-

themes/firefox/chrome/userContent.css

@@ -2,3 +2,4 @@
 @import url("content/common.css");
 @import url("content/newtab.css");
 @import url("tweaks/sidebery.css") (-moz-bool-pref: "uc.tweak.theme.sidebery");
+@import url("tweaks/shrink-sideberry.css")