config/graphical.nix

@@ -1,4 +1,4 @@
-{ nixos-config, ... }:
+{ config, ... }:
 {
   time.timeZone = "Etc/GMT-1";
   isGraphical = true;
@@ -6,6 +6,5 @@
     ./kde
     ./documentation.nix
     ./graphical/fonts.nix
-    "${nixos-config}/services/security-key"
   ];
 }

programs/desktop/firefox/default.nix

@@ -122,10 +122,6 @@ in
         "widget.use-xdg-desktop-portal.mime-handler" = 1;
         "widget.use-xdg-desktop-portal.open-uri" = 1;
         "widget.use-xdg-desktop-portal.settings" = 1;
-        "extensions.pocket.enabled" = false;
-        "browser.newtabpage.activity-stream.showSponsored" = false;
-        "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-        "browser.newtabpage.activity-stream.default.sites" = "";
       };
       userChrome = ''
         @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

programs/desktop/pim/email.nix

@@ -9,7 +9,7 @@
     imapnotify = {
       enable = true;
       onNotify = "${pkgs.isync}/bin/mbsync test-%s";
-      onNotifyPost = "${pkgs.notmuch}/bin/notmuch new && ${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
+      onNotifyPost.mail = "${pkgs.notmuch}/bin/notmuch new && ${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
     };
     mbsync = {
       enable = true;

services/desktop/default.nix

@@ -2,6 +2,5 @@
 {
   imports = [
     ./kdeconnect.nix
-    ./gpg
   ];
 }

services/desktop/gpg/default.nix

@@ -1,10 +0,0 @@
-{ config, ... }:
-{
-  programs.gpg = {
-    enable = true;
-    homedir = "${config.xdg.dataHome}/gnupg";
-    mutableKeys = false;
-    mutableTrust = false;
-    scdaemonSettings.disable-ccid = true;
-  };
-}

services/security-key/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./pcscd.nix
-    ./tpm2.nix
-  ];
-}

services/security-key/pcscd.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  services.pcscd = {
-    enable = true;
-  };
-}

services/security-key/tpm2.nix

@@ -1,11 +0,0 @@
-{ ... }:
-{
-  security.tpm2 = {
-    enable = true;
-    abrmd.enable = true;
-    pkcs11.enable = true;
-    tctiEnvironment.enable = true;
-  };
-  services.tcsd.enable = true;
-  systemd.tpm2.enable = true;
-}