From 00aecb279a14b92c1a3e2ac3af130910094b5345 Mon Sep 17 00:00:00 2001
From: Varris <varris@posteo.net>
Date: Sun, 7 Aug 2022 20:14:22 +0200
Subject: [PATCH] update

---
 flake.lock        | 24 +++++++++++++++++++----
 flake.nix         | 50 ++++++++++++++++++++++++++++++++++-------------
 user/overlays.nix | 13 ------------
 3 files changed, 56 insertions(+), 31 deletions(-)
 delete mode 100644 user/overlays.nix

diff --git a/flake.lock b/flake.lock
index 59694a2..95d8bd0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1659713809,
-        "narHash": "sha256-M4aHuXXVnfprM8xPH2lLkYkkR0fmaG5QmvIc0DT/d4E=",
+        "lastModified": 1659803779,
+        "narHash": "sha256-+5zkHlbcbFyN5f3buO1RAZ9pH1wXLxCesUJ0vFmLr9Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "93c57a988470c1948976b1bb70abbd5855c5b810",
+        "rev": "f44884060cb94240efbe55620f38a8ec8d9af601",
         "type": "github"
       },
       "original": {
@@ -36,10 +36,26 @@
         "type": "indirect"
       }
     },
+    "nur": {
+      "locked": {
+        "lastModified": 1659881187,
+        "narHash": "sha256-9QKrAdJRQlaU3nLbfNwvjwQucuy5GCRTzPH2+w6NuxM=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "9bbd8c3c689e076ef17eca0c3b2208068756fcb7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nur": "nur"
       }
     },
     "utils": {
diff --git a/flake.nix b/flake.nix
index b4c9829..3a171ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,34 +3,56 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
+
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
+    nur.url = "github:nix-community/NUR";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, ... }:
+  outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }:
     let
       system = "x86_64-linux";
 
       pkgs = import nixpkgs {
+        inherit system;
         config = { allowUnfree = true; };
+        overlays = [ self.overlays.default ];
       };
 
+
       lib = nixpkgs.lib;
 
     in
     {
-      nixosConfigurations.terra = lib.nixosSystem {
-        inherit system;
-        specialArgs = inputs;
-        modules = [
-          ./system/configuration.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.manuel = import ./user/home.nix;
-          }
-        ];
-      };
+      overlays.default =
+        (final: prev: rec {
+          nerdfonts = prev.nerdfonts.override {
+            fonts = [
+              "JetBrainsMono"
+            ];
+          };
+        });
+
+      nixosConfigurations.terra = lib.nixosSystem
+        {
+          inherit system;
+          specialArgs = inputs;
+          modules = [
+            ./system/configuration.nix
+            home-manager.nixosModules.home-manager
+            {
+              home-manager =
+                {
+                  useGlobalPkgs = true;
+                  useUserPackages = true;
+                  users.manuel = import ./user/home.nix;
+                  extraSpecialArgs = { inherit pkgs; };
+                };
+            }
+            nur.nixosModules.nur
+          ];
+        };
     };
 }
+
diff --git a/user/overlays.nix b/user/overlays.nix
deleted file mode 100644
index f69fd2c..0000000
--- a/user/overlays.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  (
-    self: super:
-      {
-        nerdfonts = super.nerdfonts.override {
-          fonts = [
-            "JetBrainsMono"
-          ];
-        };
-      }
-  )
-]
-