From 75b58bc61096b0104f432f0a690631c3a4321328 Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Mon, 22 Jul 2024 21:07:09 +0200 Subject: [PATCH] chore: remove dbus debug files, enable it only for qtile --- .../profiles/desktop/qtile/services.nix | 27 +------------------ nixos/hosts/laptop-phobos/default.nix | 1 - nixos/hosts/laptop-phobos/home.nix | 1 - 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/home/modules/profiles/desktop/qtile/services.nix b/home/modules/profiles/desktop/qtile/services.nix index 76de4e5..2e8f817 100644 --- a/home/modules/profiles/desktop/qtile/services.nix +++ b/home/modules/profiles/desktop/qtile/services.nix @@ -8,28 +8,6 @@ let mpris-ctl = inputs.self.packages.${pkgs.system}.mpris-ctl; sequence-detector = inputs.self.packages.${pkgs.system}.sequence-detector; - - getDunstDbusServicePath = pkg: "${pkg}/share/dbus-1/services/org.knopwob.dunst.service"; - dunst = pkgs.symlinkJoin { - name = "dunst-wrapped"; - paths = [ pkgs.dunst ]; - postBuild = '' - mv $out/bin/dunst $out/bin/.dunst - echo "#!${pkgs.runtimeShell}" > "$out/bin/dunst" - echo "Dunst wrapper..." - echo "WAYLAND_DISPLAY, DISPLAY" - echo "${lib.getExe' pkgs.coreutils "printenv"} WAYLAND_DISPLAY DISPLAY" >> "$out/bin/dunst" - echo "exec $out/bin/.dunst \"$@\"" >> $out/bin/dunst - chmod +x $out/bin/dunst - - dbusServicePath="${getDunstDbusServicePath "$out"}" - dbusRealServicePath=$(readlink "$dbusServicePath") - rm "$dbusServicePath" - cp "$dbusRealServicePath" "$dbusServicePath" - substituteInPlace "$dbusServicePath" \ - --replace-fail "${pkgs.dunst}" "$out" - ''; - }; in { config = lib.mkIf (config.profiles.desktop.qtile.enable || config.profiles.desktop.dwl.enable) { @@ -47,7 +25,7 @@ in { autorandr.enable = true; dunst = { - enable = true; + enable = config.profiles.desktop.qtile.enable; iconTheme = { # Icons name = "Papirus Dark"; package = pkgs.papirus-icon-theme; @@ -183,9 +161,6 @@ in { }; }; - xdg.dataFile."dbus-1/services/org.knopwob.dunst.service".source = lib.mkForce (getDunstDbusServicePath dunst); - services.dunst.package = dunst; - systemd.user.services = { mpris-ctld = { Unit = { diff --git a/nixos/hosts/laptop-phobos/default.nix b/nixos/hosts/laptop-phobos/default.nix index 9976021..6ddb869 100644 --- a/nixos/hosts/laptop-phobos/default.nix +++ b/nixos/hosts/laptop-phobos/default.nix @@ -25,7 +25,6 @@ nixos-config.isLaptop = true; profiles.virtualisation.enable = true; - # profiles.desktop.qtile.enable = true; profiles.vpn.enable = true; profiles.sync.enable = true; profiles.development = { diff --git a/nixos/hosts/laptop-phobos/home.nix b/nixos/hosts/laptop-phobos/home.nix index b5cca2a..a66e66b 100644 --- a/nixos/hosts/laptop-phobos/home.nix +++ b/nixos/hosts/laptop-phobos/home.nix @@ -11,7 +11,6 @@ let ]; in { profiles.development.enable = true; - # profiles.desktop.qtile.enable = true; profiles.desktop.dwl.enable = true; profiles.matrix.enable = true; -- 2.48.1