Using desktop background.

Using window transparency with picom.
Using alacritty because kitty is having problems with colors when picom is running.

10 files changed, 40 insertions, 162 deletions

diff --git a/modules/desktop/application-launcher/fzf/default.nix b/modules/desktop/application-launcher/fzf/default.nix
index 2047919..6a1c4a6 100644
--- a/modules/desktop/application-launcher/fzf/default.nix
+++ b/modules/desktop/application-launcher/fzf/default.nix
@@ -16,7 +16,7 @@
 		desktop.application-launcher.default = lib.mkDefault "fzf";
 		desktop.application-launcher.command =
 			if config.desktop.application-launcher.default == "fzf" then
-				lib.mkForce "${config.desktop.terminal.command} --title 'Application Launcher' --class floating-termial -e ${(pkgs.writeShellScript "fzf-launch.sh" (builtins.readFile ./launch.sh))}"
+				lib.mkForce "${config.tools.terminal.command} --title 'Application Launcher' --class floating-termial -e ${(pkgs.writeShellScript "fzf-launch.sh" (builtins.readFile ./launch.sh))}"
 			else "";
 	};
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 43ef865..e015ea9 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -5,7 +5,6 @@
 		./application-launcher
 		./display-server
 		./status-bar
-		./terminal
 		./window-manager
 		./xdg-portal
 	];
diff --git a/modules/desktop/display-server/compositor/default.nix b/modules/desktop/display-server/compositor/default.nix
new file mode 100644
index 0000000..ae5fc6d
--- /dev/null
+++ b/modules/desktop/display-server/compositor/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+	imports = [
+		./picom
+	];
+}
diff --git a/modules/desktop/display-server/compositor/picom/default.nix b/modules/desktop/display-server/compositor/picom/default.nix
new file mode 100644
index 0000000..f138793
--- /dev/null
+++ b/modules/desktop/display-server/compositor/picom/default.nix
@@ -0,0 +1,23 @@
+{ lib, config, ... }:
+
+{
+	options.desktop.display-server.compositor.picom = {
+		enable = lib.mkEnableOption "Enables picom.";
+	};
+
+	config = lib.mkIf config.desktop.display-server.compositor.picom.enable {
+		services.picom.enable = true;
+		services.picom.backend = "xrender";
+		services.picom.fade = false;
+		services.picom.shadow = false;
+		services.picom.settings = {
+			blur-background = false;
+			background = "#000000";
+		};
+		services.picom.activeOpacity = 0.8;
+		services.picom.inactiveOpacity = 0.8;
+		services.picom.opacityRules = [
+			"70:class_g = 'Polybar'"   # 70% opacity for Polybar
+		];
+	};
+}
diff --git a/modules/desktop/display-server/default.nix b/modules/desktop/display-server/default.nix
index f81358d..5062f7c 100644
--- a/modules/desktop/display-server/default.nix
+++ b/modules/desktop/display-server/default.nix
@@ -2,6 +2,7 @@
 
 {
 	imports = [
+		./compositor
 		./x11
 	];
 }
diff --git a/modules/desktop/display-server/x11/xinit/default.nix b/modules/desktop/display-server/x11/xinit/default.nix
index b665e0b..9bf7de3 100644
--- a/modules/desktop/display-server/x11/xinit/default.nix
+++ b/modules/desktop/display-server/x11/xinit/default.nix
@@ -12,6 +12,12 @@
 ''
 #!/bin/sh
 xsetroot -solid "${config.scheme.withHashtag.base00}"
+${if config.desktop.display-server.compositor.picom.enable then
+	"picom &"
+else ""}
+${if config.tools.viewer.feh.enable then
+	"feh --bg-scale ${../../../../../assets/background.png}"
+else ""}
 ${if config.desktop.status-bar.polybar.enable then
 	config.desktop.status-bar.polybar.command
 else ""}
