diff --git a/Droidnix/README.org b/Droidnix/README.org index ed03053dd..f77db1c2f 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -814,31 +814,6 @@ This file installs and configures waybar #+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, ... }: -let - waybarPath = "${pkgs.waybar}/bin/waybar"; -in -{ - environment.systemPackages = [ - pkgs.waybar - ]; - - systemd.user.services.waybar = { - description = "Waybar for Hyprland"; - after = [ "graphical-session.target" ]; - - serviceConfig = { - ExecStart = "${waybarPath}"; - Restart = "always"; - Environment = '' - WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"} - XDG_CURRENT_DESKTOP=Hyprland - XDG_RUNTIME_DIR=/run/user/${config.users.users.henrov.uid} - ''; - }; - - wantedBy = [ "default.target" ]; - }; -} #+END_SRC ** =generated/modules/traveldroid/desktop/wayland.nix= diff --git a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix index 7e3327f1d..530dfd24b 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix @@ -1,27 +1 @@ { config, pkgs, ... }: - -let - waybarPath = "${pkgs.waybar}/bin/waybar"; -in -{ - environment.systemPackages = [ - pkgs.waybar - ]; - - systemd.user.services.waybar = { - description = "Waybar for Hyprland"; - after = [ "graphical-session.target" ]; - - serviceConfig = { - ExecStart = "${waybarPath}"; - Restart = "always"; - Environment = '' - WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"} - XDG_CURRENT_DESKTOP=Hyprland - XDG_RUNTIME_DIR=/run/user/${config.users.users.henrov.uid} - ''; - }; - - wantedBy = [ "default.target" ]; - }; -}