From 589e5de4c9669bf3974b1746672186af2d071588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= <mike@c2yz.com>
Date: Sat, 28 Dec 2024 13:02:59 +0100
Subject: [PATCH] feat: latest dwm merge

---
 home/dwm/.xinitrc         | 2 +-
 home/dwm/bar.sh           | 2 +-
 home/dwm/default.nix      | 3 +++
 hosts/default.nix         | 2 +-
 hosts/modules/xserver.nix | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 home/dwm/bar.sh

diff --git a/home/dwm/.xinitrc b/home/dwm/.xinitrc
index 5b10dde..bbaec32 100644
--- a/home/dwm/.xinitrc
+++ b/home/dwm/.xinitrc
@@ -126,7 +126,7 @@ flameshot &
 #hash dockd && dockd --daemon &
 
 # status bar
-bash bar.sh & disown
+bash $HOME/.config/bar.sh & disown
 
 dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY
 
diff --git a/home/dwm/bar.sh b/home/dwm/bar.sh
old mode 100644
new mode 100755
index 79147c1..17f7055
--- a/home/dwm/bar.sh
+++ b/home/dwm/bar.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function lighten_color() {
   offset=20
diff --git a/home/dwm/default.nix b/home/dwm/default.nix
index 96ca659..38c57f3 100644
--- a/home/dwm/default.nix
+++ b/home/dwm/default.nix
@@ -76,6 +76,9 @@
     ".config/picom/black_to_transparent.frag" = {
       source = ./black_to_transparent.frag;
     };
+    ".config/bar.sh" = {
+      source = ./bar.sh;
+    };
     # ".Xresources" = {
     #   text = ''
     #     Xcursor.theme: "Bibata-Modern-Classic"
diff --git a/hosts/default.nix b/hosts/default.nix
index b5d4432..cb11a98 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -13,7 +13,7 @@
         ./modules/development.nix
         ./modules/fstrim.nix
         ./modules/gaming.nix
-        ./modules/greetd.nix
+        # ./modules/greetd.nix
         ./modules/gsettings.nix
         # ./modules/kde.nix
         # ./modules/lanzaboot.nix
diff --git a/hosts/modules/xserver.nix b/hosts/modules/xserver.nix
index 89fcf84..66b0e31 100644
--- a/hosts/modules/xserver.nix
+++ b/hosts/modules/xserver.nix
@@ -79,7 +79,7 @@
             owner = "eRgo35";
             repo = "dwm";
             rev = "main";
-            hash = "sha256-eke33OtxUE4sObWCFEvjLZmG1Be1SWZs0Xygr++V/wc=";
+            hash = "sha256-jTjyai7qLs9v6PnWhLUgM+OC8Kq3VXrMhoIZhyY0JbA=";
           };
         };
       };