feat: move nvim.nix in common

This commit is contained in:
matt1432 2023-10-15 14:30:30 -04:00
parent fe5efac384
commit fa6be53b31
5 changed files with 17 additions and 5 deletions

View file

@ -1,4 +1,4 @@
({ nixpkgs, ... }: { ({ nixpkgs, home-manager, lib, ... }: {
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_CA.UTF-8"; i18n.defaultLocale = "en_CA.UTF-8";
console = { console = {
@ -24,6 +24,18 @@
}; };
}; };
home-manager.users = let
default = {
imports = [
./modules/neovim/nvim.nix
];
home.stateVersion = lib.mkDefault "23.05";
};
in {
root = default;
matt = default;
};
imports = [ imports = [
./overlays/list.nix ./overlays/list.nix
]; ];

View file

@ -1,3 +1,5 @@
# Home-manager module
{ pkgs, lib, ... }: let { pkgs, lib, ... }: let
# installs a vim plugin from git with a given tag / branch # installs a vim plugin from git with a given tag / branch
plugin = owner: repo: rev: hash: pkgs.vimUtils.buildVimPlugin { plugin = owner: repo: rev: hash: pkgs.vimUtils.buildVimPlugin {
@ -23,10 +25,10 @@ in
package = pkgs.neovim-nightly; package = pkgs.neovim-nightly;
extraConfig = builtins.concatStringsSep "\n" [ extraConfig = builtins.concatStringsSep "\n" [
(lib.strings.fileContents ../config/nvim/base.vim) (lib.strings.fileContents ./config/base.vim)
'' ''
lua << EOF lua << EOF
${lib.strings.fileContents ../config/nvim/config.lua} ${lib.strings.fileContents ./config/config.lua}
EOF EOF
'' ''
]; ];

View file

@ -22,7 +22,6 @@
root = { root = {
imports = [ imports = [
./bashdots.nix ./bashdots.nix
./nvim.nix
]; ];
home.stateVersion = "23.05"; home.stateVersion = "23.05";
@ -38,7 +37,6 @@
./bashdots.nix ./bashdots.nix
./dotfiles.nix ./dotfiles.nix
./packages.nix ./packages.nix
./nvim.nix
./firefox/main.nix ./firefox/main.nix
]; ];