migration: reclassify some apps as desktop components

6 files changed, 16 insertions, 17 deletions

diff --git a/snowfall/modules/home/apps/i3/default.nix b/snowfall/modules/home/desktop/components/i3/default.nix
index e558e0a..93542f0 100644
--- a/snowfall/modules/home/apps/i3/default.nix
+++ b/snowfall/modules/home/desktop/components/i3/default.nix
@@ -1,10 +1,10 @@
 { options, config, lib, pkgs, namespace, ... }:
 
 with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.i3;
+  cfg = config.${namespace}.desktop.components.i3;
   desktop = config.${namespace}.desktop;
 in {
-  options.${namespace}.apps.i3 = with types; {
+  options.${namespace}.desktop.components.i3 = with types; {
     enable = mkEnableOption "i3";
   };
 
@@ -114,8 +114,7 @@ in {
         startup = [
           { command = "polybar-msg cmd quit; polybar"; always = true; notification = false; }
           { command = "systemctl --user restart picom"; always = true; notification = false; }
-          #TODO: better path
-          { command = "${pkgs.feh}/bin/feh --bg-fill ${../../desktop/bg/${desktop.background}}"; always = true; notification = false; }
+          { command = "${pkgs.feh}/bin/feh --bg-fill ${desktop.background}"; always = true; notification = false; }
           { command = "${pkgs.fcitx5}/bin/fcitx5 -r -d"; always = true; notification = false; }
         ];
   
diff --git a/snowfall/modules/home/apps/picom/default.nix b/snowfall/modules/home/desktop/components/picom/default.nix
index 0aac934..698e06c 100644
--- a/snowfall/modules/home/apps/picom/default.nix
+++ b/snowfall/modules/home/desktop/components/picom/default.nix
@@ -1,11 +1,9 @@
 { 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;
+  cfg = config.${namespace}.desktop.components.picom;
 in {
-  options.${namespace}.apps.picom = with types; {
+  options.${namespace}.desktop.components.picom = with types; {
     enable = mkEnableOption "picom";
   };
 
diff --git a/snowfall/modules/home/apps/polybar/default.nix b/snowfall/modules/home/desktop/components/polybar/default.nix
index e942a21..d7ee363 100644
--- a/snowfall/modules/home/apps/polybar/default.nix
+++ b/snowfall/modules/home/desktop/components/polybar/default.nix
@@ -1,10 +1,10 @@
 { options, config, lib, pkgs, namespace, ... }:
 
 with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.polybar;
+  cfg = config.${namespace}.desktop.components.polybar;
   desktop = config.${namespace}.desktop;
 in {
-  options.${namespace}.apps.polybar = with types; {
+  options.${namespace}.desktop.components.polybar = with types; {
     enable = mkEnableOption "polybar";
   };
 
diff --git a/snowfall/modules/home/apps/rofi/default.nix b/snowfall/modules/home/desktop/components/rofi/default.nix
index 5f1ea52..a1dbe33 100644
--- a/snowfall/modules/home/apps/rofi/default.nix
+++ b/snowfall/modules/home/desktop/components/rofi/default.nix
@@ -1,10 +1,10 @@
 { options, config, lib, namespace, ... }:
 
 with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.rofi;
+  cfg = config.${namespace}.desktop.components.rofi;
   desktop = config.${namespace}.desktop;
 in {
-  options.${namespace}.apps.rofi = with types; {
+  options.${namespace}.desktop.components.rofi = with types; {
     enable = mkEnableOption "rofi";
   };
 
diff --git a/snowfall/modules/home/desktop/default.nix b/snowfall/modules/home/desktop/default.nix
index 5f8c905..e89ec86 100644
--- a/snowfall/modules/home/desktop/default.nix
+++ b/snowfall/modules/home/desktop/default.nix
@@ -14,6 +14,7 @@ in {
         "shinobu.png"
         "skull.png"
       ];
+      apply = value: ./bg/${value};
     };
 
     theme = {
diff --git a/snowfall/modules/home/suites/desktop/default.nix b/snowfall/modules/home/suites/desktop/default.nix
index f80cadb..a98472a 100644
--- a/snowfall/modules/home/suites/desktop/default.nix
+++ b/snowfall/modules/home/suites/desktop/default.nix
@@ -10,19 +10,20 @@ in {
   config = mkIf cfg.enable {
     cxl = {
       apps = {
+        kitty.enable = true;
+        flameshot.enable = true;
+      };
+
+      desktop.components = {
         i3.enable = true;
 
         polybar.enable = true;
         rofi.enable = true;
         picom.enable = true;
 
-        kitty.enable = true;
-        flameshot.enable = true;
-      };
-
-      desktop.components = {
         gtk.enable = true;
       };
     };
   };
 }
+