GRUMBLE

configuration-cross.nix

@@ -0,0 +1,52 @@
+{ config, pkgs, lib, ... }:
+{
+  config = lib.mkMerge [(lib.mkIf (pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform) {
+    environment.systemPackages = with pkgs; [
+      meld
+    ];
+
+    programs.git.config.merge.tool = "meld";
+    programs.git.config.core.editor = "nvim";
+
+    programs.neovim = {
+      enable = true;
+      defaultEditor = true;
+      vimAlias = true;
+      viAlias = true;
+      configure = {
+        # lmao
+        customRC = ''
+        ${builtins.readFile ./dotfiles/nvim-init.vim}
+        lua << EOF
+        ${builtins.readFile ./dotfiles/nvim-init.lua}
+        EOF
+        '';
+        packages.myVimPackage = with pkgs.vimPlugins; {
+          start = [
+            rust-vim
+            vim-tmux-navigator
+            popup-nvim
+            vim-sleuth
+            nvim-lspconfig
+            rust-tools-nvim
+            nvim-lint
+            nvim-cmp
+            cmp-nvim-lsp
+            lsp-status-nvim
+            telescope-nvim
+            nvim-treesitter.withAllGrammars
+            sweetie-nvim
+            vim-nix
+            csharpls-extended-lsp-nvim
+          ];
+          opt = [];
+        };
+      };
+    };
+
+  }) (lib.mkIf (pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform) {
+      programs.vim.enable = true;
+      programs.git.config.core.editor = "vim";
+  }) ];
+
+}

configuration-native.nix

@@ -1,11 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  config = lib.mkIf (pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform) {
-    environment.systemPackages = with pkgs; [
-      meld
-    ];
-
-    programs.git.config.merge.tool = "meld";
-  };
-
-}

configuration.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  imports = [ ./overlays/packages.nix ./configuration-native.nix ];
+  imports = [ ./overlays/packages.nix ./configuration-cross.nix ];
   nixpkgs.config.allowUnfree = true;
 
   nix.settings.extra-experimental-features = "nix-command flakes";
@@ -89,48 +89,12 @@
       config = {
         user.email = "audrey@rhelmot.io";
         user.name = "Audrey Dutcher";
-        core.editor = "nvim";
         init.defaultBranch = "main";
         blame.markUnblamableLines = true;
         credential.helper = "store";
         url."ssh://git@".insteadOf = "git://";
       };
     };
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      vimAlias = true;
-      viAlias = true;
-      configure = {
-        # lmao
-        customRC = ''
-        ${builtins.readFile ./dotfiles/nvim-init.vim}
-        lua << EOF
-        ${builtins.readFile ./dotfiles/nvim-init.lua}
-        EOF
-        '';
-        packages.myVimPackage = with pkgs.vimPlugins; {
-          start = [
-            rust-vim
-            vim-tmux-navigator
-            popup-nvim
-            vim-sleuth
-            nvim-lspconfig
-            rust-tools-nvim
-            nvim-lint
-            nvim-cmp
-            cmp-nvim-lsp
-            lsp-status-nvim
-            telescope-nvim
-            nvim-treesitter.withAllGrammars
-            sweetie-nvim
-            vim-nix
-            csharpls-extended-lsp-nvim
-          ];
-          opt = [];
-        };
-      };
-    };
   };
 
   environment.etc."gdb/gdbinit".source = ./dotfiles/gdb-init.gdb;