working flake build of neovim

This commit is contained in:
Noah Masur 2022-11-29 20:40:15 -07:00
parent dfacb580ae
commit b258a40181
2 changed files with 33 additions and 25 deletions

View File

@ -1,4 +1,4 @@
{ inputs, globals, ... }: { inputs, globals, overlays, ... }:
with inputs; with inputs;
@ -22,7 +22,7 @@ darwin.lib.darwinSystem {
}; };
mailUser = globals.user; mailUser = globals.user;
networking.hostName = "noah-masur-mac"; 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 # Set registry to flake packages, used for nix X commands
nix.registry.nixpkgs.flake = nixpkgs; nix.registry.nixpkgs.flake = nixpkgs;
} }

View File

@ -1,30 +1,38 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }:
home-manager.users.${config.user} = { let
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'";
};
};
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 # # Used for icons in Vim
# fonts.fonts = with pkgs; [ nerdfonts ]; # fonts.fonts = with pkgs; [ nerdfonts ];