diff --git a/configuration-cross.nix b/configuration-cross.nix
index 7707684..4302ad4 100644
--- a/configuration-cross.nix
+++ b/configuration-cross.nix
@@ -3,6 +3,9 @@
   config = lib.mkMerge [(lib.mkIf (pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform) {
     environment.systemPackages = with pkgs; [
       meld
+      nixfmt-rfc-style
+      stdenv.cc
+      stdenv.cc.bintools  # bins but not manpages included in stdenv.cc
     ];
 
     programs.git.config.merge.tool = "meld";
@@ -45,8 +48,22 @@
     };
 
   }) (lib.mkIf (pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform) {
-      programs.vim.enable = true;
+      programs.vim = {
+        enable = true;
+        defaultEditor = true;
+        package = pkgs.vim.customize {
+          vimrcConfig.customRC = ''
+            set mouse=
+            set hlsearch
+            nnoremap <CR> :noh<CR><CR>
+          '';
+        };
+      };
       programs.git.config.core.editor = "vim";
+      environment.systemPackages = with pkgs; [
+        clang
+        bintools
+      ];
   }) ];
 
 }
diff --git a/configuration.nix b/configuration.nix
index c0c1bc3..01a2112 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,10 +32,7 @@
     fd
     curl
     btop
-    nixfmt-rfc-style
     file
-    stdenv.cc
-    stdenv.cc.bintools  # bins but not manpages included in stdenv.cc
     patchelf
 
     (python3.withPackages (p: with p; [
diff --git a/dotfiles/nvim-init.vim b/dotfiles/nvim-init.vim
index 04eecb9..731e7e4 100644
--- a/dotfiles/nvim-init.vim
+++ b/dotfiles/nvim-init.vim
@@ -21,3 +21,4 @@ filetype plugin on
 syntax on                                                                                 
                                                                                           
 nnoremap <CR> :noh<CR><CR>  
+nnoremap * :let @/='\<<C-R>=expand("<cword>")<CR>\>'<CR>:set hls<CR>
diff --git a/sites/chrysanthemum/configuration.nix b/sites/chrysanthemum/configuration.nix
index da87d5e..f2b625d 100644
--- a/sites/chrysanthemum/configuration.nix
+++ b/sites/chrysanthemum/configuration.nix
@@ -1,4 +1,7 @@
 { pkgs, lib, config, ... }:
 {
   imports = [ ./hardware-configuration.nix ];
+
+  networking.hostName = "chrysanthemum";
+  networking.hostId = "6bb591ac";
 }