reformat of files

machines/luna/modules.nix

@@ -1,7 +1,6 @@
 {...}: {
   imports = [
     ../../modules
-    ../../modules/boot/loader/systemd.nix
   ];
 
   config.horseman = {
@@ -47,11 +46,10 @@
     apps = {
       dev.enable = true;
       visual.enable = true;
-      terminal.enable = true;
-    };
-
-    terminal = {
-      zsh.enable = true;
+      terminal = {
+        enable = true;
+        zsh.enable = true;
+      };
     };
   };
 }

machines/solis/modules.nix

@@ -1,7 +1,6 @@
 {...}: {
   imports = [
     ../../modules
-    ../../modules/boot/loader/grub.nix
   ];
 
   config.horseman = {

machines/terra/modules.nix

@@ -57,11 +57,10 @@
     apps = {
       dev.enable = true;
       visual.enable = true;
-      terminal.enable = true;
-    };
-
-    terminal = {
-      zsh.enable = true;
+      terminal = {
+        enable = true;
+        zsh.enable = true;
+      };
     };
 
     timers = {

modules/apps/default.nix

@@ -3,6 +3,7 @@
     ./dev.nix
 
     ./terminal.nix
+    ./terminal/zsh.nix
 
     ./visual.nix
     ./visual/firefox.nix

modules/terminal/default.nix

@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./zsh.nix
-  ];
-}

modules/terminal/zsh.nix

@@ -1,55 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.horseman.terminal.zsh;
-in {
-  options = {
-    horseman.terminal.zsh = {
-      enable = mkEnableOption "The ZSH shell and plugins for it";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    users.defaultUserShell = pkgs.zsh;
-    environment.shells = with pkgs; [zsh];
-
-    programs.zsh = {
-      enable = true;
-      enableCompletion = true;
-
-      histSize = 10000;
-
-      shellAliases = {
-        clone-dotfiles = "cp -r /home/horseman/nix-config/config/dotfiles/.\* /home/horseman/";
-        rebuild = "function _rebuild(){clone-dotfiles && sudo nixos-rebuild switch --flake \"$@\" && nix fmt *}; _rebuild";
-        update = "sudo nix flake update && git commit flake.lock -m 'Update flake.lock: $(date +%y-%m-%d)' && rebuild";
-        compose = "sudo docker compose";
-        wolpc = "wakeonlan D8:5E:D3:A8:B1:0A";
-        capture-config = "nix run github:pjones/plasma-manager > ~/nix-config/modules/wm/plasma/default.nix";
-        reboot-to-windows = "sudo efibootmgr -n 0000";
-        mkdir = "mkdir -p";
-        l = "ls -lAh --group-directories-first";
-        zip = "zip -r";
-        cat = "bat";
-        py = "python3";
-      };
-
-      ohMyZsh = {
-        enable = true;
-        plugins = [
-          "zsh-interactive-cd"
-          "git-auto-fetch"
-          "wd"
-        ];
-        theme = "theme";
-        custom = "/home/horseman/nix-config/config/zsh";
-      };
-
-      shellInit = "eval \"$(direnv hook zsh)\"";
-    };
-  };
-}