system/home/browser/firefox.nix

@@ -1,12 +1,7 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
   stylix.targets.firefox.profileNames = [ "default" ];
-  programs = {
+  programs.firefox = {
-    browserpass = {
-      enable = true;
-      browsers = [ "firefox" ];
-    };
-    firefox = {
     enable = true;
     policies = {
       BlockAboutProfiles = true;
@@ -15,7 +10,7 @@
         BehaviorPrivateBrowsing = "reject";
         Locked = true;
       };
-        DefaultDownloadDirectory = config.xdg.userDirs.download;
+      DefaultDownloadDirectory = "\${home}/Downloads";
       DisableAppUpdate = true;
       DisableFirefoxAccounts = true;
       DisableFirefoxScreenshots = true;
@@ -44,15 +39,10 @@
           installation_mode = "force_installed";
           install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
         };
-          # Browserpass
+        # Proton Pass
-          "browserpass@maximbaz.com" = {
+        "78272b6fa58f4a1abaac99321d503a20@proton.me" = {
           installation_mode = "force_installed";
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/browserpass-ce/latest.xpi";
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/proton-pass/latest.xpi";
-          };
-          # SimpleLogin
-          "addon@simplelogin" = {
-            installation_mode = "force_installed";
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/simplelogin/latest.xpi";
         };
         # Consent-O-Matic
         "gdpr@cavi.au.dk" = {
@@ -212,5 +202,4 @@
       };
     };
   };
-  };
 }

system/home/default.nix

@@ -4,7 +4,7 @@
     inputs.nix-index-database.hmModules.nix-index
     ./shell/default.nix
     ./scripts/default.nix
-    ./password-store/default.nix
+    ./services/password-store/default.nix
   ];
   programs.home-manager.enable = true;
 }

system/home/desktop.nix

@@ -2,11 +2,11 @@
 {
   imports = [
     ./plasma/default.nix
-    ./email/default.nix
-    ./calendar/default.nix
-    ./terminal/default.nix
     ./emacs/default.nix
+    ./terminal/default.nix
     ./browser/default.nix
+    ./services/email/default.nix
+    ./services/calendar/default.nix
   ];
   home = {
     packages = with pkgs; [

system/home/emacs/default.nix

@@ -1,12 +1,17 @@
-{ config, pkgs, ... }:
 {
-  imports = [
+  config,
-    ../shell/default.nix
+  lib,
-    ../shell/git.nix
+  pkgs,
-    ../gpg/default.nix
+  ...
-  ];
+}:
+{
+  imports = [ ../shell/default.nix ];
   stylix.targets.emacs.enable = false;
   services = {
+    gpg-agent = {
+      enable = true;
+      pinentryPackage = lib.mkDefault pkgs.pinentry-all;
+    };
     git-sync.repositories = {
       org = {
         path = "${config.xdg.userDirs.documents}/org";
@@ -26,7 +31,9 @@
       startWithUserSession = false;
     };
   };
-  programs.emacs = {
+  programs = {
+    gpg.enable = true;
+    emacs = {
       # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
       enable = true;
       package = pkgs.emacs29-pgtk;
@@ -73,6 +80,7 @@
           emacsql-sqlite
         ];
     };
+  };
   home.packages = with pkgs; [
     # Emacs requirements
     imagemagick

system/home/gpg/default.nix

@@ -1,8 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  programs.gpg.enable = true;
-  services.gpg-agent = {
-    enable = true;
-    pinentryPackage = lib.mkDefault pkgs.pinentry-all;
-  };
-}

system/home/password-store/default.nix

@@ -1,22 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [
-    ../gpg/default.nix
-    ../shell/git.nix
-  ];
-  services.git-sync.repositories.password-store = {
-    path = config.programs.password-store.settings.PASSWORD_STORE_DIR;
-    uri = "git+https://git.xenia.me.uk/pixelifytica/pass.git";
-  };
-  programs = {
-    gpg.enable = true;
-    password-store = {
-      enable = true;
-      package = pkgs.pass-nodmenu.withExtensions (exts: with exts; [ pass-update ]);
-      settings = {
-        PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
-        PASSWORD_STORE_ENABLE_EXTENSIONS = "true";
-      };
-    };
-  };
-}

system/home/services/password-store/default.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  programs = {
+    gpg.enable = true;
+    password-store = {
+      enable = true;
+      package = pkgs.pass-nodmenu.withExtensions (
+        exts: with exts; [
+          pass-update
+          pass-import
+        ]
+      ); # pass-audit
+      settings = {
+        PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
+        PASSWORD_STORE_ENABLE_EXTENSIONS = "true";
+      };
+    };
+  };
+  services.gpg-agent = {
+    enable = true;
+    pinentryPackage = lib.mkDefault pkgs.pinentry-all;
+  };
+}