From e09285d330d9b95f0de86ff57c755d5e6ea3df23 Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Thu, 9 Jan 2025 19:28:33 +0100 Subject: [PATCH] Modified config so kiiwy doesn't get mad --- hosts/desktop/home.nix | 56 +++--- modules/home/applications/firefox.nix | 273 +++++++++++++------------- modules/home/theming/stylix.nix | 5 +- 3 files changed, 164 insertions(+), 170 deletions(-) diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 46a1d86..552539d 100644 --- a/hosts/desktop/home.nix +++ b/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 + ''; + }; + }; } diff --git a/modules/home/applications/firefox.nix b/modules/home/applications/firefox.nix index 42426c9..0305e16 100644 --- a/modules/home/applications/firefox.nix +++ b/modules/home/applications/firefox.nix @@ -22,148 +22,151 @@ in { home.packages = with pkgs; [ unstable.firefoxpwa ]; - - programs.firefox = { - enable = true; - nativeMessagingHosts = [ pkgs.unstable.firefoxpwa ]; - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - EnableTrackingProtection = { - Value = true; - Locked = true; - Cryptomining = true; - Fingerprinting = true; - }; - DisablePocket = 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"; + programs.firefox = lib.mkMerge [ + { + enable = true; + } + (lib.mkIf (config.home.username == "xeovalyte") { + nativeMessagingHosts = [ pkgs.unstable.firefoxpwa ]; + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value = true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; }; - "uBlock0@raymondhill.net" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/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"; + DisablePocket = 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" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/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 = { - 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" = [ + profiles.xeovalyte = { + bookmarks = [ { - label = "Server"; - url = "https://home.xeovalyte.dev"; - } - { - label = "Youtube"; - url = "https://youtube.com"; - } - { - label = "My TU Delft"; - url = "https://my.tudelft.nl/"; + 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"; + } + ]; + } + ]; } ]; - "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; + }; }; - }; - }; + }) + ]; }; } diff --git a/modules/home/theming/stylix.nix b/modules/home/theming/stylix.nix index 7e49415..b3d161a 100644 --- a/modules/home/theming/stylix.nix +++ b/modules/home/theming/stylix.nix @@ -39,10 +39,7 @@ in { stylix.polarity = "dark"; - stylix.base16Scheme = if (cfg.wallpaper == "theme") then - theme - else - "${pkgs.base16-schemes}/share/themes/da-one-ocean.yaml"; + stylix.base16Scheme = lib.mkIf (cfg.theme != "theme") "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml"; stylix.autoEnable = true;