From b0478a9dc9121d083e5f568fed203ac9a74e1830 Mon Sep 17 00:00:00 2001 From: Caroline Larimore Date: Fri, 7 Feb 2025 22:07:51 -0800 Subject: migration: picom --- roles/home/desktop/default.nix | 2 -- roles/home/desktop/picom.nix | 20 --------------- snowfall/modules/home/apps/picom/default.nix | 32 ++++++++++++++++++++++++ snowfall/modules/home/suites/desktop/default.nix | 3 +++ 4 files changed, 35 insertions(+), 22 deletions(-) delete mode 100644 roles/home/desktop/picom.nix create mode 100644 snowfall/modules/home/apps/picom/default.nix diff --git a/roles/home/desktop/default.nix b/roles/home/desktop/default.nix index 6c803d3..6ff649f 100644 --- a/roles/home/desktop/default.nix +++ b/roles/home/desktop/default.nix @@ -66,8 +66,6 @@ let cfg = config.home.roles.desktop; in { }; services = { - picom.enable = true; - flameshot.enable = cfg.screenshot; }; diff --git a/roles/home/desktop/picom.nix b/roles/home/desktop/picom.nix deleted file mode 100644 index cc72333..0000000 --- a/roles/home/desktop/picom.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ ... }: - -{ - services.picom = { - backend = "glx"; - vSync = true; - - settings = { - blur = { - method = "gaussian"; - size = 10; - deviation = 2; - }; - - blur-background-exclude = [ - "window_type = 'dock'" - ]; - }; - }; -} diff --git a/snowfall/modules/home/apps/picom/default.nix b/snowfall/modules/home/apps/picom/default.nix new file mode 100644 index 0000000..0aac934 --- /dev/null +++ b/snowfall/modules/home/apps/picom/default.nix @@ -0,0 +1,32 @@ +{ options, config, lib, namespace, ... }: + +#TODO: move somewhere else +# most likely will move several things into modules/desktop/components or similar +with lib; with lib.${namespace}; let + cfg = config.${namespace}.apps.picom; +in { + options.${namespace}.apps.picom = with types; { + enable = mkEnableOption "picom"; + }; + + config = mkIf cfg.enable { + services.picom = { + enable = true; + + backend = "glx"; + vSync = true; + + settings = { + blur = { + method = "gaussian"; + size = 10; + deviation = 2; + }; + + blur-background-exclude = [ + "window_type = 'dock'" + ]; + }; + }; + }; +} diff --git a/snowfall/modules/home/suites/desktop/default.nix b/snowfall/modules/home/suites/desktop/default.nix index ff8dc37..97d4ddf 100644 --- a/snowfall/modules/home/suites/desktop/default.nix +++ b/snowfall/modules/home/suites/desktop/default.nix @@ -11,7 +11,10 @@ in { cxl = { apps = { i3.enable = true; + polybar.enable = true; + picom.enable = true; + kitty.enable = true; }; }; -- cgit v1.2.3