From dc8b909b5439b38cfd2835a0d663c10aa8877f1f Mon Sep 17 00:00:00 2001
From: ducoterra <git@ducoterra.net>
Date: Wed, 4 Dec 2024 19:00:13 -0500
Subject: [PATCH] major improvements to fedora kinoite and arch toolbox

---
 infrastructure/graduated/fedora/arch-build.sh |   7 +-
 .../graduated/fedora/arch.containerfile       |  55 ++++---
 .../graduated/fedora/fedora-kinoite.md        | 136 ++++++++++++++++--
 .../graduated/fedora/fedora-server.md         |   2 +-
 infrastructure/graduated/fedora/tmux.conf     |   1 +
 infrastructure/graduated/fedora/zshrc         |  41 ++++++
 6 files changed, 198 insertions(+), 44 deletions(-)
 create mode 100644 infrastructure/graduated/fedora/tmux.conf
 create mode 100644 infrastructure/graduated/fedora/zshrc

diff --git a/infrastructure/graduated/fedora/arch-build.sh b/infrastructure/graduated/fedora/arch-build.sh
index 41a9e84..320089a 100755
--- a/infrastructure/graduated/fedora/arch-build.sh
+++ b/infrastructure/graduated/fedora/arch-build.sh
@@ -3,12 +3,13 @@
 # Build latest image
 podman build \
   --no-cache \
-  -t gitea.reeseapps.com/services/arch-toolbox:latest \
-  -t gitea.reeseapps.com/services/arch-toolbox:$(date +%s) \
+  -t gitea.reeseapps.com/services/arch-toolbox:debug \
   -f ./infrastructure/graduated/fedora/arch.containerfile
 # Stop the current arch toolbox
 podman container stop arch-toolbox-latest
+podman container stop arch-toolbox-debug
 # Remove the old container
 podman container rm arch-toolbox-latest
+podman container rm arch-toolbox-debug
 # Start with the new image
-toolbox create -i gitea.reeseapps.com/services/arch-toolbox:latest
\ No newline at end of file
+toolbox create -i gitea.reeseapps.com/services/arch-toolbox:debug
\ No newline at end of file
diff --git a/infrastructure/graduated/fedora/arch.containerfile b/infrastructure/graduated/fedora/arch.containerfile
index 97590c5..10e4fae 100644
--- a/infrastructure/graduated/fedora/arch.containerfile
+++ b/infrastructure/graduated/fedora/arch.containerfile
@@ -1,5 +1,9 @@
 FROM quay.io/toolbx/arch-toolbox:latest
 
+########################
+#####    Pacman    #####
+########################
+
 # Enable Pacman multilib
 RUN tee -a /etc/pacman.conf <<EOF
 [multilib]
@@ -38,7 +42,21 @@ RUN pacman -S --noconfirm \
     btop \
     jq \
     yq \
-    imagemagick
+    imagemagick \
+    nodejs \
+    npm \
+    go \
+    rust \
+    rustup \
+    git-lfs \
+    flatpak \
+    net-tools \
+    glances \
+    networkmanager
+
+########################
+#####  Extra Apps  #####
+########################
 
 # Ollama
 RUN curl -L https://ollama.com/download/ollama-linux-amd64.tgz -o ollama-linux-amd64.tgz && \
@@ -57,36 +75,11 @@ RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o
     chmod a+rx /usr/local/bin/youtube-dlp
 
 ####################
-##### RUN LAST #####
+#####  COPIES  #####
 ####################
 
-# ZSHRC
-COPY <<EOF /etc/zsh/zshrc.local
-# Basic settings
-autoload bashcompinit && bashcompinit
-autoload -U compinit; compinit
-zstyle ':completion:*' menu select
+# zshrc.local
+COPY zshrc /etc/zsh/zshrc.local
 
