modules/home-manager/programs/calendar.nix

@@ -1,18 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfg = config.local.programs.calendar;
-
-  mkCalOpts = name: {
-    enable = lib.mkEnableOption name;
-    package = lib.mkPackageOption pkgs name { };
-  };
-in
-{
-  options.local.programs.calendar = {
-    khal = mkCalOpts "khal";
-  };
-
-  config.home.packages =
-    lib.optional cfg.khal.enable cfg.khal.package;
-}

modules/home-manager/programs/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ./aerc.nix
-    ./calendar.nix
     ./communication.nix
     ./dev-tools.nix
     ./flameshot.nix

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

@@ -2,24 +2,19 @@
 
 let
   cfg = config.local.programs.share-files;
-
-  mkShareFileOpts = name: {
-    enable = lib.mkEnableOption name;
-    package = lib.mkPackageOption pkgs name { };
-  };
 in
 {
-  options.local.programs.share-files = {
-    onionshare.enable = mkShareFileOpts "onionshare-gui";
-    croc.enable = mkShareFileOpts "croc";
+  options.local.programs.share-files = with lib; {
+    onionshare.enable = mkEnableOption "onionshare";
+    croc.enable = mkEnableOption "croc";
   };
 
   config.home.packages =
     # OnionShare is an open-source tool that lets you securely and anonymously share files,
     # host websites, and chat with friends using the Tor network.
-    lib.optional cfg.onionshare.enable cfg.onionshare.package
+    lib.optional cfg.onionshare.enable pkgs.onionshare-gui
 
     # Easily and securely send things from one computer to another
-    ++ lib.optional cfg.croc.enable cfg.croc.package;
+    ++ lib.optional cfg.croc.enable pkgs.croc;
 
 }

modules/nixos/configs/window-manager/xmonad.nix

@@ -12,13 +12,7 @@ let cfg = config.local.window-manager.xmonad; in
 
     services.xserver = {
       enable = true;
-      displayManager = {
-        defaultSession = "none+xmonad";
-        lightdm = {
-          enable = true;
-          greeters.tiny.enable = true;
-        };
-      };
+      displayManager.defaultSession = "none+xmonad";
       windowManager.xmonad.enable = true;
     };