From 2d295004d0a8bb5fed4a3472de8550913067d7cf Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Tue, 22 Oct 2024 13:44:47 +0200
Subject: [PATCH] modules: rename nixosModules.style to nixosModules.theme

---
 home/programs/browsers/firefox.nix   |  8 +++++---
 home/programs/fuzzel.nix             |  4 ++--
 home/programs/gtk.nix                |  8 ++++----
 home/programs/niri/default.nix       |  2 +-
 home/programs/swaybg.nix             |  4 ++--
 home/programs/swaylock.nix           |  4 ++--
 home/terminal/emulators/foot.nix     |  4 ++--
 hosts/default.nix                    | 20 +-------------------
 modules/default.nix                  |  2 +-
 modules/{style => theme}/default.nix |  6 +++++-
 modules/{style => theme}/gtk.nix     |  6 +++---
 11 files changed, 28 insertions(+), 40 deletions(-)
 rename modules/{style => theme}/default.nix (77%)
 rename modules/{style => theme}/gtk.nix (93%)

diff --git a/home/programs/browsers/firefox.nix b/home/programs/browsers/firefox.nix
index 7e26a2e..3798ebc 100644
--- a/home/programs/browsers/firefox.nix
+++ b/home/programs/browsers/firefox.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: let
+{
+  inputs,
+  pkgs,
+  ...
+}: let
   betterfox = pkgs.fetchFromGitHub {
     owner = "yokoffing";
     repo = "betterfox";
@@ -56,7 +60,6 @@ in {
     profiles = {
       nezia = {
         settings = {
-          "browser.urlbar.suggest.searches" = true;
           "browser.search.suggest.enabled" = true;
           "ui.key.menuAccessKeyFocuses" = false;
         };
@@ -68,7 +71,6 @@ in {
           stylus
           ublock-origin
           violentmonkey
-          idontcareaboutcookies
         ];
 
         # https://git.jacekpoz.pl/poz/niksos/src/commit/a48647a1c5bc6877a1100a65f4dc169b2fc11ed7/hosts/hape/firefox.nix
diff --git a/home/programs/fuzzel.nix b/home/programs/fuzzel.nix
index 0c02750..d386e6e 100644
--- a/home/programs/fuzzel.nix
+++ b/home/programs/fuzzel.nix
@@ -1,6 +1,6 @@
 {
   inputs,
-  nixosConfig,
+  osConfig,
   lib,
   pkgs,
   ...
@@ -15,7 +15,7 @@
         font = "monospace:size=14";
       };
       colors = let
-        inherit (inputs.basix.schemeData.base16.${nixosConfig.style.scheme}) palette;
+        inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
       in {
         background = "${palette.base00}ff";
         text = "${palette.base05}ff";
diff --git a/home/programs/gtk.nix b/home/programs/gtk.nix
index 265b3a9..f094875 100644
--- a/home/programs/gtk.nix
+++ b/home/programs/gtk.nix
@@ -6,10 +6,10 @@
   lib,
   ...
 }: let
-  isDark = inputs.basix.schemeData.base16.${osConfig.style.scheme}.variant == "dark";
+  isDark = inputs.basix.schemeData.base16.${osConfig.theme.scheme}.variant == "dark";
 in {
   home.pointerCursor = {
-    inherit (osConfig.style.cursorTheme) name package size;
+    inherit (osConfig.theme.cursorTheme) name package size;
     gtk.enable = true;
     x11.enable = true;
   };
@@ -35,11 +35,11 @@ in {
     gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
 
     iconTheme = {
-      inherit (osConfig.style.gtk.iconTheme) name package;
+      inherit (osConfig.theme.gtk.iconTheme) name package;
     };
 
     theme = lib.mkIf (!osConfig.services.xserver.desktopManager.gnome.enable) {
-      inherit (osConfig.style.gtk.theme) name package;
+      inherit (osConfig.theme.gtk.theme) name package;
     };
   };
   dconf.settings = {
diff --git a/home/programs/niri/default.nix b/home/programs/niri/default.nix
index 5cfa288..700416d 100644
--- a/home/programs/niri/default.nix
+++ b/home/programs/niri/default.nix
@@ -6,7 +6,7 @@
   osConfig,
   ...
 }: let
-  colors = inputs.basix.schemeData.base16.${osConfig.style.scheme}.palette;
+  colors = inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette;
 in {
   imports = [./binds.nix];
 
diff --git a/home/programs/swaybg.nix b/home/programs/swaybg.nix
index 8ac4d07..b81ef1d 100644
--- a/home/programs/swaybg.nix
+++ b/home/programs/swaybg.nix
@@ -2,7 +2,7 @@
 {
   pkgs,
   lib,
-  nixosConfig,
+  osConfig,
   ...
 }: {
   systemd.user.services.swaybg = {
@@ -11,7 +11,7 @@
       PartOf = ["graphical-session.target"];
     };
     Service = {
-      ExecStart = "${lib.getExe pkgs.swaybg} -i ${nixosConfig.style.wallpaper} -m fill";
+      ExecStart = "${lib.getExe pkgs.swaybg} -i ${osConfig.theme.wallpaper} -m fill";
       Restart = "on-failure";
     };
     Install.WantedBy = ["graphical-session.target"];
diff --git a/home/programs/swaylock.nix b/home/programs/swaylock.nix
index f21a834..f86b745 100644
--- a/home/programs/swaylock.nix
+++ b/home/programs/swaylock.nix
@@ -1,10 +1,10 @@
 {
   inputs,
   pkgs,
-  nixosConfig,
+  osConfig,
   ...
 }: let
-  inherit (inputs.basix.schemeData.base16.${nixosConfig.style.scheme}) palette;
+  inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
 in {
   # requires `security.pam.services.swaylock = { };` at the system level or else
   # unlock will not work.
diff --git a/home/terminal/emulators/foot.nix b/home/terminal/emulators/foot.nix
index 57e0bd0..099e3ec 100644
--- a/home/terminal/emulators/foot.nix
+++ b/home/terminal/emulators/foot.nix
@@ -1,6 +1,6 @@
 {
   inputs,
-  nixosConfig,
+  osConfig,
   config,
   lib,
   ...
@@ -14,7 +14,7 @@
         shell = "${lib.getExe config.programs.fish.package}";
       };
       colors = let
-        schemeData = inputs.basix.schemeData.base16.${nixosConfig.style.scheme};
+        schemeData = inputs.basix.schemeData.base16.${osConfig.theme.scheme};
       in {
         background = schemeData.palette.base00;
         foreground = schemeData.palette.base05;
diff --git a/hosts/default.nix b/hosts/default.nix
index 152f4de..7e617c5 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -14,19 +14,7 @@ in {
     modules = [
       ./vamos
 
-      self.nixosModules.style
-
-      ({pkgs, ...}: {
-        style = let
-          wallpaper = pkgs.fetchurl {
-            url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/e0cf0eb237dc5baba86661a3572b20a6183c1876/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png?raw=true";
-            hash = "sha256-/HAtpGwLxjNfJvX5/4YZfM8jPNStaM3gisK8+ImRmQ4=";
-          };
-        in {
-          gtk.enable = true;
-          inherit wallpaper;
-        };
-      })
+      self.nixosModules.theme
 
       inputs.nixos-hardware.nixosModules.framework-13-7040-amd
     ];
@@ -38,12 +26,6 @@ in {
     modules = [
       ./solaire
       self.nixosModules.style
-      {
-        style = {
-          gtk.enable = false;
-          wallpaper = ../wallpapers/lucy-edgerunners-wallpaper.jpg;
-        };
-      }
     ];
   };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 5f7031f..5bca15b 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,3 +1,3 @@
 {
-  style = import ./style;
+  theme = import ./theme;
 }
diff --git a/modules/style/default.nix b/modules/theme/default.nix
similarity index 77%
rename from modules/style/default.nix
rename to modules/theme/default.nix
index cb12675..802b758 100644
--- a/modules/style/default.nix
+++ b/modules/theme/default.nix
@@ -7,7 +7,7 @@
   inherit (lib.types) string path package;
 in {
   imports = [./gtk.nix];
-  options.style = {
+  options.theme = {
     scheme = mkOption {
       description = ''
         Name of the tinted-scheming color scheme to use.
@@ -22,6 +22,10 @@ in {
       '';
       type = path;
       example = lib.literalExpression "./wallpaper.png";
+      default = pkgs.fetchurl {
+        url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/e0cf0eb237dc5baba86661a3572b20a6183c1876/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png?raw=true";
+        hash = "sha256-/HAtpGwLxjNfJvX5/4YZfM8jPNStaM3gisK8+ImRmQ4=";
+      };
     };
 
     cursorTheme = {
diff --git a/modules/style/gtk.nix b/modules/theme/gtk.nix
similarity index 93%
rename from modules/style/gtk.nix
rename to modules/theme/gtk.nix
index ddb9d88..4eca901 100644
--- a/modules/style/gtk.nix
+++ b/modules/theme/gtk.nix
@@ -8,9 +8,9 @@
   inherit (lib) mkOption mkEnableOption;
   inherit (lib.types) package str;
 
-  cfg = config.style.gtk;
+  cfg = config.theme.gtk;
 in {
-  options.style.gtk = {
+  options.theme.gtk = {
     enable = mkEnableOption "enable GTK theming options";
     theme = {
       name = mkOption {
@@ -57,7 +57,7 @@ in {
           ${toString themePath} set by the GTK module does not exist!
 
           To suppress this message, make sure that
-          `config.modules.style.gtk.theme.package` contains
+          `config.modules.theme.gtk.theme.package` contains
           the path `${cfg.theme.name}`
         '';
       })