From cbe42e21eed73ae135d1a30e0d722eb2d5fb61cd Mon Sep 17 00:00:00 2001
From: Jaanonim <mat8mro@gmail.com>
Date: Mon, 24 Feb 2025 16:43:41 +0100
Subject: [PATCH] treewide: rename wpaperd and vscode options (#905)

Resolve the following warnings:

    - The option `programs.wpaperd.settings' defined in
      `/nix/store/<HASH>-source/modules/wpaperd/hm.nix' has been renamed
      to `services.wpaperd.settings'.

    - The option `programs.vscode.extensions' defined in
      `/nix/store/<HASH>-source/modules/vscode/hm.nix' has been renamed
      to `programs.vscode.profiles.default.extensions'.

    - The option `programs.vscode.userSettings' defined in
      `/nix/store/<HASH>-source/modules/vscode/hm.nix' has been renamed
      to `programs.vscode.profiles.default.userSettings'.


The VSCode theme is now only applied to the 'default' profile.

Closes: https://github.com/danth/stylix/issues/903
Link: https://github.com/danth/stylix/pull/905

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
---
 flake.lock             | 6 +++---
 modules/vscode/hm.nix  | 2 +-
 modules/wpaperd/hm.nix | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index fe11c4b9..d0358ada 100644
--- a/flake.lock
+++ b/flake.lock
@@ -225,11 +225,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737630279,
-        "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=",
+        "lastModified": 1740347597,
+        "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c",
+        "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449",
         "type": "github"
       },
       "original": {
diff --git a/modules/vscode/hm.nix b/modules/vscode/hm.nix
index bbcffe47..b7269093 100644
--- a/modules/vscode/hm.nix
+++ b/modules/vscode/hm.nix
@@ -34,7 +34,7 @@ in
   config =
     lib.mkIf (config.stylix.enable && config.stylix.targets.vscode.enable)
       {
-        programs.vscode = {
+        programs.vscode.profiles.default = {
           extensions = [ themeExtension ];
           userSettings = {
             "workbench.colorTheme" = "Stylix";
diff --git a/modules/wpaperd/hm.nix b/modules/wpaperd/hm.nix
index e2bc31b9..156e0124 100644
--- a/modules/wpaperd/hm.nix
+++ b/modules/wpaperd/hm.nix
@@ -30,7 +30,7 @@ in
             { };
     in
     {
-      programs.wpaperd.settings.any = {
+      services.wpaperd.settings.any = {
         path = "${config.stylix.image}";
       } // modeAttrs;
     }