diff --git a/configs/home-manager/foo-dogsquared/default.nix b/configs/home-manager/foo-dogsquared/default.nix
index 967e4795..325344ce 100644
--- a/configs/home-manager/foo-dogsquared/default.nix
+++ b/configs/home-manager/foo-dogsquared/default.nix
@@ -123,7 +123,7 @@ in
     diff = pkgs.diffoscope;
     pager = config.programs.bat.package;
     editor =
-      if userCfg.programs.nixvim.enable then
+      if config.programs.nixvim.enable then
         config.programs.nixvim.finalPackage
       else
         config.programs.neovim.package;
diff --git a/configs/home-manager/foo-dogsquared/modules/dotfiles.nix b/configs/home-manager/foo-dogsquared/modules/dotfiles.nix
index 73a75381..daa49150 100644
--- a/configs/home-manager/foo-dogsquared/modules/dotfiles.nix
+++ b/configs/home-manager/foo-dogsquared/modules/dotfiles.nix
@@ -43,16 +43,22 @@ in
 
     # Comes with a heavy assumption that the Neovim configuration found in this
     # home-manager environment will not write to the XDG config directory.
-    (lib.mkIf (!config.programs.nixvim.enable) {
+    (lib.mkIf (config.programs.neovim.enable) {
       xdg.configFile.nvim.source = getDotfiles "nvim";
 
       programs.neovim.extraPackages = with pkgs; [
         luarocks
         shfmt
+        cmake
+
+        # Just assume that there is no clipboard thingy that is already managed
+        # within this home-manager configuration.
+        wl-clipboard
+        xclip
       ];
     })
 
-    (lib.mkIf userCfg.programs.nushell.enable {
+    (lib.mkIf config.programs.nushell.enable {
       home.file."${config.xdg.dataHome}/nushell/vendor/autoload".source = getDotfiles "nu/autoload";
     })
   ]);