From 5ea55f5c8195c358d72cd0bf6d56c41105482f3a Mon Sep 17 00:00:00 2001 From: notgne2 Date: Sat, 10 Jul 2021 12:56:58 -0700 Subject: [PATCH] Only enable flameshot with x mode in ezpcusr --- home-manager/modules/ezpcusr.nix | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index 2834d85..86a55ba 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -376,39 +376,6 @@ let }; mainConfig = { - systemd.user.services.flameshot = { - Unit = { - Description = "Flameshot screenshot tool"; - After = [ - "graphical-session-pre.target" - "polybar.service" - "stalonetray.service" - "taffybar.service" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { WantedBy = [ "graphical-session.target" ]; }; - - Service = { - Environment = "PATH=${config.home.profileDirectory}/bin"; - ExecStart = "${flameshot}/bin/flameshot"; - Restart = "on-abort"; - }; - }; - - xdg.configFile."flameshot/flameshot.ini".text = '' - [General] - buttons=@Variant(\0\0\0\x7f\0\0\0\vQList\0\0\0\0\n\0\0\0\0\0\0\0\x2\0\0\0\x3\0\0\0\x5\0\0\0\x6\0\0\0\x12\0\0\0\xf\0\0\0\x13\0\0\0\b\0\0\0\n) - contrastOpacity=142 - contrastUiColor=#0ee900 - disabledTrayIcon=false - drawColor=#ff0000 - drawThickness=9 - savePath=/dev/null - uiColor=#6a00a3 - ''; - services.keynav.enable = true; services.clipmenu.enable = true; @@ -804,6 +771,18 @@ let mainWallpaperDisplay = if mainWallpaperDisplayMaybe != null then mainWallpaperDisplayMaybe else "fill"; in { + xdg.configFile."flameshot/flameshot.ini".text = '' + [General] + buttons=@Variant(\0\0\0\x7f\0\0\0\vQList\0\0\0\0\n\0\0\0\0\0\0\0\x2\0\0\0\x3\0\0\0\x5\0\0\0\x6\0\0\0\x12\0\0\0\xf\0\0\0\x13\0\0\0\b\0\0\0\n) + contrastOpacity=142 + contrastUiColor=#0ee900 + disabledTrayIcon=false + drawColor=#ff0000 + drawThickness=9 + savePath=/dev/null + uiColor=#6a00a3 + ''; + systemd.user.services = if mainWallpaperImg != null then { background = { @@ -821,7 +800,28 @@ let Install = { WantedBy = [ "graphical-session.target" ]; }; }; - } else { }; + } else { } // { + flameshot = { + Unit = { + Description = "Flameshot screenshot tool"; + After = [ + "graphical-session-pre.target" + "polybar.service" + "stalonetray.service" + "taffybar.service" + ]; + PartOf = [ "graphical-session.target" ]; + }; + + Install = { WantedBy = [ "graphical-session.target" ]; }; + + Service = { + Environment = "PATH=${config.home.profileDirectory}/bin"; + ExecStart = "${flameshot}/bin/flameshot"; + Restart = "on-abort"; + }; + }; + }; services.picom = { enable = true;