From b44db14a17f2520f78081d85196615e6bfe2f92e Mon Sep 17 00:00:00 2001
From: Atridad Lahiji <me@atri.dad>
Date: Thu, 22 Jan 2026 14:30:48 -0700
Subject: [PATCH] Better org

---
 modules/home-manager.nix   |  2 +-
 modules/home/firefox.nix   | 17 ---------------
 modules/home/librewolf.nix | 43 ++++++++++++++++++++++++++++++++++++++
 modules/home/session.nix   | 14 +++++++++++++
 4 files changed, 58 insertions(+), 18 deletions(-)
 delete mode 100644 modules/home/firefox.nix
 create mode 100644 modules/home/librewolf.nix

diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index a0930d3..e6f8b03 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -9,7 +9,7 @@ let
   homeModules = [
     ./home/session.nix
     ./home/packages.nix
-    ./home/firefox.nix
+    ./home/librewolf.nix
     ./home/git.nix
     ./home/gnome.nix
   ];
diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix
deleted file mode 100644
index f13ab47..0000000
--- a/modules/home/firefox.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs, nur, ... }:
-
-{
-  programs.firefox = {
-    enable = true;
-    package = pkgs.librewolf;
-
-    profiles.default = {
-      id = 0;
-      extensions = with nur.repos.rycee.firefox-addons; [
-        bitwarden
-        floccus
-        ublock-origin
-      ];
-    };
-  };
-}
diff --git a/modules/home/librewolf.nix b/modules/home/librewolf.nix
new file mode 100644
index 0000000..f23c5f3
--- /dev/null
+++ b/modules/home/librewolf.nix
@@ -0,0 +1,43 @@
+{ pkgs, ... }:
+
+{
+  programs.firefox = {
+    enable = true;
+    package = pkgs.librewolf;
+
+    policies = {
+      DisableTelemetry = true;
+      DisableFirefoxStudies = true;
+      DisablePocket = true;
+      DisableFirefoxAccounts = true;
+
+      ExtensionSettings = {
+        # Bitwarden
+        "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+          installation_mode = "force_installed";
+        };
+
+        # Floccus
+        "floccus@marcelklehr.de" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/floccus/latest.xpi";
+          installation_mode = "force_installed";
+        };
+
+        # uBlock Origin
+        "uBlock0@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          installation_mode = "force_installed";
+        };
+      };
+
+      # General Preferences
+      Preferences = {
+        "browser.startup.homepage" = "about:home";
+        "browser.toolbars.bookmarks.visibility" = "newtab";
+        "privacy.resistFingerprinting.letterboxing" = true;
+        "extensions.autoDisableScopes" = 0;
+      };
+    };
+  };
+}
diff --git a/modules/home/session.nix b/modules/home/session.nix
index 54f26ca..8339192 100644
--- a/modules/home/session.nix
+++ b/modules/home/session.nix
@@ -5,4 +5,18 @@
     BROWSER = "librewolf";
     SSH_AUTH_SOCK = "${config.home.homeDirectory}/.bitwarden-ssh-agent.sock";
   };
+
+  programs.bash = {
+    enable = true;
+    initExtra = ''
+      export SSH_AUTH_SOCK="${config.home.homeDirectory}/.bitwarden-ssh-agent.sock"
+    '';
+  };
+
+  programs.zsh = {
+    enable = true;
+    initContent = ''
+      export SSH_AUTH_SOCK="${config.home.homeDirectory}/.bitwarden-ssh-agent.sock"
+    '';
+  };
 }