From a1ea0ea30eeba09c4b00e21882617a8242c509f3 Mon Sep 17 00:00:00 2001
From: schererleander <leander@schererleander.de>
Date: Fri, 23 May 2025 00:30:24 +0200
Subject: update to 25.05

---
 hosts/nixos/configuration.nix |  9 ++++----
 modules/firefox.nix           | 48 ++++++++++++++++++++++---------------------
 modules/zsh.nix               |  2 +-
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix
index 6a8e775..4eb9afc 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@@ -1,14 +1,13 @@
-{ config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
-
   imports = [
     ./hardware-configuration.nix
     ./audio.nix
     ./wooting.nix
   ];
 
-  # Bootloader.
+  # Bootloader
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
@@ -66,5 +65,5 @@
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nixpkgs.config.allowUnfree = true;
-  system.stateVersion = "24.11";
-}
\ No newline at end of file
+  system.stateVersion = "25.05";
+}
diff --git a/modules/firefox.nix b/modules/firefox.nix
index a9af9dc..7d3dd4d 100644
--- a/modules/firefox.nix
+++ b/modules/firefox.nix
@@ -6,13 +6,31 @@
     programs.firefox = {
       enable = true;
       profiles.default = {
-        extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
-          ublock-origin
-          istilldontcareaboutcookies
-          sponsorblock
-          decentraleyes
-          vimium-c
-        ];
+        extensions = {
+          packages = with inputs.firefox-addons.packages.${pkgs.system}; [
+            ublock-origin
+            istilldontcareaboutcookies
+            sponsorblock
+            decentraleyes
+            vimium-c
+          ];
+
+          force = true;
+
+          settings."uBlock0@raymondhill.net".settings = {
+            UserMessaging = {
+              uiTheme = "dark";
+              uiAccentCustom = true;
+              uiAccentCustom0 = "#2C2C2C";
+              cloudStorageEnabled = false;
+              contextMenuEnabled = false;
+            };
+            # Block annoying login with google banner
+            userFilters = ''
+              ||accounts.google.com/gsi/*
+            '';
+          };
+        };
 
         search.engines = {
           nix-packages = {
@@ -177,22 +195,6 @@
           WhatsNew = false;
         };
 
-        "3rdparty".Extensions = {
-          "uBlock0@raymondhill.net".adminSettings = {
-            userSettings = {
-              uiTheme = "dark";
-              uiAccentCustom = true;
-              uiAccentCustom0 = "#2C2C2C";
-              cloudStorageEnabled = false;
-              contextMenuEnabled = false;
-            };
-            # Block annoying login with google banner
-            userFilters = ''
-                ||accounts.google.com/gsi/*
-            '';
-          };
-        };
-        
         Preferences = {
           "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
           "browser.toolbars.bookmarks.visibility" = "never";
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 5832f25..c79e460 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -13,7 +13,7 @@
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
 
-      initExtra = ''
+      initContent = ''
         # view man pages with nvim
         export MANPAGER="nvim +Man!"
 
-- 
cgit v1.3.1