flake.nix

@@ -42,7 +42,7 @@
             ./nixos/catppuccin.nix
             ./nixos/configuration.nix
             ./nixos/development.nix
-            ./nixos/environment.nix
+            #./nixos/environment.nix
             ./nixos/gaming.nix
             ./nixos/git.nix
             ./nixos/gui-pkgs.nix

nixos/environment.nix

@@ -1,7 +1,10 @@
 { lib, ... }: {
   environment.variables = {
-    EDITOR = "nvim";
+    EDITOR = lib.mkDefault (if builtins.hasAttr "SSH_CONNECTION"
-    VISUAL = "code";
+    builtins.currentSystemEnvironment then
+      "nvim"
+    else
+      "code");
 
     # XDG settings
     XDG_CONFIG_HOME = lib.mkDefault "$HOME/.config";

nixos/nvim.nix

@@ -1,18 +1,7 @@
-{ pkgs, ... }: {
+{
   programs.nixvim = {
-    extraPackages = with pkgs; [ fd ];
     enable = true;
     viAlias = true;
     vimAlias = true;
-    colorschemes.catppuccin.enable = true;
-    plugins = {
-      conform-nvim = {
-        enable = true;
-      };
-      treesitter.enable = true;
-      cmp.enable = true;
-      cmp-nvim-lsp.enable = true;
-      lsp.enable = true;
-    };
   };
 }