diff --git a/modules/biscuit/xserver.nix b/modules/biscuit/xserver.nix index 6308059..3b68fb3 100644 --- a/modules/biscuit/xserver.nix +++ b/modules/biscuit/xserver.nix @@ -1,7 +1,7 @@ {...}: { imports = [ ../../pkgs/hyprland/biscuit.nix - ../../pkgs/ags/biscuit.nix - ../../pkgs/hyprpaper/biscuit.nix + ../../pkgs/ags/biscuit.nix + ../../pkgs/swww/biscuit.nix ]; } diff --git a/modules/xserver.nix b/modules/xserver.nix index 8270a8b..de2acdb 100644 --- a/modules/xserver.nix +++ b/modules/xserver.nix @@ -2,6 +2,5 @@ imports = [ ../system/wayland.nix ../system/font.nix - # ../pkgs/hyprpaper/biscuit.nix ]; } diff --git a/pkgs/hyprpaper/biscuit.nix b/pkgs/hyprpaper/biscuit.nix deleted file mode 100644 index a913467..0000000 --- a/pkgs/hyprpaper/biscuit.nix +++ /dev/null @@ -1,5 +0,0 @@ -{...}: { - home.file.".config/hypr/hyprpaper.conf" = { - source = builtins.toPath ./config/biscuit.conf; - }; -} diff --git a/pkgs/hyprpaper/config/biscuit.conf b/pkgs/hyprpaper/config/biscuit.conf deleted file mode 100644 index 65e959a..0000000 --- a/pkgs/hyprpaper/config/biscuit.conf +++ /dev/null @@ -1 +0,0 @@ -wallpaper = , ../wallpapers/ascii-nixos.png diff --git a/pkgs/hyprpaper/wallpapers/ascii-nixos.png b/pkgs/hyprpaper/wallpapers/ascii-nixos.png deleted file mode 100644 index 2cd684f..0000000 Binary files a/pkgs/hyprpaper/wallpapers/ascii-nixos.png and /dev/null differ diff --git a/pkgs/swww/biscuit.nix b/pkgs/swww/biscuit.nix new file mode 100644 index 0000000..4b1bfe2 --- /dev/null +++ b/pkgs/swww/biscuit.nix @@ -0,0 +1,3 @@ +{...}: { + services.swww.enable = true; +} diff --git a/system/wayland.nix b/system/wayland.nix index fef6fb9..e0909f0 100644 --- a/system/wayland.nix +++ b/system/wayland.nix @@ -1,6 +1,5 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - hyprpaper ]; programs.hyprland.enable = true; hardware = {