diff --git a/configs/autostart/ulauncher.desktop b/configs/autostart/ulauncher.desktop deleted file mode 100644 index da1504d..0000000 --- a/configs/autostart/ulauncher.desktop +++ /dev/null @@ -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 diff --git a/configs/copy/home/.local/share/applications/jump-desktop.desktop b/configs/copy/home/.local/share/applications/jump-desktop.desktop deleted file mode 100644 index 2cc6f11..0000000 --- a/configs/copy/home/.local/share/applications/jump-desktop.desktop +++ /dev/null @@ -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 diff --git a/configs/copy/home/.local/share/applications/neovim.desktop b/configs/copy/home/.local/share/applications/neovim.desktop index 041326b..1c3c90d 100644 --- a/configs/copy/home/.local/share/applications/neovim.desktop +++ b/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; diff --git a/configs/copy/home/.local/share/applications/rng.desktop b/configs/copy/home/.local/share/applications/rng.desktop deleted file mode 100644 index b64fa9a..0000000 --- a/configs/copy/home/.local/share/applications/rng.desktop +++ /dev/null @@ -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 diff --git a/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua b/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua index a53cdff..3f8a20a 100644 --- a/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua +++ b/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', diff --git a/configs/jump-desktop/icon/jump_icon.png b/configs/jump-desktop/icon/jump_icon.png deleted file mode 100644 index 1ffa683..0000000 Binary files a/configs/jump-desktop/icon/jump_icon.png and /dev/null differ diff --git a/configs/jump-desktop/jump-desktop.desktop b/configs/jump-desktop/jump-desktop.desktop deleted file mode 100644 index 041ccc9..0000000 --- a/configs/jump-desktop/jump-desktop.desktop +++ /dev/null @@ -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 diff --git a/install/app_figma_linux.sh b/install/app_figma_linux.sh deleted file mode 100755 index 54c458e..0000000 --- a/install/app_figma_linux.sh +++ /dev/null @@ -1 +0,0 @@ -flatpak install -y io.github.Figma_Linux.figma_linux diff --git a/install/app_firewall_config.sh b/install/app_firewall_config.sh index c9a6c32..75e7825 100644 --- a/install/app_firewall_config.sh +++ b/install/app_firewall_config.sh @@ -1 +1 @@ -sudo dnf install -y firewall-config +sudo dnf install -y fedora firewall-config diff --git a/install/app_fragments.sh b/install/app_fragments.sh index 27c2b85..7e947c1 100755 --- a/install/app_fragments.sh +++ b/install/app_fragments.sh @@ -1 +1 @@ -flatpak install -y de.haeckerfelix.Fragments +flatpak install -y flathub de.haeckerfelix.Fragments diff --git a/install/app_gnome_text_editor.sh b/install/app_gnome_text_editor.sh deleted file mode 100644 index de70fcf..0000000 --- a/install/app_gnome_text_editor.sh +++ /dev/null @@ -1 +0,0 @@ -sudo dnf install -y gnome-text-editor diff --git a/install/app_gradience_beta.sh b/install/app_gradience_beta.sh index 1dfa7da..42cd000 100644 --- a/install/app_gradience_beta.sh +++ b/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 diff --git a/install/app_gthumb.sh b/install/app_gthumb.sh index 716c244..5540e60 100755 --- a/install/app_gthumb.sh +++ b/install/app_gthumb.sh @@ -1 +1 @@ -flatpak install -y org.gnome.gThumb +flatpak install -y flathub org.gnome.gThumb diff --git a/install/app_jdk22.sh b/install/app_jdk22.sh index 6d3341a..7399256 100644 --- a/install/app_jdk22.sh +++ b/install/app_jdk22.sh @@ -1 +1,2 @@ +source ~/.local/share/sunhat/sources/env.sh sudo dnf install -y $JDK_LINK diff --git a/install/app_jetbrains_toolbox.sh b/install/app_jetbrains_toolbox.sh index 315dbb6..fb37fb6 100644 --- a/install/app_jetbrains_toolbox.sh +++ b/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 diff --git a/install/app_john_the_ripper.sh b/install/app_john_the_ripper.sh index 042d88d..15d3b95 100644 --- a/install/app_john_the_ripper.sh +++ b/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 diff --git a/install/app_kdenlive.sh b/install/app_kdenlive.sh index 27dc858..17a6108 100755 --- a/install/app_kdenlive.sh +++ b/install/app_kdenlive.sh @@ -1 +1 @@ -flatpak install -y org.kde.kdenlive +flatpak install -y flathub org.kde.kdenlive diff --git a/install/app_kitty.sh b/install/app_kitty.sh deleted file mode 100644 index d51570b..0000000 --- a/install/app_kitty.sh +++ /dev/null @@ -1 +0,0 @@ -sudo dnf install -y kitty diff --git a/install/app_libre_office.sh b/install/app_libre_office.sh index a8afb9f..d07bc6a 100755 --- a/install/app_libre_office.sh +++ b/install/app_libre_office.sh @@ -1 +1 @@ -flatpak install -y org.libreoffice.LibreOffice +flatpak install -y flathub org.libreoffice.LibreOffice diff --git a/install/app_moonlight.sh b/install/app_moonlight.sh index 8acb846..2cf95d6 100644 --- a/install/app_moonlight.sh +++ b/install/app_moonlight.sh @@ -1 +1 @@ -flatpak install -y com.moonlight_stream.Moonlight.desktop +flatpak install -y com.moonlight_stream.Moonlight diff --git a/install/app_neovim.sh b/install/app_neovim.sh deleted file mode 100644 index 9a8419a..0000000 --- a/install/app_neovim.sh +++ /dev/null @@ -1 +0,0 @@ -sudo dnf install -y neovim diff --git a/install/app_nextcloud.sh b/install/app_nextcloud.sh index 8f78698..c73af85 100644 --- a/install/app_nextcloud.sh +++ b/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" diff --git a/install/app_prusa_slicer.sh b/install/app_prusa_slicer.sh index cb049f9..0209217 100755 --- a/install/app_prusa_slicer.sh +++ b/install/app_prusa_slicer.sh @@ -1 +1 @@ -flatpak install -y com.prusa3d.PrusaSlicer +flatpak install -y flathub com.prusa3d.PrusaSlicer diff --git a/install/app_super_tux_kart.sh b/install/app_super_tux_kart.sh index d401007..13c0d40 100755 --- a/install/app_super_tux_kart.sh +++ b/install/app_super_tux_kart.sh @@ -1 +1 @@ -flatpak install -y net.supertuxkart.SuperTuxKart +flatpak install -y flathub net.supertuxkart.SuperTuxKart diff --git a/install/app_thunderbird.sh b/install/app_thunderbird.sh index a2ee11d..b5824f6 100755 --- a/install/app_thunderbird.sh +++ b/install/app_thunderbird.sh @@ -1 +1 @@ -flatpak install -y org.mozilla.Thunderbird +flatpak install -y flathub org.mozilla.Thunderbird diff --git a/install/app_tor_browser.sh b/install/app_tor_browser.sh index ab2e5f2..7103617 100755 --- a/install/app_tor_browser.sh +++ b/install/app_tor_browser.sh @@ -1 +1 @@ -flatpak install -y com.github.micahflee.torbrowser-launcher +flatpak install -y flathub com.github.micahflee.torbrowser-launcher diff --git a/install/app_turtle.sh b/install/app_turtle.sh index e7a3cef..1e2d40d 100644 --- a/install/app_turtle.sh +++ b/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 diff --git a/install/app_ulauncher.sh b/install/app_ulauncher.sh deleted file mode 100644 index 26554bb..0000000 --- a/install/app_ulauncher.sh +++ /dev/null @@ -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 diff --git a/install/app_unity_hub.sh b/install/app_unity_hub.sh index 51dc3c5..c3ad3bf 100755 --- a/install/app_unity_hub.sh +++ b/install/app_unity_hub.sh @@ -1 +1 @@ -flatpak install -y com.unity.UnityHub +flatpak install -y flathub com.unity.UnityHub diff --git a/install/app_upscayl.sh b/install/app_upscayl.sh index 71a5169..59195d6 100644 --- a/install/app_upscayl.sh +++ b/install/app_upscayl.sh @@ -1 +1,2 @@ +source ~/.local/share/sunhat/sources/env.sh sudo dnf install -y $UPSCAYL_LINK diff --git a/install/app_video_downloader.sh b/install/app_video_downloader.sh index 1d1770d..9dc4126 100755 --- a/install/app_video_downloader.sh +++ b/install/app_video_downloader.sh @@ -1 +1 @@ -flatpak install -y com.github.unrud.VideoDownloader +flatpak install -y flathub com.github.unrud.VideoDownloader diff --git a/install/app_video_trimmer.sh b/install/app_video_trimmer.sh index cb0f488..a0a4c70 100755 --- a/install/app_video_trimmer.sh +++ b/install/app_video_trimmer.sh @@ -1 +1 @@ -flatpak install -y org.gnome.gitlab.YaLTeR.VideoTrimmer +flatpak install -y flathub org.gnome.gitlab.YaLTeR.VideoTrimmer diff --git a/install/app_vlc.sh b/install/app_vlc.sh deleted file mode 100644 index 7d32ad9..0000000 --- a/install/app_vlc.sh +++ /dev/null @@ -1 +0,0 @@ -sudo dnf install -y vlc diff --git a/install/app_workbench.sh b/install/app_workbench.sh index ca348c6..9e520d3 100755 --- a/install/app_workbench.sh +++ b/install/app_workbench.sh @@ -1 +1 @@ -flatpak install -y re.sonny.Workbench +flatpak install -y flathub re.sonny.Workbench diff --git a/install/app_xournalpp.sh b/install/app_xournalpp.sh index 878e27e..3b05fd4 100755 --- a/install/app_xournalpp.sh +++ b/install/app_xournalpp.sh @@ -1 +1 @@ -flatpak install -y com.github.xournalpp.xournalpp +flatpak install -y flathub com.github.xournalpp.xournalpp diff --git a/install/app_yuzu.sh b/install/app_yuzu.sh index 9584442..4bdca30 100755 --- a/install/app_yuzu.sh +++ b/install/app_yuzu.sh @@ -1 +1 @@ -flatpak install -y org.yuzu_emu.yuzu +flatpak install -y flathub org.yuzu_emu.yuzu diff --git a/install/nodenv.sh b/install/nodenv.sh deleted file mode 100644 index 342867f..0000000 --- a/install/nodenv.sh +++ /dev/null @@ -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 diff --git a/packages/espanso b/packages/espanso index 8daadcc..335f667 160000 --- a/packages/espanso +++ b/packages/espanso @@ -1 +1 @@ -Subproject commit 8daadcc949c35a7b7aa20b7f544fdcff83e2c5f7 +Subproject commit 335f6673d5a094d3a41972eb0d21f5a29f9d10dd diff --git a/packages/hanabi b/packages/hanabi index 710859c..e5d6e13 160000 --- a/packages/hanabi +++ b/packages/hanabi @@ -1 +1 @@ -Subproject commit 710859c3708524ea2a1d22b262ee9753e7523e53 +Subproject commit e5d6e130de36b065e9ea3ab160331843c7966fa4 diff --git a/sources/dotfiles.sh b/sources/dotfiles.sh index 82fed22..8efe09a 100644 --- a/sources/dotfiles.sh +++ b/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 diff --git a/sources/env.sh b/sources/env.sh index 8f0dff1..5af2961 100644 --- a/sources/env.sh +++ b/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" diff --git a/sources/hostname.sh b/sources/hostname.sh index 16c6ed2..8257011 100644 --- a/sources/hostname.sh +++ b/sources/hostname.sh @@ -1 +1,3 @@ +source ~/.local/share/sunhat/sources/env.sh sudo hostnamectl set-hostname $HOST_NAME + diff --git a/sources/optional/nvidia_driver.sh b/sources/optional/nvidia_driver.sh index 4796a29..b9779cb 100644 --- a/sources/optional/nvidia_driver.sh +++ b/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 diff --git a/sources/tools.sh b/sources/tools.sh index 902ca61..cd746cf 100644 --- a/sources/tools.sh +++ b/sources/tools.sh @@ -1,2 +1,2 @@ source ~/.local/share/sunhat/sources/env.sh -sudo dnf install -y $tools +sudo dnf install -y $TOOLS diff --git a/themes/firefox/chrome/tweaks/shrink-sideberry.css b/themes/firefox/chrome/tweaks/shrink-sideberry.css index 38425ad..f2e7df6 100644 --- a/themes/firefox/chrome/tweaks/shrink-sideberry.css +++ b/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; diff --git a/themes/firefox/chrome/userChrome.css b/themes/firefox/chrome/userChrome.css index e2d57ad..dfc5924 100644 --- a/themes/firefox/chrome/userChrome.css +++ b/themes/firefox/chrome/userChrome.css @@ -19,4 +19,3 @@ /* Import custom stylesheet instead of modifying Edge-Frfox theme files. */ @import url("custom.css"); - diff --git a/themes/firefox/chrome/userContent.css b/themes/firefox/chrome/userContent.css index 8b4a543..6aeb15e 100644 --- a/themes/firefox/chrome/userContent.css +++ b/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")