From fc1084b0caab6f4cca9ac3cce6f48e7dcd633280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Fri, 30 Dec 2022 18:58:13 +0100
Subject: [PATCH] improve code quality

---
 flake.nix                    | 20 +++++++++++++++++---
 modules/profiles/desktop.nix |  1 -
 overlays/default.nix         |  7 +++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8710075..1c93a22 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,20 +61,32 @@
     utils.lib.mkFlake {
       inherit self inputs;
 
+      supportedSystems = [ "x86_64-linux" ];
+
       channelsConfig.allowUnfree = true;
 
       ################
       ### Overlays ###
       ################
 
-      overlays.default = import ./overlays { inherit inputs; };
+      overlay = import ./overlays { inherit inputs; };
+
       channels.nixpkgs.overlaysBuilder = channels: [
-        self.overlays.default
-        inputs.utils.overlay
+        self.overlay
+        inputs.agenix.overlay
         inputs.emacs-overlay.overlay
         inputs.howdy.overlays.default
+        inputs.hyprland.overlays.default
+        inputs.hyprpaper.overlays.default
+        inputs.utils.overlay
       ];
 
+      # overlays = utils.lib.exportOverlays {
+      #   inherit (self) pkgs inputs;
+      # };
+
+      overlays.default = self.overlay;
+
       ###############
       ### Modules ###
       ###############
@@ -139,6 +151,8 @@
               shellcheck.enable = true;
             };
           };
+
+          packages = utils.lib.exportPackages self.overlays channels;
         };
     };
 }
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index 835e14b..cc97e51 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -95,7 +95,6 @@ with lib; {
       mullvad.enable = true;
       openconnect.enable = true;
       openvpn.enable = true;
-      picom.enable = true;
       printing.enable = true;
       redshift.enable = true;
     };
diff --git a/overlays/default.nix b/overlays/default.nix
index f9685ad..071a899 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,9 +1,6 @@
 { inputs }: final: prev: {
-  nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}";
-  agenix = inputs.agenix.defaultPackage."${prev.system}";
-
   logseq-wayland = prev.symlinkJoin {
-    name = "logseq";
+    name = "logseq-wayland";
     paths = [ prev.logseq ];
     nativeBuildInputs = [ prev.makeWrapper ];
     postBuild = ''
@@ -13,11 +10,13 @@
   };
 
   waybar-hyprland = prev.waybar.overrideAttrs (old: {
+    pname = "${old.pname}-hyprland";
     postPatch = old.postPatch or "" + ''
       sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp
     '';
     mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ];
   });
+
   master = import inputs.master {
     inherit (prev) system;
     config.allowUnfree = true;