From f570b44606fa06be0bfb0baa70822ae51404efb9 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 7 Aug 2023 09:43:48 +0100
Subject: [PATCH] refactor(flake): move nvim config to a package
Add it as a package instead of symlinking it into the `~/.config.nvim`
directory.
---
flake.nix | 7 ++++++-
home-manager/modules/common.nix | 7 ++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/flake.nix b/flake.nix
index 9599441d..deb2493e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,12 @@
systems = [ "x86_64-linux" ];
perSystem = { pkgs, self', nixpkgs, ... }: {
- packages.default = self'.packages.activate;
+ packages = {
+ opdavies-nvim = pkgs.vimUtils.buildVimPlugin {
+ name = "opdavies-nvim";
+ src = ./config/neovim;
+ };
+ };
formatter = pkgs.nixpkgs-fmt;
};
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index 65ef55f6..2ba8d00e 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -203,6 +203,8 @@ in
# Themes
vimPlugins.catppuccin-nvim
+
+ inputs.self.packages.${pkgs.system}.opdavies-nvim
];
extraPackages = with pkgs; [
@@ -254,11 +256,6 @@ in
recursive = true;
};
- xdg.configFile.nvim = {
- source = ../../config/neovim;
- recursive = true;
- };
-
xdg.configFile.phpactor = {
source = ../../config/phpactor;
recursive = true;