3 files changed, 11 insertions, 23 deletions
diff --git a/modules/desktop/popup-manager/rofi/default.nix b/modules/desktop/popup-manager/rofi/default.nix
index 5c839e1..009db89 100644
--- a/modules/desktop/popup-manager/rofi/default.nix
+++ b/modules/desktop/popup-manager/rofi/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
 	options.desktop.popup-manager.rofi = {
@@ -6,8 +6,11 @@
 	};
 
 	config = lib.mkIf config.desktop.popup-manager.rofi.enable {
+		desktop.popup-manager.application-launcher.default = "${pkgs.rofi}/bin/rofi -show run";
 		programs.rofi.enable = true;
 		programs.rofi.font = "FiraCode Nerd Font 16";
-		programs.rofi.theme = import ./theme config;
+		programs.rofi.theme = config.scheme {
+			template = builtins.readFile ./theme.rasi.mustache;
+		};
 	};
 }
diff --git a/modules/desktop/popup-manager/rofi/theme/theme.rasi b/modules/desktop/popup-manager/rofi/theme.rasi.mustache
index 9d808b9..02cdaf3 100644
--- a/modules/desktop/popup-manager/rofi/theme/theme.rasi
+++ b/modules/desktop/popup-manager/rofi/theme.rasi.mustache
@@ -27,12 +27,18 @@ configuration {
 	padding: 0;
 	spacing: 0;
 
+	bg: #{{base00-hex}};
+	bg-alt: #{{base01-hex}};
+	fg: #{{base07-hex}};
+	fg-alt: #{{base03-hex}};
+
 	background-color: @bg;
 	text-color: @fg;
 }
 
 window {
 	transparency: "real";
+	border-color: #{{base03-hex}};
 }
 
 mainbox {
diff --git a/modules/desktop/popup-manager/rofi/theme/default.nix b/modules/desktop/popup-manager/rofi/theme/default.nix
deleted file mode 100644
index b0b8173..0000000
--- a/modules/desktop/popup-manager/rofi/theme/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-config:
-
-with config.scheme.withHashtag;
-builtins.toFile "theme.rasi"
-''
-${builtins.readFile ./theme.rasi}
-configuration {
-	font: "${config.programs.rofi.font}";
-}
-
-* {
-	bg: ${base00};
-	bg-alt: ${base01};
-	fg: ${base07};
-	fg-alt: ${base03};
-}
-
-window {
-	border-color: ${base03};
-}
-''