Modified config so kiiwy doesn't get mad

hosts/desktop/home.nix

@@ -6,44 +6,15 @@
     ../../modules/home/default.nix
   ];
 
-  options = {
-    host = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-
-    headless = lib.mkOption {
-      type = with lib.types; bool;
-      description = ''
-        Is this machine headless?
-      '';
-    };
-  };
-
   config = {
     home = {
       username = "xeovalyte";
       homeDirectory = "/home/xeovalyte";
     };
 
-    host = "xv-desktop";
-    headless = false;
-
-    home.packages = with pkgs; [
-      unstable.prismlauncher
-      unstable.vesktop
-      unstable.rnote
-
-      # Office
-      libreoffice
-    ];
-
-    # Enable home-manager
-    programs.home-manager.enable = true;
-
     settings = {
+      hostname = "xv-desktop";
+    
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = true;
@@ -61,10 +32,33 @@
       theming.fonts.enable = true;
       theming.nix-colors.enable = false;
       theming.stylix.enable = true;
+      theming.stylix.wallpaper = "wallpaper-2.png";
+      theming.stylix.theme = "da-one-ocean";
 
       desktop-environments.hyprland.enable = false;
     };
 
+    home.packages = with pkgs; [
+      unstable.prismlauncher
+      unstable.vesktop
+      unstable.rnote
+
+      # Office
+      libreoffice
+    ];
+
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
     home.stateVersion = "24.05";
   };
+
+  options = {
+    settings.hostname = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
+  };
 }

modules/home/applications/firefox.nix

