311 current 1970-01-01 01:00:00 23.11.20240514.9ddcaff 6.1.90 *

hosts/MaxNixosLaptop/home.nix

@@ -10,6 +10,8 @@
   sway.enable = true;
   sway.laptop = true;
 
+  shell.enable = true;
+
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "max";
@@ -57,10 +59,6 @@
     prusa-slicer
   ];
 
-  home.sessionVariables = {
-    EDITOR = "${pkgs.neovim}/bin/nvim";
-  };
-
   xdg.enable = true;
 
   services.nextcloud-client.enable = true;

modules/home/shell/bat.nix

@@ -1,4 +1,15 @@
-{...}: {
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.shell.bat;
+in {
+  options = {
+    shell.bat.enable = lib.mkEnableOption "bat, a cat replacement with syntax highlighting";
+  };
+
+  config = lib.mkIf cfg.enable {
     programs.bat = {
       enable = true;
       config = {
@@ -7,4 +18,5 @@
         style = "numbers,changes,header-filename,header-filesize";
       };
     };
+  };
 }

modules/home/shell/btop.nix

@@ -1,4 +1,16 @@
-{pkgs, ...}: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.shell.btop;
+in {
+  options = {
+    shell.btop.enable = lib.mkEnableOption "btop, a system monitor";
+  };
+
+  config = lib.mkIf cfg.enable {
     programs.btop = {
       enable = true;
       settings = {
@@ -34,4 +46,5 @@
         selected_battery = "Auto";
       };
     };
+  };
 }

modules/home/shell/default.nix

@@ -1,3 +1,20 @@
-{...}: {
+{
-  imports = [./zsh.nix ./bat.nix ./btop.nix];
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.shell;
+in {
+  imports = [./zsh.nix ./bat.nix ./btop.nix ./neovim.nix];
+
+  options = {
+    shell.enable = lib.mkEnableOption "my shell environment";
+  };
+
+  config = lib.mkIf cfg.enable {
+    shell.zsh.enable = lib.mkDefault true;
+    shell.neovim.enable = lib.mkDefault true;
+    shell.btop.enable = lib.mkDefault true;
+    shell.bat.enable = lib.mkDefault true;
+  };
 }

modules/home/shell/neovim.nix

@@ -0,0 +1,19 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.shell.neovim;
+in {
+  options = {
+    shell.neovim.enable = lib.mkEnableOption "neovim";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [neovim];
+    home.sessionVariables = {
+      EDITOR = "${pkgs.neovim}/bin/nvim";
+    };
+  };
+}

modules/home/shell/zsh.nix

@@ -1,4 +1,16 @@
-{pkgs, ...}: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.shell.zsh;
+in {
+  options = {
+    shell.zsh.enable = lib.mkEnableOption "Zsh, an advanced shell";
+  };
+
+  config = lib.mkIf cfg.enable {
     programs.zsh = {
       enable = true;
       enableAutosuggestions = true;
@@ -52,7 +64,6 @@
 
     programs.starship = {
       enable = true;
-    enableBashIntegration = true;
       enableZshIntegration = true;
       settings = {
         add_newline = false;
@@ -70,10 +81,8 @@
 
     programs.zoxide = {
       enable = true;
-    enableBashIntegration = true;
       enableZshIntegration = true;
       options = ["--cmd cd"];
     };
-
+  };
-  home.packages = with pkgs; [neovim];
 }