homes: emacs can be enabled/disabled + fix wsl

flake.nix

@@ -12,7 +12,7 @@
       flake = false;
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nur.url = "github:nix-community/NUR";

homes/base.nix

@@ -14,8 +14,8 @@
     ./modules/vim
     ./modules/zsh
     ./modules/ranger
-    ./modules/emacs
     ./modules/tmux
+    ./modules/emacs
     # ./modules/nushell
   ];
 

homes/modules/emacs/default.nix

@@ -5,11 +5,26 @@
   my-dotfiles,
   wrapCmd,
   ...
-}: {
-  home.packages = [
-    pkgs.myEmacs
-    (pkgs.aspellWithDicts (d: [d.fr d.en]))
-  ];
-  home.file.".aspell.conf".text = "data-dir ${pkgs.aspell}/lib/aspell";
-  home.file.".emacs".text = builtins.readFile "${my-dotfiles}/files/emacs_conf";
+}:
+let
+  cfg = config.my-programs.emacs;
+in {
+    options = {
+    my-programs.emacs = {
+      enable = lib.mkOption {
+        default = false;
+        description = ''
+          Whether to enable emacs module.
+        '';
+      };
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    home.packages = [
+      pkgs.myEmacs
+      (pkgs.aspellWithDicts (d: [d.fr d.en]))
+    ];
+    home.file.".aspell.conf".text = "data-dir ${pkgs.aspell}/lib/aspell";
+    home.file.".emacs".text = builtins.readFile "${my-dotfiles}/files/emacs_conf";
+  };
 }

homes/wsl.nix

@@ -11,9 +11,7 @@
 }: {
   imports = [
     ./base.nix
-
     # GUI (disabled for experiment)
-    # ./modules/emacs
     ./modules/vim
   ];
 
@@ -27,6 +25,14 @@
       '';
     };
 
+    my-programs.emacs.enable = false;
+
+    services.gpg-agent = {
+      enable = true;
+      defaultCacheTtl = 1800;
+      enableSshSupport = true;
+    };
+
     # First we activate home-manager
     programs.home-manager.enable = true;
     home.file.".config/sakura/sakura.conf".text =
@@ -36,21 +42,14 @@
       bat # cat with colors for code
       cloc
       pass
-      taskwarrior
-      timewarrior
       nitrokey-app
       jq
       cgvg
       tree
-      manpages
-      gcc
+      pinentry
+      # manpages
       wget
-      gdb
       direnv
-      entr
-
-      # Nix file formating
-      nixfmt
     ];
   };
 }