From ee7980933217e40c6efb4dbf5a1d37597a785072 Mon Sep 17 00:00:00 2001 From: stabosa87 Date: Mon, 8 Jun 2026 23:00:07 -0500 Subject: [PATCH] added installing my apps + custom fastfetch + fixes --- config/fastfetch/config.jsonc | 44 ++++++++++++++++++++++++++++++++++ config/fastfetch/maka.txt | 14 +++++++++++ config/sway/config | 4 ++-- config/sway/main/boot.py | 7 +++--- config/sway/main/moves.py | 2 +- config/sway/main/swayconfig.py | 10 ++++---- config/sway/main/warehouse.py | 1 + justfile | 10 ++++++++ packages-arch | 2 +- 9 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 config/fastfetch/config.jsonc create mode 100644 config/fastfetch/maka.txt diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc new file mode 100644 index 0000000..59ce6b6 --- /dev/null +++ b/config/fastfetch/config.jsonc @@ -0,0 +1,44 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/master/doc/json_schema.json", + + "display": { + "color": { + "keys": "38;2;255;255;255", + "title": "38;2;255;255;255", + "separator": "38;2;255;255;255" + } + }, + + "logo": { + "type": "file", + "source": "~/.config/fastfetch/maka.txt", + "color": { + "1": "38;2;255;255;255" + } + }, + + "modules": [ + "title", + "separator", + "os", + "host", + "kernel", + "uptime", + "shell", + "de", + "wm", + "wmtheme", + "theme", + "icons", + "font", + "cursor", + "terminal", + "terminalfont", + "cpu", + "gpu", + "memory", + "battery", + "break", + "colors" + ] +} \ No newline at end of file diff --git a/config/fastfetch/maka.txt b/config/fastfetch/maka.txt new file mode 100644 index 0000000..f99c13d --- /dev/null +++ b/config/fastfetch/maka.txt @@ -0,0 +1,14 @@ + @@ @@ + @ @@ @@ @ + @ @@@@ @ + @ @ @ @ + @ . @ + @@ @@ + @@ @@ + @ @@ @ + @ @ @ @ + @ @ @ @ + @@ @@ @ @ + @ @ @ @ @ + @ @ @ @*@ + @@=@@=@ @@@@@@@/ \ No newline at end of file diff --git a/config/sway/config b/config/sway/config index ed0bc1c..6a57a7c 100755 --- a/config/sway/config +++ b/config/sway/config @@ -1,6 +1,6 @@ -set $base ~/.config/sway +set $base ~/.config/sway/ xwayland enable include ~/.config/mute/monitors.conf -exec_always sh -c 'BASE_SWAY="$base" /usr/bin/python $base/main/boot.py' \ No newline at end of file +exec_always env BASE_SWAY=$base /usr/bin/python3 $base/main/boot.py \ No newline at end of file diff --git a/config/sway/main/boot.py b/config/sway/main/boot.py index 0d5d257..ad9566c 100644 --- a/config/sway/main/boot.py +++ b/config/sway/main/boot.py @@ -22,8 +22,7 @@ def apply_safe_config(sway): def boot(base): - base = os.path.expanduser(base) if base else "" - + base = os.path.expanduser(base) with open(Logs, "w") as f: return subprocess.run( ["python3", os.path.join(base, "main/swayconfig.py")], @@ -35,7 +34,9 @@ def boot(base): def main(): sway = Swayipc() base = get_base() - + if not base: + print("BASE_SWAY isnt defined correctly. This WILL cause problems with startup.") + return rc = boot(base) if rc != 0: diff --git a/config/sway/main/moves.py b/config/sway/main/moves.py index 72ae0f6..1b97edc 100644 --- a/config/sway/main/moves.py +++ b/config/sway/main/moves.py @@ -13,7 +13,7 @@ Recordings = Path.home() / "records" Tmp = tempfile.gettempdir() def run(cmd): - return subprocess.run(cmd) + return subprocess.Popen(c, shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) def find_focused_pid(node): if isinstance(node, dict): diff --git a/config/sway/main/swayconfig.py b/config/sway/main/swayconfig.py index f567a41..4bee753 100755 --- a/config/sway/main/swayconfig.py +++ b/config/sway/main/swayconfig.py @@ -31,11 +31,11 @@ def apply_ui_and_environment(sway): sway.cmd("exec_always gsettings set org.gnome.desktop.interface.desktop-app-info-default-handler 'librewolf.desktop'") run_sh("/usr/lib/xdg-desktop-portal -r") - os.environ["GTK_USE_PORTAL"] = "0" - os.environ["XDG_CURRENT_DESKTOP"] = "sway" - os.environ["XDG_SESSION_TYPE"] = "wayland" - os.environ["XDG_PORTAL_BACKEND"] = "wlroots" - + sway.cmd("setenv GTK_USE_PORTAL 0") + sway.cmd("setenv XDG_CURRENT_DESKTOP sway") + sway.cmd("setenv XDG_SESSION_TYPE wayland") + sway.cmd("setenv XDG_PORTAL_BACKEND wlroots") + run_sh(f"swaybg -i {base}/wallpaper/metrowaymaka.png -m fill") run_sh("blueman-applet") run_sh("/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1") diff --git a/config/sway/main/warehouse.py b/config/sway/main/warehouse.py index df0ffcd..58234aa 100644 --- a/config/sway/main/warehouse.py +++ b/config/sway/main/warehouse.py @@ -2,6 +2,7 @@ # boot depends on it and if u break it u get no safe mode. from pathlib import Path import os +import base64 Vpn_cache = Path("/tmp/vpn_country.cache") Media_flag = Path("/tmp/media_active") diff --git a/justfile b/justfile index ea0b2de..7de1553 100644 --- a/justfile +++ b/justfile @@ -14,6 +14,16 @@ install-aur: git clone https://aur.archlinux.org/yay.git /tmp/yay cd /tmp/yay && makepkg -si +install-stabs-apps: + @echo "installing my apps" + flatpak install -y org.vinegarhq.Sober dev.vencord.Vesktop com.valvesoftware.Steam io.gitlab.librewolf-community org.gajim.Gajim + + @echo "Permissionizing..." + flatpak override --user --filesystem=home io.gitlab.librewolf-community + flatpak override --user --filesystem=host com.valvesoftware.Steam + flatpak override --user --filesystem=home dev.vencord.Vesktop + flatpak override --user --filesystem=home org.gajim.Gajim + stow: stow -t ~/.config config @echo "Stoweed" diff --git a/packages-arch b/packages-arch index d3f6b7d..64d6f62 100644 --- a/packages-arch +++ b/packages-arch @@ -29,4 +29,4 @@ stow python just git -vim \ No newline at end of file +gvim \ No newline at end of file