nixos: separate between packages needed for CLI and for GUI

src/nixos/modules/common/base.nix

@@ -32,15 +32,10 @@
 
     lm_sensors
 
-    ############################################################################
-    # Neovim
-    ############################################################################
+    # Every system deserves a vim
     vim
-    # To support neovim clipboard
-    xclip
-    wl-clipboard
   ];
-  environment.variables.EDITOR = "nvim";
+  environment.variables.EDITOR = "vim";
 
   programs.zsh.enable = true;
   users.defaultUserShell = pkgs.zsh;

src/nixos/users/common/lijun-base/home.nix

@@ -20,6 +20,7 @@ in {
     ./autostart.nix
     ./desktop.nix
     ../networking/gui.nix
+    ../vim/gui.nix
   ];
   home = {
     # See https://nix-community.github.io/home-manager/options.html#opt-home.stateVersion

src/nixos/users/common/lijun-cli-base/home.nix

@@ -12,12 +12,12 @@ in {
   nixpkgs.config.allowUnfree = true;
   imports = [
     ./tmux.nix
-    ./vim.nix
     ./shell.nix
     ../this.nix
+    ../vim/cli.nix
+    ../networking/cli.nix
     # My custom scripts
     ./../../../../local/bin/scripts.nix
-    ../networking/cli.nix
   ];
   home = {
     # See https://nix-community.github.io/home-manager/options.html#opt-home.stateVersion

src/nixos/users/common/lijun-cli-base/vim.nix → src/nixos/users/common/vim/cli.nix

@@ -1,3 +1,4 @@
+# This module contains every CLI tool that I need for Neovim
 {
   config,
   pkgs,

src/nixos/users/common/vim/gui.nix

@@ -0,0 +1,16 @@
+# This module contains every package that I need for Neovim
+# when I work in a graphical environment
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  home = {
+    packages = with pkgs; [
+      # To support neovim clipboard
+      xclip
+      wl-clipboard
+    ];
+  };
+}