From 150fa1c9c5385c2c567959be18b0f5b6b467fa63 Mon Sep 17 00:00:00 2001
From: Sakooooo <78461130+Sakooooo@users.noreply.github.com>
Date: Thu, 3 Aug 2023 16:22:07 +0300
Subject: [PATCH] cat

---
 hosts/sakotop/configuration.nix   |  6 ++----
 modules/desktop/default.nix       |  1 +
 modules/desktop/dwm/default.nix   |  3 ---
 modules/desktop/dwm/dwmblocks.nix | 16 ----------------
 modules/desktop/picom/default.nix | 16 ++++++++++++++++
 overlays/default.nix              |  3 ---
 6 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 modules/desktop/dwm/dwmblocks.nix
 create mode 100644 modules/desktop/picom/default.nix

diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix
index 829fea52..1ac96a30 100644
--- a/hosts/sakotop/configuration.nix
+++ b/hosts/sakotop/configuration.nix
@@ -16,10 +16,8 @@
       kitty.enable = true;
       xmonad.enable = false;
       awesome.enable = false;
-      dwm = {
-        enable = true;
-        dwmblocks.enable = false;
-      };
+      dwm.enable = true;
+      picom.enable = true;
       gnome.enable =  false;
       dunst.enable = true;
       browsers = {
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index b8f72f76..00ed1266 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -17,5 +17,6 @@
     ./chat
     ./media
     ./dunst
+    ./picom
   ];
 }
diff --git a/modules/desktop/dwm/default.nix b/modules/desktop/dwm/default.nix
index b6fa9985..438253fd 100644
--- a/modules/desktop/dwm/default.nix
+++ b/modules/desktop/dwm/default.nix
@@ -4,9 +4,6 @@ let
   cfg = config.modules.desktop.dwm;
 in
 {
-  imports = [
-    ./dwmblocks.nix
-  ];
   options.modules.desktop.dwm = {
     enable = mkEnableOption false;
   };
diff --git a/modules/desktop/dwm/dwmblocks.nix b/modules/desktop/dwm/dwmblocks.nix
deleted file mode 100644
index 3e70c7f5..00000000
--- a/modules/desktop/dwm/dwmblocks.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ outputs, options, config, lib, pkgs, ...}:
-with lib;
-let
-  cfg = config.modules.desktop.dwm.dwmblocks;
-in
-{
-  options.modules.desktop.dwm.dwmblocks = {
-    enable = mkEnableOption false;
-  };
-
-  config = mkIf cfg.enable {
-    users.users.sako.packages = with pkgs; [
-      dwmblocks
-    ];
-  };
-}
diff --git a/modules/desktop/picom/default.nix b/modules/desktop/picom/default.nix
new file mode 100644
index 00000000..56b41216
--- /dev/null
+++ b/modules/desktop/picom/default.nix
@@ -0,0 +1,16 @@
+{ outputs, options, config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.modules.desktop.picom;
+in
+{
+  options.modules.desktop.picom = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      picom
+    ];
+  };
+}
diff --git a/overlays/default.nix b/overlays/default.nix
index f2c8416d..2904f40a 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -22,9 +22,6 @@
     dwm = prev.dwm.overrideAttrs (old: {
        src = ../config/dwm;
     });
-    dwmblocks = prev.dwmblocks.overrideAttrs (old: {
-        src = ../config/dwmblocks;
-    });
   };
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will