Added git information to zsh prompt.

Changed configuration of rofi to be more consistent with the other windows.
Changed mod key to alt key.

4 files changed, 98 insertions, 90 deletions

diff --git a/rofi/default.nix b/rofi/default.nix
index 5c6c248..ad75900 100644
--- a/rofi/default.nix
+++ b/rofi/default.nix
@@ -3,5 +3,5 @@
 {
 	programs.rofi.enable = true;
 	programs.rofi.font = "FiraCode Nerd Font 16";
-	programs.rofi.theme = import ./theme.nix config;
+	programs.rofi.theme = import ./theme/default.nix config;
 }
diff --git a/rofi/theme.nix b/rofi/theme.nix
deleted file mode 100644
index dfac2c3..0000000
--- a/rofi/theme.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-config:
-
-with config.lib.stylix.colors.withHashtag;
-builtins.toFile "theme.rasi"
-''
-	configuration {
-		font: "${config.programs.rofi.font}";
-
-		drun {
-			display-name: " ";
-		}
-
-		run {
-			display-name: " ";
-		}
-
-		window {
-			display-name: " ";
-		}
-
-		ssh {
-			display-name: " ";
-		}
-
-		timeout {
-			delay: 10;
-			action: "kb-cancel";
-		}
-	}
-
-	* {
-		border: 1;
-		margin: 0;
-		padding: 0;
-		spacing: 0;
-
-		bg: ${base00};
-		bg-alt: ${base01};
-		fg: ${base05};
-		fg-alt: ${base04};
-
-		background-color: @bg;
-		text-color: @fg;
-	}
-
-	window {
-		transparency: "real";
-	}
-
-	mainbox {
-		children: [inputbar, listview];
-	}
-
-	inputbar {
-		background-color: @bg-alt;
-		children: [prompt, entry];
-	}
-
-	entry {
-		background-color: inherit;
-		padding: 12px 3px;
-	}
-
-	prompt {
-		background-color: inherit;
-		padding: 12px;
-	}
-
-	listview {
-		lines: 8;
-	}
-
-	element {
-		children: [element-text];
-	}
-
-	element-icon {
-		padding: 10px 10px;
-	}
-
-	element-text {
-		padding: 10px 10px;
-		text-color: @fg-alt;
-	}
-
-	element-text selected {
-		text-color: @fg;
-	}
-''
diff --git a/rofi/theme/default.nix b/rofi/theme/default.nix
new file mode 100644
index 0000000..9ae3bb5
--- /dev/null
+++ b/rofi/theme/default.nix
@@ -0,0 +1,21 @@
+config:
+
+with config.lib.stylix.colors.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};
+}
+''
diff --git a/rofi/theme/theme.rasi b/rofi/theme/theme.rasi
new file mode 100644
index 0000000..9d808b9
--- /dev/null
+++ b/rofi/theme/theme.rasi
@@ -0,0 +1,76 @@
+configuration {
+	drun {
+		display-name: " ";
+	}
+
+	run {
+		display-name: " ";
+	}
+
+	window {
+		display-name: " ";
+	}
+
+	ssh {
+		display-name: " ";
+	}
+
+	timeout {
+		delay: 10;
+		action: "kb-cancel";
+	}
+}
+
+* {
+	border: 1;
+	margin: 0;
+	padding: 0;
+	spacing: 0;
+
+	background-color: @bg;
+	text-color: @fg;
+}
+
+window {
+	transparency: "real";
+}
+
+mainbox {
+	children: [inputbar, listview];
+}
+
+inputbar {
+	background-color: @bg-alt;
+	children: [prompt, entry];
+}
+
+entry {
+	background-color: inherit;
+	padding: 12px 3px;
+}
+
+prompt {
+	background-color: inherit;
+	padding: 12px;
+}
+
+listview {
+	lines: 8;
+}
+
+element {
+	children: [element-text];
+}
+
+element-icon {
+	padding: 10px 10px;
+}
+
+element-text {
+	padding: 10px 10px;
+	text-color: @fg-alt;
+}
+
+element-text selected {
+	text-color: @fg;
+}