From b258a40181cc5eaaa92098c02907e2903febe5c6 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 29 Nov 2022 20:40:15 -0700
Subject: [PATCH] working flake build of neovim

---
 hosts/macbook/default.nix  |  4 +--
 modules/neovim/default.nix | 54 ++++++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix
index d3101d9..d350cc6 100644
--- a/hosts/macbook/default.nix
+++ b/hosts/macbook/default.nix
@@ -1,4 +1,4 @@
-{ inputs, globals, ... }:
+{ inputs, globals, overlays, ... }:
 
 with inputs;
 
@@ -22,7 +22,7 @@ darwin.lib.darwinSystem {
       };
       mailUser = globals.user;
       networking.hostName = "noah-masur-mac";
-      nixpkgs.overlays = [ firefox-darwin.overlay ];
+      nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
     }
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 50dffdf..c435342 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -1,30 +1,38 @@
-{ config, pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }:
 
-  home-manager.users.${config.user} = {
-
-    home.packages = [
-      (import ./package {
-        inherit pkgs;
-        colors = import config.theme.colors.neovimConfig { inherit pkgs; };
-      })
-    ];
-
-    programs.git.extraConfig.core.editor = "nvim";
-    home.sessionVariables = {
-      EDITOR = "nvim";
-      MANPAGER = "nvim +Man!";
-    };
-    programs.fish = {
-      shellAliases = { vim = "nvim"; };
-      shellAbbrs = {
-        v = lib.mkForce "nvim";
-        vl = lib.mkForce "vim -c 'normal! `0' -c 'bdelete 1'";
-        vll = "nvim -c 'Telescope oldfiles'";
-      };
-    };
+let
 
+  neovim = import ./package {
+    inherit pkgs;
+    colors = import config.theme.colors.neovimConfig { inherit pkgs; };
   };
 
+in {
+
+  home-manager.users.${config.user} =
+
+    {
+
+      home.packages = [ neovim ];
+
+      programs.git.extraConfig.core.editor = "nvim";
+      home.sessionVariables = {
+        EDITOR = "nvim";
+        MANPAGER = "nvim +Man!";
+      };
+      programs.fish = {
+        shellAliases = { vim = "nvim"; };
+        shellAbbrs = {
+          v = lib.mkForce "nvim";
+          vl = lib.mkForce "nvim -c 'normal! `0' -c 'bdelete 1'";
+          vll = "nvim -c 'Telescope oldfiles'";
+        };
+      };
+      programs.kitty.settings.scrollback_pager = lib.mkForce ''
+        ${neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
+
+    };
+
   # # Used for icons in Vim
   # fonts.fonts = with pkgs; [ nerdfonts ];