From 478081af928e1557b325f4a4cbd5b67f079660d2 Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <54011232+arpitchakladar@users.noreply.github.com>
Date: Wed, 25 Sep 2024 19:41:02 +0530
Subject: Adding nnn file manager.

Adding bspwm bindings to sxhkd only if the module is enabled.
---
 modules/desktop/display-server/x11/xinit/default.nix | 14 ++++++++++----
 modules/desktop/display-server/x11/xinit/xinitrc     |  4 ----
 2 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 modules/desktop/display-server/x11/xinit/xinitrc

(limited to 'modules/desktop/display-server/x11/xinit')

diff --git a/modules/desktop/display-server/x11/xinit/default.nix b/modules/desktop/display-server/x11/xinit/default.nix
index a064f36..e3f10f1 100644
--- a/modules/desktop/display-server/x11/xinit/default.nix
+++ b/modules/desktop/display-server/x11/xinit/default.nix
@@ -1,14 +1,20 @@
-{ lib, config, ... }:
+{ lib, config, pkgs, ... }:
 
 {
-	options = {
-		desktop.display-server.x11.xinit.enable = lib.mkEnableOption "Enables xinit.";
+	options.desktop.display-server.x11.xinit = {
+		enable = lib.mkEnableOption "Enables xinit.";
 	};
 
 	config = lib.mkIf config.desktop.display-server.x11.xinit.enable {
 		home.file.".xinitrc" = {
-			source = ./xinitrc;
 			executable = true;
+			source = pkgs.writeText ".xinitrc"
+''
+#!/bin/sh
+${if config.desktop.status-bar.polybar.enable then "polybar main &" else ""}
+${if config.desktop.window-manager.sxhkd.enable then "sxhkd &" else ""}
+exec ${config.desktop.window-manager.default}
+'';
 		};
 	};
 }
diff --git a/modules/desktop/display-server/x11/xinit/xinitrc b/modules/desktop/display-server/x11/xinit/xinitrc
deleted file mode 100644
index 2ac4486..0000000
--- a/modules/desktop/display-server/x11/xinit/xinitrc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-polybar main &
-sxhkd &
-exec bspwm
-- 
cgit v1.2.3