diff --git a/README.md b/README.md index d36f639..bf76642 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ https://github.com/user-attachments/assets/78e35d82-5fe9-4986-b545-80fc59bc4784 - **Shell Framework**: [Ignis](https://github.com/ignis-sh/ignis) (git/dev version) - **GVC**: [Ignis GVC](https://github.com/ignis-sh/ignis-gvc) - **Color Generation**: [Matugen](https://github.com/InioX/matugen) -- **Wallpaper**: [swww](https://github.com/LGFae/swww) +- **Wallpaper**: [awww](https://codeberg.org/LGFae/awww) - **Icons**: Material Symbols Font - **Bluetooth**: `gnome-bluetooth` - **GTK Theme**: `adw-gtk3` @@ -179,7 +179,7 @@ Create `~/.config/matugen/templates/colors.scss` with: Create or edit `~/.config/matugen/config.toml` and add: ```toml [config.wallpaper] -command = "swww" +command = "awww" arguments = ["img", "--transition-type", "simple"] set = true @@ -207,13 +207,13 @@ matugen image /path/to/your/wallpaper **For Niri** (`~/.config/niri/config.kdl`): ```kdl spawn-at-startup "ignis" "init" -spawn-at-startup "swww-daemon" +spawn-at-startup "awww-daemon" ``` **For Hyprland** (`~/.config/hypr/hyprland.conf`): ```conf exec-once = ignis init -exec-once = swww-daemon +exec-once = awww-daemon ``` --- diff --git a/exodefaults/config.kdl b/exodefaults/config.kdl index 4de9f42..868b516 100644 --- a/exodefaults/config.kdl +++ b/exodefaults/config.kdl @@ -246,4 +246,4 @@ hotkey-overlay { } spawn-at-startup "ignis" "init" -spawn-at-startup "swww-daemon" +spawn-at-startup "sh" "-c" "awww-daemon || swww-daemon" diff --git a/exodefaults/hyprland.conf b/exodefaults/hyprland.conf index adcd9a3..56297b0 100644 --- a/exodefaults/hyprland.conf +++ b/exodefaults/hyprland.conf @@ -51,7 +51,7 @@ env = HYPRCURSOR_SIZE,24 # Exo Auto Execs exec-once = ignis init -exec-once = swww-daemon +exec-once = sh -c "awww-daemon || swww-daemon" ## Keybinds diff --git a/exoinstall.py b/exoinstall.py index b0f7588..25ab0fa 100644 --- a/exoinstall.py +++ b/exoinstall.py @@ -246,7 +246,7 @@ def detect_distro(self): ) print("You will need to install the required dependencies manually.") print( - "Dependencies: python-ignis, ignis-gvc, matugen, swww, gnome-bluetooth, adw-gtk-theme, dart-sass, material-symbols-font" + "Dependencies: python-ignis, ignis-gvc, matugen, awww, gnome-bluetooth, adw-gtk-theme, dart-sass, material-symbols-font" ) return False @@ -335,7 +335,7 @@ def install_dependencies(self): "ignis-gvc", "ttf-material-symbols-variable-git", "matugen-bin", - "swww", + "awww", "gnome-bluetooth-3.0", "adw-gtk-theme", "dart-sass", @@ -607,15 +607,15 @@ def check_pkgconfig_file(pc_name): ) shutil.rmtree(gvc_temp_dir) - if not shutil.which("swww"): - print("\nswww not found, attempting to build from source...") + if not shutil.which("awww"): + print("\nawww not found, attempting to build from source...") temp_dir = tempfile.mkdtemp() - swww_repo_url = "https://github.com/LGFae/swww.git" - swww_repo_dir = os.path.join(temp_dir, "swww") + awww_repo_url = "https://codeberg.org/LGFae/awww.git" + awww_repo_dir = os.path.join(temp_dir, "awww") - print(f"Cloning {swww_repo_url} to {swww_repo_dir}...") + print(f"Cloning {awww_repo_url} to {awww_repo_dir}...") result = self.run_command( - ["git", "clone", swww_repo_url, swww_repo_dir], cwd=temp_dir + ["git", "clone", awww_repo_url, awww_repo_dir], cwd=temp_dir ) if result and result.returncode == 0: env = os.environ.copy() @@ -629,13 +629,13 @@ def check_pkgconfig_file(pc_name): f"{self.Colors.RED}wayland-protocols.pc not found. Please install wayland-protocols-devel.{self.Colors.ENDC}" ) - print("Building swww with cargo...") + print("Building awww with cargo...") result = self.run_command( - ["cargo", "build", "--release"], cwd=swww_repo_dir, env=env + ["cargo", "build", "--release"], cwd=awww_repo_dir, env=env ) if result and result.returncode == 0: - for binary in ["swww", "swww-daemon"]: - src = os.path.join(swww_repo_dir, "target", "release", binary) + for binary in ["awww", "awww-daemon"]: + src = os.path.join(awww_repo_dir, "target", "release", binary) dest = os.path.join("/usr/local/bin", binary) if os.path.exists(src): copy_result = self.run_command(["sudo", "cp", src, dest]) @@ -652,20 +652,20 @@ def check_pkgconfig_file(pc_name): f"{self.Colors.RED}Binary {binary} not found after build.{self.Colors.ENDC}" ) print( - f"{self.Colors.YELLOW}Optional: Autocompletion scripts are available in the completions directory of the swww repo.{self.Colors.ENDC}" + f"{self.Colors.YELLOW}Optional: Autocompletion scripts are available in the completions directory of the awww repo.{self.Colors.ENDC}" ) else: print( - f"{self.Colors.RED}Error building swww with cargo.{self.Colors.ENDC}" + f"{self.Colors.RED}Error building awww with cargo.{self.Colors.ENDC}" ) else: print( - f"{self.Colors.RED}Error cloning swww repository.{self.Colors.ENDC}" + f"{self.Colors.RED}Error cloning awww repository.{self.Colors.ENDC}" ) shutil.rmtree(temp_dir) else: - print("swww found in PATH.") + print("awww found in PATH.") def check_desktop(self): self.print_header("Checking Desktop Environment") @@ -1213,7 +1213,7 @@ def uninstall_exo(self): print("If you wish to remove them, you can do so with your package manager.") print("Dependencies to consider removing:") print( - "- Niri or Hyprland, python-ignis-git, ignis-gvc, matugen, swww, gnome-bluetooth, adw-gtk-theme, dart-sass" + "- Niri or Hyprland, python-ignis-git, ignis-gvc, matugen, awww, gnome-bluetooth, adw-gtk-theme, dart-sass" ) diff --git a/matugen/config.toml b/matugen/config.toml index 53df272..90d92ea 100644 --- a/matugen/config.toml +++ b/matugen/config.toml @@ -1,5 +1,5 @@ [config.wallpaper] -command = "swww" +command = "awww" arguments = ["img", "--transition-type", "simple"] set = true