From dac6fbb25227f69729075af3ab295618a7d4c7d0 Mon Sep 17 00:00:00 2001
From: MFlossmann <michael.flossmann@posteo.net>
Date: Wed, 3 Jul 2024 02:27:30 +0200
Subject: [PATCH] Use my own nixvim config

---
 flake.nix                     |  2 --
 helperLib/default.nix         |  4 ++++
 hosts/default/home.nix        |  4 ++--
 hosts/remus/home.nix          |  7 +++++--
 modules/home/bundles/core.nix |  4 ++--
 modules/home/default.nix      |  1 +
 modules/nixOS/default.nix     |  8 +++++++-
 overlays/additions.nix        |  4 ++++
 overlays/default.nix          | 14 ++++++++------
 overlays/modifications.nix    | 15 +++++++++++++++
 10 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 overlays/additions.nix
 create mode 100644 overlays/modifications.nix

diff --git a/flake.nix b/flake.nix
index 601623b..c09e6d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,8 +44,6 @@
 
     formatter = helperLib.forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
 
-    overlays = import ./overlays {inherit inputs;};
-
     nixosConfigurations = {
       remus = helperLib.mkSystem ./hosts/remus/configuration.nix;
     };
diff --git a/helperLib/default.nix b/helperLib/default.nix
index 655f401..029bef1 100644
--- a/helperLib/default.nix
+++ b/helperLib/default.nix
@@ -32,6 +32,8 @@ in rec {
         }: {nixpkgs.overlays = [overlay-stable];})
         config
         outputs.nixosModules.default
+
+        (import ../overlays)
       ];
     };
 
@@ -49,6 +51,8 @@ in rec {
         }: {nixpkgs.overlays = [overlay-stable];})
         config
         outputs.homeManagerModules.default
+
+        (import ../overlays)
       ];
     };
 
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index 29ef1dd..cd439f2 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -41,8 +41,8 @@
 
   programs.zsh.enable = true;
 
-  programs.neovim.enable = true;
-  programs.neovim.defaultEditor = true;
+  programs.neovim.enable = false;
+  programs.neovim.defaultEditor = false;
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
diff --git a/hosts/remus/home.nix b/hosts/remus/home.nix
index 3624319..9761719 100644
--- a/hosts/remus/home.nix
+++ b/hosts/remus/home.nix
@@ -1,12 +1,14 @@
 {
   config,
   pkgs,
+  inputs,
   ...
 }: {
   # home.username = "prunebutt";
   # home.homeDirectory = "/home/prunebutt";
   home = let
     user = "prunebutt";
+    _inputs = inputs;
   in {
     username = "${user}";
     homeDirectory = "/home/${user}";
@@ -17,7 +19,7 @@
 
     # The home.packages option allows you to install Nix packages into your
     # environment.
-    packages = with pkgs; [
+    packages = [
       # # It is sometimes useful to fine-tune packages, for example, by applying
       # # overrides. You can do that directly here, just don't forget the
       # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
@@ -32,7 +34,8 @@
       # '')
 
       ## GNOME
-      gnomeExtensions.gsconnect
+
+      inputs.nixvim-config.packages.${pkgs.system}.default 
     ];
   };
 
diff --git a/modules/home/bundles/core.nix b/modules/home/bundles/core.nix
index e69fc43..667993a 100644
--- a/modules/home/bundles/core.nix
+++ b/modules/home/bundles/core.nix
@@ -50,6 +50,6 @@
     EDITOR = "nvim";
   };
 
-  programs.neovim.enable = true;
-  programs.neovim.defaultEditor = true;
+  programs.neovim.enable = false;
+  programs.neovim.defaultEditor = false;
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
index c0fbcf9..b3f7837 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -2,6 +2,7 @@
   pkgs,
   system,
   inputs,
+  outputs,
   config,
   lib,
   helperLib,
diff --git a/modules/nixOS/default.nix b/modules/nixOS/default.nix
index fabed4e..f723602 100644
--- a/modules/nixOS/default.nix
+++ b/modules/nixOS/default.nix
@@ -70,7 +70,13 @@ in {
   config = {
     nix.settings.experimental-features = ["nix-command" "flakes"];
     programs.nix-ld.enable = true;
-    nixpkgs.config.allowUnfree = lib.mkDefault true;
+    nixpkgs = {
+      config.allowUnfree = lib.mkDefault true;
+      # overlays = [
+      #   outputs.overlays.additions
+      #   outputs.overlays.modifications
+      # ];
+    };
 
     myNixOS = {
       bundles.core.enable = lib.mkDefault true;
diff --git a/overlays/additions.nix b/overlays/additions.nix
new file mode 100644
index 0000000..2851c46
--- /dev/null
+++ b/overlays/additions.nix
@@ -0,0 +1,4 @@
+# This one brings our custom packages from the `pkgs` directory
+_:{
+ nixpkgs.overlays = final: prev: import ../pkgs final.pkgs;
+}
diff --git a/overlays/default.nix b/overlays/default.nix
index 1333740..f9e0e7c 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,12 +1,14 @@
 {inputs, ...}: {
-  # This one brings our custom packages from the `pkgs` directory
-  additions = final: _prev: import ../pkgs final.pkgs;
+  nixpkgs.overlays = [
+    (final: prev: import ../pkgs final.pkgs)
 
-  # Any custom modifications
-  # https://nixos.wiki/wiki/Overlays
-  modifications = final: prev: {
+    # Any custom modifications
+    # https://nixos.wiki/wiki/Overlays
+    (final: prev: {
+      nixvim = builtins.trace "foobarzelidumm" inputs.nixvim-config.packages.${prev.system}.default;
+    })
     # example = prev.example.overrideAttrs (oldAttrs: rec {
     # ...
     # });
-  };
+  ];
 }
diff --git a/overlays/modifications.nix b/overlays/modifications.nix
new file mode 100644
index 0000000..50b7bba
--- /dev/null
+++ b/overlays/modifications.nix
@@ -0,0 +1,15 @@
+# Any custom modifications
+# https://nixos.wiki/wiki/Overlays
+
+{inputs, ...}: {
+  nixpkgs.overlays = [
+    (final: prev: {
+      nixvim = inputs.nixvim-config.packages.${prev.system}.default;
+
+      testitest = builtins.trace "foobarbaz" "testitest";
+      # example = prev.example.overrideAttrs (oldAttrs: rec {
+      # ...
+      # });
+    })
+  ];
+}