diff --git a/flake.nix b/flake.nix index a97a62e..4011e4f 100644 --- a/flake.nix +++ b/flake.nix @@ -9,24 +9,18 @@ url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - gslapper = { - url = "github:Nomadcxx/gSlapper"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = - inputs@{ + { nixpkgs, home-manager, stylix, - gslapper, ... }: { homeConfigurations."eriq12" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { inherit inputs; }; modules = [ stylix.homeModules.stylix ./home.nix diff --git a/home.nix b/home.nix index 1ec227a..b2abba7 100644 --- a/home.nix +++ b/home.nix @@ -54,8 +54,6 @@ r2modman mission-center localsend - # editors - zed-editor # clipboard wl-clipboard # theming @@ -77,6 +75,7 @@ MimeType=image/x-canon-crw;image/x-canon-cr2;image/x-canon-cr3;image/x-adobe-dng;image/x-dng; ''; }) + awww ]; # theming @@ -135,6 +134,7 @@ update = "home-manager switch"; }; }; + zed-editor.enable = true; zoxide.enable = true; git = { enable = true; diff --git a/hyprland-services.nix b/hyprland-services.nix index 3e71a17..d282657 100644 --- a/hyprland-services.nix +++ b/hyprland-services.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { systemd.user.services = { @@ -22,32 +22,32 @@ ]; }; }; - gslapper = { + awww = { Unit = { - Description = "gSlapper Wallpaper Service"; + Description = "An Answer to your Wayland Wallpaper Woes"; + Documentation = "man:awww-daemon(1)"; + PartOf = [ + "graphical-session.target" + ]; After = [ "graphical-session.target" "wayland-session@hyprland.desktop.target" ]; - Wants = [ + Requisite = [ + "graphical-session.target" + "wayland-session@hyprland.desktop.target" + ]; + WantedBy = [ "graphical-session.target" "wayland-session@hyprland.desktop.target" ]; }; Service = { - Type = "notify"; - ExecStart = "${inputs.gslapper.packages.x86_64-linux.gslapper}/bin/gslapper --systemd --restore '*'"; - ExecReload = "kill -HUP $MAINPID"; + Type = "simple"; + ExecStart = "${pkgs.awww}/bin/awww-daemon"; Restart = "on-failure"; - RestartSec = "5"; - TimeoutStopSec = "30"; + RestartSec = "1"; Slice = "app-graphical.slice"; - EnvironmentFile = "%h/.config/gslapper/environment"; - Environment = "XDG_RUNTIME_DIR=%t"; - MemoryMax = "512M"; - CPUQuota = "50%"; - NoNewPrivileges = "true"; - PrivateTmp = "true"; }; Install = { WantedBy = [