diff options
| -rw-r--r-- | common/modules/matugen/default.nix | 10 | ||||
| -rw-r--r-- | common/modules/matugen/templates/matugen-wlogout.nix | 11 | ||||
| -rw-r--r-- | common/modules/matugen/templates/matugen-zen.nix | 115 | ||||
| -rw-r--r-- | common/programs/firefox.nix | 20 | ||||
| -rw-r--r-- | common/programs/zenBrowser.nix | 6 | ||||
| -rw-r--r-- | flake.lock | 32 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | hosts/nixios/default.nix | 20 |
8 files changed, 158 insertions, 64 deletions
diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix index f67c99a..e9e9252 100644 --- a/common/modules/matugen/default.nix +++ b/common/modules/matugen/default.nix @@ -77,7 +77,6 @@ in xdg.configFile = { "matugen/config.toml" = { - # enable = !config.programs.noctalia-shell.enable; text = # toml '' @@ -151,10 +150,6 @@ in # post_hook = "pkill -SIGUSR2 waybar" ''} - [templates.wlogout] - input_path = "~/.config/matugen/templates/wlogout.css" - output_path = "~/.config/wlogout/colors.css" - ${lib.optionalString config.services.dunst.enable '' [templates.dunst] input_path = '~/.config/matugen/templates/dunstrc' @@ -197,6 +192,11 @@ in input_path = '~/.config/matugen/templates/zen.css' output_path = '~/.config/wallust/templates/userChrome.css' post_hook = "${link_zen}" + + [templates.zen-userContent] + input_path = '~/.config/matugen/templates/zen-usercontent.css' + output_path = '~/.config/userContent.css' + post_hook = "${link_zen}" ''; }; }; diff --git a/common/modules/matugen/templates/matugen-wlogout.nix b/common/modules/matugen/templates/matugen-wlogout.nix deleted file mode 100644 index d982a00..0000000 --- a/common/modules/matugen/templates/matugen-wlogout.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - xdg.configFile."matugen/templates/wlogout.css" = { - text = '' - /* Generated by Matugen - GTK3 Color Variables */ - @define-color surface_bg rgba({{ colors.surface.default.red }}, {{ colors.surface.default.green }}, {{ colors.surface.default.blue }}, 0.69); - @define-color primary_accent {{ colors.primary.default.hex }}; - @define-color on_surface {{ colors.on_surface.default.hex }}; - @define-color hover_bg rgba({{ colors.primary_container.default.red }}, {{ colors.primary_container.default.green }}, {{ colors.primary_container.default.blue }}, 0.3); - ''; - }; -} diff --git a/common/modules/matugen/templates/matugen-zen.nix b/common/modules/matugen/templates/matugen-zen.nix index cbb3df3..cd98991 100644 --- a/common/modules/matugen/templates/matugen-zen.nix +++ b/common/modules/matugen/templates/matugen-zen.nix @@ -1,5 +1,120 @@ { xdg.configFile = { + "matugen/templates/zen-usercontent.css" = { + enable = true; + text = + # css + '' + /* Common variables affecting all pages */ + @-moz-document url-prefix("about:") { + :root { + --in-content-page-color: {{colors.secondary.default.hex}} !important; + --color-accent-primary: {{colors.primary.default.hex}} !important; + /* --color-accent-primary-hover: rgb(249, 217, 240) !important; + --color-accent-primary-active: rgb(245, 195, 219) !important; */ + background-color: {{colors.surface_container.default.hex}} !important; + --in-content-page-background: {{colors.surface_container.default.hex}} !important; + } + + } + + /* Variables and styles specific to about:newtab and about:home */ + @-moz-document url("about:newtab"), url("about:home") { + + :root { + --newtab-background-color: {{colors.surface_container.default.hex}} !important; + --newtab-background-color-secondary: {{colors.surface_container_high.default.hex}} !important; + --newtab-element-hover-color: {{colors.surface_container_high.default.hex}} !important; + --newtab-text-primary-color: {{colors.secondary.default.hex}} !important; + --newtab-wordmark-color: {{colors.secondary.default.hex}} !important; + --newtab-primary-action-background: {{colors.primary.default.hex}} !important; + } + + .icon { + color: {{colors.primary.default.hex}} !important; + } + + .card-outer:is(:hover, :focus, .active):not(.placeholder) .card-title { + color: {{colors.primary.default.hex}} !important; + } + } + + /* Variables and styles specific to about:preferences */ + @-moz-document url-prefix("about:preferences") { + :root { + --zen-colors-tertiary: {{colors.surface_container_low.default.hex}} !important; + --in-content-text-color: {{colors.secondary.default.hex}} !important; + --link-color: {{colors.primary.default.hex}} !important; + /* --link-color-hover: rgb(249, 217, 240) !important; */ + --zen-colors-primary: {{colors.surface_container_high.default.hex}} !important; + --in-content-box-background: {{colors.surface_container_high.default.hex}} !important; + --zen-primary-color: {{colors.primary.default.hex}} !important; + } + + button, + groupbox menulist { + background: {{colors.surface_container_high.default.hex}} !important; + color: {{colors.secondary.default.hex}} !important; + } + + .main-content { + background-color: {{colors.surface_container_lowest.default.hex}} !important; + } + } + + /* Variables and styles specific to about:addons */ + @-moz-document url-prefix("about:addons") { + :root { + --zen-dark-color-mix-base: {{colors.surface_container_low.default.hex}} !important; + --background-color-box: {{colors.surface_container.default.hex}} !important; + } + } + + /* Variables and styles specific to about:protections */ + @-moz-document url-prefix("about:protections") { + :root { + --zen-primary-color: {{colors.surface_container.default.hex}} !important; + --in-content-primary-button-text-color-hover: {{colors.secondary.default.hex}} !important; + --in-content-primary-button-background: {{colors.surface_container.default.hex}} !important; + --in-content-primary-button-text-color: {{colors.secondary.default.hex}} !important; + } + + .card { + background-color: {{colors.surface_container_high.default.hex}} !important; + } + } + /* Pane UI button visibility issue fix */ + #PanelUI-menu-button[open] .toolbarbutton-icon { + fill: {{colors.primary.default.hex}} !important; + } + } + + + img, canvas, video, .avatar, + [class*="avatar"], + [class*="ProfileAvatar"], + [style*="border-radius"] { + border-radius: 0 !important; + clip-path: none !important; + mask-image: none !important; + -webkit-mask-image: none !important; + } + + :not(svg):not(circle):not(ellipse):not(path) { + border-radius: 0 !important; + } + + :root { + --border-radius: 0px !important; + --radius: 0px !important; + --rounded-corner: 0px !important; + --avatar-radius: 0px !important; + --pfp-radius: 0px !important; + } + ''; + }; + }; + xdg.configFile = { "matugen/templates/zen.css" = { enable = true; text = diff --git a/common/programs/firefox.nix b/common/programs/firefox.nix index b63fc8d..d393131 100644 --- a/common/programs/firefox.nix +++ b/common/programs/firefox.nix @@ -7,6 +7,7 @@ { programs.firefox = { enable = false; + package = pkgs.librewolf; policies = { DisableTelemetry = true; @@ -56,30 +57,20 @@ install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; private_browsing = true; }; - # "addon@darkreader.org" = { - # installation_mode = "force_installed"; - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi"; - # }; - } - // lib.optionalAttrs config.hyprland.enable { - "pywalfox@frewacom.org" = { + "addon@darkreader.org" = { + default_area = "menupanel"; installation_mode = "force_installed"; - install_url = "https://addons.mozilla.org/firefox/downloads/latest/pywalfox/latest.xpi"; + install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi"; + private_browsing = true; }; }; }; profiles.default = { settings = { - # Always start fresh, no tab restore - "browser.aboutConfig.showWarning" = false; - "browser.sessionstore.resume_from_crash" = false; - "browser.sessionstore.restore_on_demand" = false; "browser.sessionstore.max_tabs_undo" = 0; "browser.sessionstore.max_windows_undo" = 0; - # "userChrome.theme-material" = true; - # "browser.startup.page" = 1; # Blank page # "browser.newtabpage.enabled" = false; @@ -97,7 +88,6 @@ # Performance "gfx.webrender.all" = true; # Enable WebRender "layers.acceleration.enabled" = true; - # "dom.ipc.processCount" = 8; # Adjust based on CPU cores "browser.cache.disk.enable" = false; # Disable disk cache "browser.cache.memory.enable" = true; # Use memory cache "browser.cache.memory.capacity" = 1048576; # 1gb memory cache diff --git a/common/programs/zenBrowser.nix b/common/programs/zenBrowser.nix index 8227bc7..bee6d86 100644 --- a/common/programs/zenBrowser.nix +++ b/common/programs/zenBrowser.nix @@ -75,8 +75,8 @@ in ExtensionSettings = builtins.listToAttrs extensions; SearchEngines = { - Default = "DuckDuckGo"; - # Default = "Omnisearch"; + # Default = "DuckDuckGo"; + Default = "Omnisearch"; PreventInstalls = true; Remove = [ "Google" @@ -122,7 +122,7 @@ in xdg.configFile = { "userContent.css" = { - enable = true; + enable = false; text = # css '' @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1774007980, - "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "lastModified": 1774274572, + "narHash": "sha256-YtpNRYSv0CQn+MjhHHqFcIR5L0Urex2tTwS42kP6nuc=", "owner": "nix-community", "repo": "home-manager", - "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "rev": "90913f831383a599c556cba59eac8cae9b5195a9", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1774017789, - "narHash": "sha256-W+QFFXaPz5H/rGcqj7iFrYqXazZGNyCLzJivxUIpyqA=", + "lastModified": 1774275328, + "narHash": "sha256-i720jTHSXeP+jj/Frj+Z4btfDzdpg8Q+M/USKW+Vdd8=", "owner": "mangowm", "repo": "mango", - "rev": "ccefa572e1cd221bb3d8b4edc44bf6c91f5be6f6", + "rev": "0d944d9578a3618a35f94385e7c15e6933effff3", "type": "github" }, "original": { @@ -501,11 +501,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1774107556, - "narHash": "sha256-NFxBKTEf4SaWNV6HGOVSeR+kjDLVdM4PMeDTxVD5emk=", + "lastModified": 1774184185, + "narHash": "sha256-uxvwbXjpJUpWgXLi3Oadd+PqR3UV5MC7B/lm45oluLc=", "ref": "refs/heads/master", - "rev": "8229aaa489c8e9cda0ce1ce0997006df712f5123", - "revCount": 64, + "rev": "bcee71cbbb0282d84841ba9b8908773ab56decf2", + "revCount": 66, "type": "git", "url": "https://git.bwaaa.monster/omnisearch" }, @@ -680,11 +680,11 @@ ] }, "locked": { - "lastModified": 1773889674, - "narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=", + "lastModified": 1774154798, + "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5", + "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170", "type": "github" }, "original": { @@ -20,10 +20,10 @@ url = "github:mangowm/mango"; inputs.nixpkgs.follows = "nixpkgs"; }; - # omnisearch = { - # url = "git+https://git.bwaaa.monster/omnisearch"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + omnisearch = { + url = "git+https://git.bwaaa.monster/omnisearch"; + inputs.nixpkgs.follows = "nixpkgs"; + }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/nixios/default.nix b/hosts/nixios/default.nix index 7faa715..ddf0cbf 100644 --- a/hosts/nixios/default.nix +++ b/hosts/nixios/default.nix @@ -15,7 +15,7 @@ ./hardware-configuration.nix (import ../common.nix { inherit user; }) beeMods - # inputs.omnisearch.nixosModules.default + inputs.omnisearch.nixosModules.default ]; services.logind = { @@ -26,15 +26,15 @@ }; }; - # services.omnisearch = { - # enable = true; - # settings = { - # server = { - # port = 8087; - # domain = "https://search.bee.me"; - # }; - # }; - # }; + services.omnisearch = { + enable = true; + settings = { + server = { + port = 8087; + domain = "https://search.bee.me"; + }; + }; + }; # REMOVE LATER virtualisation.vmVariant = { |