-# Prompt settings
-autoload -Uz promptinit
-promptinit
-PROMPT_EOL_MARK=
-
-# Syntax Highlighting
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-
-# Command Not Found Autocomplete
-source /usr/share/doc/pkgfile/command-not-found.zsh
-
-### Custom Commands and Aliases ###
-
-# Fix for Ansible
-export LC_ALL="C.UTF-8"
-
-# AWS
-complete -C '/usr/local/bin/aws_completer' aws
-
-# Podman
-export CONTAINER_HOST=unix:///run/user/1000/podman/podman.sock
-EOF
+# tmux.conf
+COPY tmux.conf /etc/tmux.conf
\ No newline at end of file
diff --git a/infrastructure/graduated/fedora/fedora-kinoite.md b/infrastructure/graduated/fedora/fedora-kinoite.md
index ce7990b..44e752e 100644
--- a/infrastructure/graduated/fedora/fedora-kinoite.md
+++ b/infrastructure/graduated/fedora/fedora-kinoite.md
@@ -3,6 +3,8 @@
 - [Fedora Kinoite](#fedora-kinoite)
   - [Podman](#podman)
   - [Libvirt, Qemu, KVM](#libvirt-qemu-kvm)
+  - [Network](#network)
+    - [VLAN Setup with nmcli](#vlan-setup-with-nmcli)
   - [Apps](#apps)
     - [VSCode](#vscode)
     - [Bitwarden](#bitwarden)
@@ -21,13 +23,18 @@
     - [Bambu Studio](#bambu-studio)
     - [Eyedropper](#eyedropper)
     - [Mingle](#mingle)
-    - [Mission Center](#mission-center)
     - [Obsidian](#obsidian)
     - [Dev Toolbox](#dev-toolbox)
     - [Junction](#junction)
     - [Kdenlive](#kdenlive)
     - [The Powder Toy](#the-powder-toy)
     - [Pika](#pika)
+    - [Filezilla](#filezilla)
+    - [Transmission](#transmission)
+    - [AdwSteamGtk](#adwsteamgtk)
+    - [Frog](#frog)
+    - [CPU-X](#cpu-x)
+    - [Ungoogled Chromium](#ungoogled-chromium)
   - [Toolbox](#toolbox)
     - [Reese's Arch Toolbox](#reeses-arch-toolbox)
       - [Pipx/Poetry](#pipxpoetry)
@@ -57,6 +64,17 @@ rpm-ostree install virt-manager
 systemctl enable --now libvirtd
 ```
 
+## Network
+
+### VLAN Setup with nmcli
+
+```bash
+# VLAN 2
+nmcli conn
+export NMCLI_DEVICE=enp195s0f4u1u3
+nmcli connection add type VLAN con-name $NMCLI_DEVICE.2 dev $NMCLI_DEVICE id 2
+```
+
 ## Apps
 
 Flatpak installs are from Flathub unless otherwise noted.
@@ -67,6 +85,17 @@ Write code.
 
 ```bash
 flatpak install com.visualstudio.code
+
+# Fix wayland scaling issues
+cp /var/lib/flatpak/exports/share/applications/com.visualstudio.code ~/.local/share/applications
+# Add `--socket=wayland` and `--ozone-platform=wayland` to the correct locations in the "Exec" field
+sed \
+    -ri 's/(Exec=.* run )(.*)(com.visualstudio.code)/\1--socket=wayland \2\3 --ozone-platform=wayland/g' \
+    ~/.local/share/applications/com.visualstudio.code
+
+# Validate desktop database and reload
+desktop-file-validate ~/.local/share/applications/com.nextcloud.talk.desktop
+update-desktop-database
 ```
 
 Add to settings.json so the host shell is spawned
@@ -118,6 +147,22 @@ Sync your files.
 
 ```bash
 flatpak install com.nextcloud.desktopclient.nextcloud
+
+# Fix wayland scaling issues
+cp /var/lib/flatpak/exports/share/applications/com.visualstudio.code ~/.local/share/applications
+# Add `--socket=wayland` and `--ozone-platform=wayland` to the correct locations in the "Exec" field
+sed \
+    -ri 's/(Exec=.* run )(.*)(com.visualstudio.code)/\1--socket=wayland \2\3 --ozone-platform=wayland/g' \
+    ~/.local/share/applications/com.visualstudio.code
+
+# Validate desktop database and reload
+desktop-file-validate ~/.local/share/applications/com.nextcloud.talk.desktop
+update-desktop-database
+```
+
+```bash
+# Autostart
+ln -s ~/.local/share/applications/com.nextcloud.talk.desktop ~/.config/autostart/
 ```
 
 ### Nextcloud Talk
@@ -130,6 +175,9 @@ Download nextcloud talk from:
 
 ```bash
 flatpak install ./Nextcloud.Talk-linux-x64.flatpak
+
+# autostart
+ln -s /var/lib/flatpak/exports/share/applications/com.nextcloud.talk.desktop ~/.config/autostart/
 ```
 
 ### Discord
@@ -146,6 +194,23 @@ Talk to your business partners?
 
 ```bash
 flatpak install me.proton.Mail
+
+# Fix wayland scaling issues
+cp /var/lib/flatpak/exports/share/applications/me.proton.Mail.desktop ~/.local/share/applications
+
+# Add `--socket=wayland` and `--ozone-platform=wayland` to the correct locations in the "Exec" field
+sed \
+    -ri 's/(Exec=.* run )(.*)(me.proton.Mail)/\1--socket=wayland \2\3 --ozone-platform=wayland/g' \
+    ~/.local/share/applications/me.proton.Mail.desktop
+
+# Validate desktop database and reload
+desktop-file-validate ~/.local/share/applications/me.proton.Mail.desktop
+update-desktop-database
+```
+
+```bash
+# Autostart
+ln -s ~/.local/share/applications/me.proton.Mail.desktop ~/.config/autostart/
 ```
 
 ### Gimp
@@ -243,14 +308,6 @@ Create custom emojis.
 flatpak install io.github.halfmexican.Mingle
 ```
 
-### Mission Center
-
-Literally Windows task manager but for linux and it's awesome
-
-```bash
-flatpak install io.missioncenter.MissionCenter
-```
-
 ### Obsidian
 
 Show your friends your massive graph
@@ -299,6 +356,67 @@ Backup with Borg.
 flatpak install org.gnome.World.PikaBackup
 ```
 
+### Filezilla
+
+Really easy ftp, ftps, sftp, etc. file transfer.
+
+```bash
+flatpak install org.filezillaproject.Filezilla
+```
+
+### Transmission
+
+Bittorent Client.
+
+```bash
+flatpak install com.transmissionbt.Transmission
+```
+
+### AdwSteamGtk
+
+Make Steam look like a KDE App... you know you want to.
+
+```bash
+flatpak install io.github.Foldex.AdwSteamGtk
+```
+
+### Frog
+
+Extract text, scan QR codes, from images.
+
+```bash
+flatpak install com.github.tenderowl.frog
+```
+
+### CPU-X
+
+CPU-Z but X this time
+
+```bash
+flatpak install io.github.thetumultuousunicornofdarkness.cpu-x
+```
+
+### Ungoogled Chromium
+
+Chrom
+
+```bash
+flatpak install io.github.ungoogled_software.ungoogled_chromium
+
+# Fix wayland scaling issues
+cp /var/lib/flatpak/exports/share/applications/io.github.ungoogled_software.ungoogled_chromium.desktop ~/.local/share/applications
+# Add `--socket=wayland` and `--ozone-platform=wayland` to the correct locations in the "Exec" field
+sed \
+    -ri 's/(Exec=.* run )(.*)(io.github.ungoogled_software.ungoogled_chromium)/\1--socket=wayland \2\3 --ozone-platform=wayland/g' \
+    ~/.local/share/applications/io.github.ungoogled_software.ungoogled_chromium.desktop
+```
+
+```bash
+# Validate and reload desktop database
+desktop-file-validate ~/.local/share/applications/io.github.ungoogled_software.ungoogled_chromium.desktop
+update-desktop-database
+```
+
 ## Toolbox
 
 ```bash
diff --git a/infrastructure/graduated/fedora/fedora-server.md b/infrastructure/graduated/fedora/fedora-server.md
index 1bfbc61..d251e10 100644
--- a/infrastructure/graduated/fedora/fedora-server.md
+++ b/infrastructure/graduated/fedora/fedora-server.md
@@ -161,7 +161,7 @@ firewall-cmd --zone=public --list-ports
 
 Allow Cockpit with
 
-```
+```bash
 firewall-cmd --permanent --zone=public --add-port=9090/tcp
 firewall-cmd --reload
 ```
diff --git a/infrastructure/graduated/fedora/tmux.conf b/infrastructure/graduated/fedora/tmux.conf
new file mode 100644
index 0000000..b01c5c6
--- /dev/null
+++ b/infrastructure/graduated/fedora/tmux.conf
@@ -0,0 +1 @@
+set-option -g default-shell "/bin/zsh"
\ No newline at end of file
diff --git a/infrastructure/graduated/fedora/zshrc b/infrastructure/graduated/fedora/zshrc
new file mode 100644
index 0000000..a62e30f
--- /dev/null
+++ b/infrastructure/graduated/fedora/zshrc
@@ -0,0 +1,41 @@
+# Basic settings
+autoload bashcompinit && bashcompinit
+autoload -U compinit; compinit
+zstyle ':completion:*' menu select
+
+# Prompt settings
+autoload -Uz promptinit
+promptinit
+PROMPT_EOL_MARK=
+
+# Syntax Highlighting
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+
+# Command Not Found Autocomplete
+source /usr/share/doc/pkgfile/command-not-found.zsh
+
+### Custom Commands and Aliases ###
+
+# Local bin PATH
+export PATH="$HOME/.local/bin:$PATH"
+
+# Fix for Ansible
+export LC_ALL="C.UTF-8"
+
+# AWS
+complete -C '/usr/local/bin/aws_completer' aws
+
+# Podman
+export CONTAINER_HOST=unix:///run/user/1000/podman/podman.sock
+
+# Go puts binaries here
+export PATH="$PATH:$(go env GOBIN):$(go env GOPATH)/bin"
+
+# Nodejs Binaries
+export npm_config_prefix="$HOME/.local"
+
+# Calculate all folder sizes in current dir 
+alias {dudir,dud}='du -h --max-depth 1 | sort -h'
+# Calculate all file sizes in current dir
+alias {dufile,duf}='ls -lhSr'
\ No newline at end of file