From 98e8ff16b2665d06c9b572283a291119f7af246a Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sat, 24 Jul 2021 18:38:59 +0300
Subject: [PATCH] fix

---
 flake.lock | 45 ++++-----------------------------------------
 flake.nix  | 23 +++++++----------------
 2 files changed, 11 insertions(+), 57 deletions(-)

diff --git a/flake.lock b/flake.lock
index f16ed90..5040dee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -219,21 +219,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1618217525,
-        "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -241,16 +226,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1624228557,
-        "narHash": "sha256-wwOqe73BsrXfRv1PhyXQFNC8iTET50KvE/HitdkRgxs=",
+        "lastModified": 1627079826,
+        "narHash": "sha256-+Bz7GgiWMm9aTuZ0fvYp4Tc4wVaN4Z7IwFS2IMJw7XA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "35a24648d155843a4d162de98c17b1afd5db51e4",
+        "rev": "996b43973969b3453e23dd06d2fc19765fb31e9d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -309,27 +294,6 @@
         "type": "github"
       }
     },
-    "nixEvalLsp": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1624068016,
-        "narHash": "sha256-+LZZ+uwzLL8Lwj2wSuFbbcs9xiw3nLm/GudLnkV0Ubg=",
-        "owner": "aaronjanse",
-        "repo": "nix-eval-lsp",
-        "rev": "3e42793fc43cc1a2ebe0f9f857e798ae3cca16e5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aaronjanse",
-        "repo": "nix-eval-lsp",
-        "type": "github"
-      }
-    },
     "nixos": {
       "locked": {
         "lastModified": 1626852498,
@@ -487,7 +451,6 @@
         "home": "home",
         "latest": "latest",
         "naersk": "naersk_2",
-        "nixEvalLsp": "nixEvalLsp",
         "nixlib": [
           "digga",
           "nixlib"
diff --git a/flake.nix b/flake.nix
index 5f29831..bb2ecd7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
       bud.inputs.nixpkgs.follows = "nixos";
       bud.inputs.devshell.follows = "digga/devshell";
 
-      home.url = "github:nix-community/home-manager/release-21.05";
+      home.url = "github:nix-community/home-manager/master";
       home.inputs.nixpkgs.follows = "nixos";
 
       darwin.url = "github:LnL7/nix-darwin";
@@ -41,10 +41,6 @@
       nixos-hardware.url = "github:nixos/nixos-hardware";
 
       nixosPersistence.url = "github:nix-community/impermanence";
-      nixEvalLsp = {
-        url = "github:aaronjanse/nix-eval-lsp";
-        inputs.nixpkgs.follows = "nixos";
-      };
       nixpkgsWayland = {
         url = "github:colemickens/nixpkgs-wayland";
         inputs.nixpkgs.follows = "nixos";
@@ -70,7 +66,6 @@
     , agenix
     , nixosPersistence
     , nixpkgsWayland
-    , nixEvalLsp
     , nvfetcher
     , deploy
     , ...
@@ -90,6 +85,7 @@
               #agenix.overlay
               #nvfetcher.overlay
               #deploy.overlay
+              nixpkgsWayland.overlay
               ./pkgs/default.nix
             ];
           };
@@ -99,9 +95,9 @@
         lib = import ./lib { lib = digga.lib // nixos.lib; };
 
         sharedOverlays = [
-          (final: prev: {
+          (_: prev: {
             __dontExport = true;
-            lib = prev.lib.extend (lfinal: lprev: {
+            lib = prev.lib.extend (_: _: {
               our = self.lib;
             });
           })
@@ -129,7 +125,7 @@
             NixOS = { };
           };
           importables = rec {
-            profiles = digga.lib.rakeLeaves ./profiles // {
+            profiles = (digga.lib.rakeLeaves ./profiles) // {
               users = digga.lib.rakeLeaves ./users;
             };
             suites = with profiles; {
@@ -159,11 +155,6 @@
         defaultTemplate = self.templates.bud;
         templates.bud.path = ./.;
         templates.bud.description = "bud template";
-
-      }
-    //
-    {
-      budModules = { devos = import ./pkgs/bud; };
-    }
-  ;
+        budModules = { devos = import ./pkgs/bud; };
+      };
 }