@@ -22,148 +22,151 @@ in {
     home.packages = with pkgs; [
       unstable.firefoxpwa
     ];
-
+    programs.firefox = lib.mkMerge [
-    programs.firefox = {
+      {
-      enable = true;
+        enable = true;
-      nativeMessagingHosts = [ pkgs.unstable.firefoxpwa ];
+      }
-      policies = {
+      (lib.mkIf (config.home.username == "xeovalyte") {
-        DisableTelemetry = true;
+        nativeMessagingHosts = [ pkgs.unstable.firefoxpwa ];
-        DisableFirefoxStudies = true;
+        policies = {
-        EnableTrackingProtection = {
+          DisableTelemetry = true;
-          Value = true;
+          DisableFirefoxStudies = true;
-          Locked = true;
+          EnableTrackingProtection = {
-          Cryptomining = true;
+            Value = true;
-          Fingerprinting = true;
+            Locked = true;
-        };
+            Cryptomining = true;
-        DisablePocket = true;
+            Fingerprinting = true;
-        DisableFirefoxAccounts = true;
-        DisableAccounts = true;
-        DontCheckDefaultBrowser = true;
-        DisplayBookmarksToolbar = "newpage";
-        ExtensionSettings = {
-          "nl-NL@dictionaries.addons.mozilla.org" = {
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/woordenboek-nederlands/latest.xpi";
-            installation_mode = "force_installed";
           };
-          "uBlock0@raymondhill.net" = {
+          DisablePocket = true;
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          DisableFirefoxAccounts = true;
-            installation_mode = "force_installed";
+          DisableAccounts = true;
-          };
+          DontCheckDefaultBrowser = true;
-          "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+          DisplayBookmarksToolbar = "newpage";
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+          ExtensionSettings = {
-            installation_mode = "force_installed";
+            "nl-NL@dictionaries.addons.mozilla.org" = {
-          };
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/woordenboek-nederlands/latest.xpi";
-          "firefoxpwa@filips.si" = {
+              installation_mode = "force_installed";
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/pwas-for-firefox/latest.xpi";
+            };
-            installation_mode = "force_installed";
+            "uBlock0@raymondhill.net" = {
-          };
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-          "markdown-viewer@outofindex.com" = {
+              installation_mode = "force_installed";
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/markdown-viewer-chrome/latest.xpi";
+            };
-            installation_mode = "force_installed";
+            "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+              installation_mode = "force_installed";
+            };
+            "firefoxpwa@filips.si" = {
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/pwas-for-firefox/latest.xpi";
+              installation_mode = "force_installed";
+            };
+            "markdown-viewer@outofindex.com" = {
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/markdown-viewer-chrome/latest.xpi";
+              installation_mode = "force_installed";
+            };
           };
         };
-      };
+        profiles.xeovalyte = {
-      profiles.xeovalyte = {
+          bookmarks = [
-        bookmarks = [
-          {
-            name = "Toolbar";
-            toolbar = true;
-            bookmarks = [
-              {
-                name = "Brightspace";
-                bookmarks = [
-                  {
-                    name = "Books";
-                    url = "https://drive.google.com/drive/folders/1L5OTbn5p3i7_Nc80hc5PztiEGHKwi-I4";
-                  }
-                  {
-                    name = "LCB";
-                    url = "https://brightspace.tudelft.nl/d2l/le/content/681010/Home";
-                  }
-                  {
-                    name = "Calculus";
-                    url = "https://brightspace.tudelft.nl/d2l/le/content/681024/Home";
-                  }
-                  {
-                    name = "IP1";
-                    url = "https://brightspace.tudelft.nl/d2l/le/content/681020/Home";
-                  }
-                ];
-              }
-            ];
-          }
-        ];
-        search.engines = {
-          "Nix" = {
-            urls = [{
-              template = "https://mynixos.com/search";
-              params = [
-                { name = "q"; value = "{searchTerms}"; }
-              ];
-            }];
-
-            icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-            definedAliases = [ "@nix" ];
-          };
-
-          "SearXNG" = {
-            urls = [{
-              template = "https:/search.xeovalyte.dev/search";
-              params = [
-                { name = "q"; value = "{searchTerms}"; }
-              ];
-            }];
-
-            definedAliases = [ "@searxng" ];
-          };
-
-          "Startpage" = {
-            urls = [{
-              template = "https:/startpage.com/sp/search";
-              params = [
-                { name = "q"; value = "{searchTerms}"; }
-              ];
-            }];
-
-            definedAliases = [ "@sp" ];
-          };
-
-          "Bing".metaData.hidden = true;
-          "Google".metaData.hidden = true;
-          "eBay".metaData.hidden = true;
-        };
-        search.force = true;
-        search.default = "SearXNG";
-
-        settings = {
-          "browser.disableResetPrompt" = true;
-          "browser.download.panel.shown" = true;
-          "browser.download.useDownloadDir" = false;
-          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-          "browser.shell.checkDefaultBrowser" = false;
-          "browser.shell.defaultBrowserCheckCount" = 1;
-          "dom.security.https_only_mode" = true;
-          "privacy.trackingProtection.enabled" = true;
-          "browser.toolbars.bookmarks.visibility" = "newtab";
-          "browser.translations.neverTranslateLanguages" = "nl";
-          "browser.newtabpage.pinned" = [
             {
-              label = "Server";
+              name = "Toolbar";
-              url = "https://home.xeovalyte.dev";
+              toolbar = true;
-            }
+              bookmarks = [
-            {
+                {
-              label = "Youtube";
+                  name = "Brightspace";
-              url = "https://youtube.com";
+                  bookmarks = [
-            }
+                    {
-            {
+                      name = "Books";
-              label = "My TU Delft";
+                      url = "https://drive.google.com/drive/folders/1L5OTbn5p3i7_Nc80hc5PztiEGHKwi-I4";
-              url = "https://my.tudelft.nl/";
+                    }
+                    {
+                      name = "LCB";
+                      url = "https://brightspace.tudelft.nl/d2l/le/content/681010/Home";
+                    }
+                    {
+                      name = "Calculus";
+                      url = "https://brightspace.tudelft.nl/d2l/le/content/681024/Home";
+                    }
+                    {
+                      name = "IP1";
+                      url = "https://brightspace.tudelft.nl/d2l/le/content/681020/Home";
+                    }
+                  ];
+                }
+              ];
             }
           ];
-          "signon.rememberSignons" = false;
+          search.engines = {
+            "Nix" = {
+              urls = [{
+                template = "https://mynixos.com/search";
+                params = [
+                  { name = "q"; value = "{searchTerms}"; }
+                ];
+              }];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@nix" ];
+            };
+
+            "SearXNG" = {
+              urls = [{
+                template = "https:/search.xeovalyte.dev/search";
+                params = [
+                  { name = "q"; value = "{searchTerms}"; }
+                ];
+              }];
+
+              definedAliases = [ "@searxng" ];
+            };
+
+            "Startpage" = {
+              urls = [{
+                template = "https:/startpage.com/sp/search";
+                params = [
+                  { name = "q"; value = "{searchTerms}"; }
+                ];
+              }];
+
+              definedAliases = [ "@sp" ];
+            };
+
+            "Bing".metaData.hidden = true;
+            "Google".metaData.hidden = true;
+            "eBay".metaData.hidden = true;
+          };
+          search.force = true;
+          search.default = "SearXNG";
+
+          settings = {
+            "browser.disableResetPrompt" = true;
+            "browser.download.panel.shown" = true;
+            "browser.download.useDownloadDir" = false;
+            "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+            "browser.shell.checkDefaultBrowser" = false;
+            "browser.shell.defaultBrowserCheckCount" = 1;
+            "dom.security.https_only_mode" = true;
+            "privacy.trackingProtection.enabled" = true;
+            "browser.toolbars.bookmarks.visibility" = "newtab";
+            "browser.translations.neverTranslateLanguages" = "nl";
+            "browser.newtabpage.pinned" = [
+              {
+                label = "Server";
+                url = "https://home.xeovalyte.dev";
+              }
+              {
+                label = "Youtube";
+                url = "https://youtube.com";
+              }
+              {
+                label = "My TU Delft";
+                url = "https://my.tudelft.nl/";
+              }
+            ];
+            "signon.rememberSignons" = false;
+          };
         };
-      };
+      })
-    };
+    ];
   };
 }
 

modules/home/theming/stylix.nix

@@ -39,10 +39,7 @@ in {
 
     stylix.polarity = "dark";
 
-    stylix.base16Scheme = if (cfg.wallpaper == "theme") then
+    stylix.base16Scheme = lib.mkIf (cfg.theme != "theme") "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml";
-        theme
-      else
-        "${pkgs.base16-schemes}/share/themes/da-one-ocean.yaml";
 
     stylix.autoEnable = true;