system/default.nix

@@ -185,6 +185,7 @@
     };
   };
   services = {
+    passSecretService.enable = true;
     upower.enable = true;
     power-profiles-daemon.enable = true;
     system76-scheduler = {

system/home/desktop.nix

@@ -7,7 +7,6 @@
     ./browser/default.nix
     ./zathura/default.nix
     ./services/email/default.nix
-    ./services/calendar/default.nix
   ];
   home.packages = with pkgs; [
     webcord
@@ -19,7 +18,7 @@
   programs.mpv.enable = true;
   gtk = {
     enable = true;
-    gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/dummyrc"; # Stop clashing with KDE
+    gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
     iconTheme = {
       package = pkgs.papirus-icon-theme;
       name = "Papirus";

system/home/plasma/default.nix

@@ -265,7 +265,10 @@
 
     configFile = {
       baloofilerc."Basic Settings"."Indexing-Enabled" = false;
-      kwalletrc."org.freedesktop.secrets".apiEnabled = false;
+      kwalletrc."org.freedesktop.secrets" = {
+        Enabled = false;
+        apiEnabled = false;
+      };
       kcminputrc.Keyboard.NumLock = 1;
       plasmanotifyrc = {
         Notifications = {

system/home/services/calendar/default.nix

@@ -1,66 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = [
-    (pkgs.writeShellScriptBin "vdirsyncer-ensure-pass" (builtins.readFile ./vdirsyncer-ensure-pass.sh))
-  ];
-  programs = {
-    vdirsyncer.enable = true;
-    khal = {
-      enable = true;
-      locale = {
-        timeformat = "%H:%M";
-        dateformat = "%Y-%m-%d";
-        longdateformat = "%Y-%m-%d %a";
-        datetimeformat = "%Y-%m-%d %H:%M";
-        longdatetimeformat = "%Y-%m-%d %H:%M";
-      };
-    };
-  };
-  services.vdirsyncer.enable = true;
-  accounts.calendar = {
-    basePath = "Calendar";
-    accounts = {
-      personal =
-        let
-          url = "dav.xenia.me.uk";
-        in
-        {
-          primary = true;
-          primaryCollection = "calendar";
-          local = {
-            type = "filesystem";
-            fileExt = ".ics";
-          };
-          remote = {
-            url = "https://${url}";
-            type = "caldav";
-            userName = "pixelifytica";
-            passwordCommand = [
-              "${pkgs.libsecret}/bin/secret-tool"
-              "lookup"
-              "url"
-              "${url}"
-            ];
-          };
-          vdirsyncer = {
-            inherit (config.programs.vdirsyncer) enable;
-            auth = "basic";
-            collections = [ "from a" ];
-            metadata = [
-              "color"
-              "displayname"
-            ];
-            timeRange = {
-              start = "datetime.now() - timedelta(days=365)";
-              end = "datetime.now() + timedelta(days=365)";
-            };
-          };
-          khal = {
-            inherit (config.programs.khal) enable;
-            type = "discover";
-            addresses = with config.accounts.email.accounts.proton; [ address ] ++ aliases;
-          };
-        };
-    };
-  };
-}

system/home/services/calendar/vdirsyncer-ensure-pass.sh

@@ -1,5 +0,0 @@
-URL="dav.xenia.me.uk"
-secret-tool lookup url "$URL" >/dev/null || (
-    echo "Setup calendar password"
-    secret-tool store --label="Personal calendar vdirsyncer" url "$URL"
-)