move neovim to module

This commit is contained in:
Noah Masur 2022-04-28 19:11:33 -04:00
parent 80209f3a4c
commit 4ccbd8b393
4 changed files with 33 additions and 22 deletions

View File

@ -38,6 +38,7 @@
./nixos/home.nix ./nixos/home.nix
./modules/applications/firefox.nix ./modules/applications/firefox.nix
./modules/shell/fish.nix ./modules/shell/fish.nix
./modules/editor/neovim.nix
./modules/applications/alacritty.nix ./modules/applications/alacritty.nix
]; ];
}; };

12
modules/editor/neovim.nix Normal file
View File

@ -0,0 +1,12 @@
{ config, pkgs, ... }: {
home.packages = with pkgs; [
neovim
gcc # for tree-sitter
];
xdg.configFile = { "nvim/init.lua".source = ../../nvim.configlink/init.lua; };
programs.git.extraConfig.core.editor = "nvim";
}

View File

@ -126,4 +126,24 @@
shellAliases = { }; shellAliases = { };
shellInit = ""; shellInit = "";
}; };
programs.starship = {
enable = true;
enableFishIntegration = true;
};
programs.fzf = {
enable = true;
enableFishIntegration = true;
};
programs.zoxide = {
enable = true;
enableFishIntegration = true;
};
xdg.configFile = {
"starship.toml".source = ../../starship/starship.toml.configlink;
"fish/functions".source = ../../fish.configlink/functions;
};
} }

View File

@ -34,7 +34,6 @@ in {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Applications # Applications
neovim
_1password-gui _1password-gui
discord discord
# neomutt # neomutt
@ -46,8 +45,6 @@ in {
# Utilities # Utilities
unzip unzip
gcc # for tree-sitter
starship
rsync rsync
fzf fzf
ripgrep ripgrep
@ -80,26 +77,8 @@ in {
NOTES_PATH = "${notes_path}"; NOTES_PATH = "${notes_path}";
}; };
programs.starship = {
enable = true;
enableFishIntegration = true;
};
programs.fzf = {
enable = true;
enableFishIntegration = true;
};
programs.zoxide = {
enable = true;
enableFishIntegration = true;
};
# Other configs # Other configs
xdg.configFile = { xdg.configFile = {
"starship.toml".source = ../starship/starship.toml.configlink;
"nvim/init.lua".source = ../nvim.configlink/init.lua;
"fish/functions".source = ../fish.configlink/functions;
"awesome/rc.lua".source = ./awesomerc.lua; "awesome/rc.lua".source = ./awesomerc.lua;
"qtile/config.py".source = ./qtile.py; "qtile/config.py".source = ./qtile.py;
"direnvrc".text = "source $HOME/.nix-profile/share/nix-direnv/direnvrc"; "direnvrc".text = "source $HOME/.nix-profile/share/nix-direnv/direnvrc";
@ -121,7 +100,6 @@ in {
userName = "${name}"; userName = "${name}";
userEmail = "7386960+nmasur@users.noreply.github.com"; userEmail = "7386960+nmasur@users.noreply.github.com";
extraConfig = { extraConfig = {
core = { editor = "nvim"; };
pager = { branch = "false"; }; pager = { branch = "false"; };
safe = { directory = "${dotfiles}"; }; safe = { directory = "${dotfiles}"; };
}; };