From da034c3c23a7779006443f032f3909e86d23a0ee Mon Sep 17 00:00:00 2001
From: sinanmohd <sinan@sinanmohd.com>
Date: Tue, 29 Aug 2023 12:43:19 +0530
Subject: repo: clean up

---
 configuration.nix   | 22 ++++++++--------------
 modules/wayland.nix |  5 ++++-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 922b034..512c5b2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, options, ... }:
+{ pkgs, lib, ... }:
 
 let
   user = "sinan";
@@ -72,23 +72,17 @@ in
     ];
   };
   system.stateVersion = "23.05";
-  services.dbus.implementation = "broker";
 
   # nix
-  nix = {
-    settings.experimental-features = [
+  nix.settings.experimental-features = [
       "nix-command"
       "flakes"
-    ];
-  };
-  nixpkgs.overlays = with builtins;
-    if pathExists ./overlays then
-      map
-        (overlay: import ./overlays/${overlay})
-        (attrNames (readDir ./overlays))
-    else
-      options.nixpkgs.overlays.default
-  ;
+  ];
+  nixpkgs.overlays = with builtins; lib.mkIf (pathExists ./overlays) (
+    map
+      (overlay: import ./overlays/${overlay})
+      (attrNames (readDir ./overlays))
+  );
 
   # programs
   programs = {
diff --git a/modules/wayland.nix b/modules/wayland.nix
index 4ae34e1..0c622c7 100644
--- a/modules/wayland.nix
+++ b/modules/wayland.nix
@@ -51,7 +51,10 @@
   # misc
   services = {
     seatd.enable = true;
-    dbus.enable = true;
+    dbus = {
+      implementation = "broker";
+      enable = true;
+    };
   };
 
   programs = {
-- 
cgit v1.2.3