From 506afc45cd00f0134d7e43d80da5d2b594617861 Mon Sep 17 00:00:00 2001
From: Jake Ginesin <jakeginesin@gmail.com>
Date: Fri, 10 Jan 2025 22:32:40 -0500
Subject: [PATCH] 188 current  2025-01-10 22:32:32  25.05.20241217.d3c42f1    
 6.6.66                          *

---
 home/programs/nvim/default.nix      | 22 +++++++++++++++++++++-
 home/programs/nvim/init.lua         |  4 ++--
 home/programs/nvim/plugins/goyo.lua |  3 +++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 home/programs/nvim/plugins/goyo.lua

diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index 98bcf7b..d59ddb1 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -1,10 +1,15 @@
+# ref: https://github.com/vimjoyer/nvim-nix-video/blob/main/home.nix
 {
   pkgs,
   lib,
   ...
 }: {
-  programs.neovim = {
+  programs.neovim = let
+    toLua = str: "lua << EOF\n${str}\nEOF\n";
+    toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n";
+  in {
     enable = true;
+
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
@@ -13,6 +18,21 @@
       ${builtins.readFile ./init.lua}
     '';
 
+    extraPackages = with pkgs; [
+      lua-language-server
+      # rnix-lsp
+
+      xclip
+      wl-clipboard
+    ];
+
+    plugins = with pkgs.vimPlugins; [
+      {
+        plugin = goyo-vim;
+        config = toLuaFile ./plugins/goyo.lua;
+      }
+    ];
+
     # extraConfig = lib.fileContents ./init.vim;
   };
 }
diff --git a/home/programs/nvim/init.lua b/home/programs/nvim/init.lua
index 82a11c9..42e8bab 100644
--- a/home/programs/nvim/init.lua
+++ b/home/programs/nvim/init.lua
@@ -122,8 +122,8 @@ vim.api.nvim_set_keymap("n", "<C-t>", ":term<CR>A", { noremap = true, silent = f
 vim.api.nvim_set_keymap("t", "<Esc>", [[<C-\><C-n>]], { noremap = true })
 
 -- "Focus" commands that rely on the Goyo plugin
-vim.api.nvim_set_keymap("n", "<C-a>z", ":Goyo 80<CR>", opts)
-vim.api.nvim_set_keymap("n", "<C-a>q", ":Goyo!<CR>", opts)
+-- vim.api.nvim_set_keymap("n", "<C-a>z", ":Goyo 80<CR>", opts)
+-- vim.api.nvim_set_keymap("n", "<C-a>q", ":Goyo!<CR>", opts)
 
 -- Movements in visual mode
 vim.api.nvim_set_keymap("x", "<C-h>", "b", { noremap = true })
diff --git a/home/programs/nvim/plugins/goyo.lua b/home/programs/nvim/plugins/goyo.lua
new file mode 100644
index 0000000..09ee362
--- /dev/null
+++ b/home/programs/nvim/plugins/goyo.lua
@@ -0,0 +1,3 @@
+-- "Focus" commands that rely on the Goyo plugin
+vim.api.nvim_set_keymap("n", "<C-a>z", ":Goyo 80<CR>", opts)
+vim.api.nvim_set_keymap("n", "<C-a>q", ":Goyo!<CR>", opts)