modules/home-manager/programs/share-files.nix

@@ -10,8 +10,8 @@ let
 in
 {
   options.local.programs.share-files = {
-    onionshare = mkShareFileOpts "onionshare-gui";
-    croc = mkShareFileOpts "croc";
+    onionshare.enable = mkShareFileOpts "onionshare-gui";
+    croc.enable = mkShareFileOpts "croc";
   };
 
   config.home.packages =

users/jan/default.nix

@@ -1,8 +1,6 @@
 { config, pkgs, lib, inputs, globalData, ... }:
 
 {
-  imports = [./davmail.secret.nix];
-
   nixpkgs.overlays = lib.mkAfter [
     inputs.nil.overlays.nil
     inputs.wired.overlays.default
@@ -37,22 +35,6 @@
     let lanMouseCfg = config.home-manager.users.jan.local.services.lan-mouse;
     in lib.optional lanMouseCfg.enable lanMouseCfg.settings.port;
 
-  # Required to use MS Exchange in aerc
-  services.davmail = {
-    enable = true;
-    url = "https://outlook.office365.com/EWS/Exchange.asmx";
-    config.davmail = {
-      allowRemote = false;
-      ssl = {
-        nosecurecaldav = false;
-        nosecureimap = false;
-        nosecureldap = false;
-        nosecuresmtp = false;
-      };
-      mode = "O365Manual";
-    };
-  };
-
   home-manager.users.jan = {
     imports = [
       ./accounts.secret.nix

users/jan/git/default.nix

@@ -67,9 +67,6 @@
       chc = "cherry-pick --continue";
       cha = "cherry-pick --abort";
 
-      re = "restore";
-      res = "restore --staged";
-
       lo = "log --pretty=oneline";
 
       sma = "submodule add";