diff --git a/modules/desktop/terminal/alacritty/default.nix b/modules/desktop/terminal/alacritty/default.nix
deleted file mode 100644
index 151e098..0000000
--- a/modules/desktop/terminal/alacritty/default.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-{
-	options.desktop.terminal.alacritty = {
-		enable = lib.mkEnableOption "Enables alacritty.";
-	};
-
-	config = lib.mkIf config.desktop.terminal.alacritty.enable {
-		programs.alacritty.enable = true;
-		desktop.terminal.default = lib.mkDefault "alacritty";
-		desktop.terminal.command =
-			if config.desktop.terminal.default == "alacritty" then
-				lib.mkForce "${pkgs.kitty}/bin/alacritty"
-			else "";
-
-		programs.alacritty.settings = {
-			window = {
-				opacity = 1.0;
-				padding = {
-					x = 4;
-					y = 0;
-				};
-				decorations = "full";
-			};
-
-			font = {
-				normal = {
-					family = config.fonts.normal;
-					style = "Retina";
-				};
-				bold = {
-					family = config.fonts.bold;
-					style = "Bold";
-				};
-				italic = {
-					family = config.fonts.italic;
-				};
-				size = config.fonts.size;
-			};
-
-			colors = with config.scheme; {
-				primary = {
-					background = "0x${base00}";
-					foreground = "0x${base05}";
-				};
-				normal = {
-					black = "0x${base00}";
-					red = "0x${base08}";
-					green = "0x${base0B}";
-					yellow = "0x${base0A}";
-					blue = "0x${base0D}";
-					magenta = "0x${base0E}";
-					cyan = "0x${base0C}";
-					white = "0x${base05}";
-				};
-				bright = {
-					black = "0x${base03}";
-					red = "0x${base08}";
-					green = "0x${base0B}";
-					yellow = "0x${base0A}";
-					blue = "0x${base0D}";
-					magenta = "0x${base0E}";
-					cyan = "0x${base0C}";
-					white = "0x${base07}";
-				};
-				dim = {
-					black = "0x${base01}";
-					red = "0x${base08}";
-					green = "0x${base0B}";
-					yellow = "0x${base0A}";
-					blue = "0x${base0D}";
-					magenta = "0x${base0E}";
-					cyan = "0x${base0C}";
-					white = "0x${base04}";
-				};
-			};
-
-			shell = {
-				program = config.shell.command;
-			};
-		};
-	};
-}
diff --git a/modules/desktop/terminal/default.nix b/modules/desktop/terminal/default.nix
deleted file mode 100644
index 189c794..0000000
--- a/modules/desktop/terminal/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, ... }:
-
-{
-	imports = [
-		./alacritty
-		./kitty
-	];
-
-	options.desktop.terminal = {
-		command = lib.mkOption {
-			type = lib.types.str;
-			description = "Command for the terminal.";
-		};
-
-		default = lib.mkOption {
-			type = lib.types.enum [
-				"kitty"
-				"alacritty"
-			];
-			description = "Default terminal.";
-		};
-	};
-}
diff --git a/modules/desktop/terminal/kitty/default.nix b/modules/desktop/terminal/kitty/default.nix
deleted file mode 100644
index a34e58a..0000000
--- a/modules/desktop/terminal/kitty/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-{
-	options.desktop.terminal.kitty = {
-		enable = lib.mkEnableOption "Enables kitty.";
-	};
-
-	config = lib.mkIf config.desktop.terminal.kitty.enable {
-		assertions = [
-			{
-				assertion = config.desktop.xdg-portal.enable;
-				message ="Module desktop.terminal.kitty requires desktop.xdg-portal module to be enabled.";
-			}
-		];
-		programs.kitty.enable = true;
-		desktop.terminal.default = lib.mkDefault "kitty";
-		desktop.terminal.command =
-			if config.desktop.terminal.default == "kitty" then
-				lib.mkForce "${pkgs.kitty}/bin/kitty"
-			else "";
-
-		programs.kitty.settings = with config.scheme.withHashtag; {
-			window_padding_width = config.desktop.window-manager.gap;
-			font_size = config.fonts.size;
-			font_family = config.fonts.normal;
-			filter_notification = "all";
-			update_check_interval = 0; # disable notifications
-			scrollback_indicator_opacity = "0.5";
-
-			dynamic_background_opacity = false;
-			allow_remote_control = false;
-			enable_audio_bell = false;
-
-			background = base00;
-			foreground = base05;
-
-			color0 = base00; # Black
-			color1 = base08; # Red
-			color2 = base0B; # Green
-			color3 = base0A; # Yellow
-			color4 = base0D; # Blue
-			color5 = base0E; # Magenta
-			color6 = base0C; # Cyan
-			color7 = base05; # White
-
-			selection_background = base03;
-			selection_foreground = base00;
-
-			shell = config.shell.command;
-		};
-	};
-}
diff --git a/modules/desktop/window-manager/sxhkd/default.nix b/modules/desktop/window-manager/sxhkd/default.nix
index 6e5d9bb..953cfd3 100644
--- a/modules/desktop/window-manager/sxhkd/default.nix
+++ b/modules/desktop/window-manager/sxhkd/default.nix
@@ -34,12 +34,12 @@
 				${(createKeybinding
 					"t"
 					"Launch terminal.")}
-						= config.desktop.terminal.command;
+						= config.tools.terminal.command;
 
 				${(createKeybinding
 					"f"
 					"Launch File Manager.")}
-						= "${config.desktop.terminal.command} --title 'File Manager' --class floating-termial -e ${config.tools.file-manager.command}";
+						= "${config.tools.terminal.command} --title 'File Manager' --class floating-termial -e ${config.tools.file-manager.command}";
 			}
 		];
 	};