diff --git a/README.md b/README.md
index b672fb2ab30644c6444dea519cc0fde7a6e0ce8f..84a09e56324985bf9801c324cc716f4532266117 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,5 @@ # jolheiser NUR
 
 |Package|Version|
 |-------|-------|
-|[godap](https://github.com/Macmod/godap)|`2.3.0`|
 |[prospect-mail](https://github.com/julian-alarcon/prospect-mail)|`0a85d2a0136fc0d3312c3ba59d8e5d864e601db5`|
 
diff --git a/default.nix b/default.nix
index 202f43ffe05422a7eeec41cba1d9701921db4bbd..7fdbe028b1a4c0ac8f835beb22a7049dbd13a28c 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,17 @@
+# This file describes your repository contents.
+# It should return a set of nix derivations
+# and optionally the special attributes `lib`, `modules` and `overlays`.
+# It should NOT import <nixpkgs>. Instead, you should take pkgs as an argument.
+# Having pkgs default to <nixpkgs> is fine though, and it lets you use short
+# commands such as:
+{pkgs ? import <nixpkgs> {}}: {
 {pkgs ? import <nixpkgs> {}}: {
+{pkgs ? import <nixpkgs> {}}: {
+{pkgs ? import <nixpkgs> {}}: {
   godap = pkgs.callPackage ./pkgs/godap {};
+  lib = import ./lib {inherit pkgs;}; # functions
+  modules = import ./modules; # NixOS modules
+  overlays = import ./overlays; # nixpkgs overlays
+
   prospect-mail = pkgs.callPackage ./pkgs/prospect-mail {};
 }
diff --git a/flake.lock b/flake.lock
index a32527e8e5f1c3f6f73753a0c828938103d1bb20..4fb6aebb98cfed14e6c5d1d83f2ed7fcc5d74ce3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,12 @@ {
   "nodes": {
     "nixpkgs": {
       "locked": {
+        "lastModified": 1694593561,
+  "nodes": {
         "lastModified": 1710889954,
-        "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b",
+        "rev": "1697b7d480449b01111e352021f46e5879e47643",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/godap/default.nix b/pkgs/godap/default.nix
deleted file mode 100644
index 2563baff6df7e2bf3b2e1aaa68276d6dfbcf0fca..0000000000000000000000000000000000000000
--- a/pkgs/godap/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  lib,
-  ...
-}:
-buildGoModule rec {
-  pname = "godap";
-  version = "2.3.0";
-
-  src = fetchFromGitHub {
-    owner = "Macmod";
-    repo = "godap";
-    rev = "v${version}";
-    sha256 = "sha256-lEiJbeqIzvctFmC9OriO64lt+pZkxZCPSW56H7vgBBo=";
-  };
-
-  vendorHash = "sha256-m536HECHpHRo/KPR/qhF40v3TsuTW3wghZu2pBYCJcQ=";
-
-  meta = with lib; {
-    description = "A complete TUI for LDAP.";
-    homepage = "https://github.com/Macmod/godap";
-    license = licenses.mit;
-  };
-}