Load of updates and module simplification

1 files changed, 8 insertions, 2 deletions

diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index ea8bd74..5c6e2fe 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -4,8 +4,9 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkOverride mkDefault mkIf optionals;
+  inherit (lib) mkOverride mkDefault optionals;
   isNative = config.nixpkgs.hostPlatform == config.nixpkgs.buildPlatform;
+  isArm = config.nixpkgs.hostPlatform.isAarch;
 in {
   config = {
     system.stateVersion = "24.05";
@@ -154,7 +155,12 @@ in {
         syntaxHighlighting.enable = isNative;
       };
       shellrc = true;
-      vim.defaultEditor = mkDefault true;
+      vim.defaultEditor = isArm;
+      neovim = {
+        enable = !isArm;
+        defaultEditor = true;
+        withNodeJs = true;
+      };
 
       wireshark.enable = true;
     };