fix: color overhaul

5 files changed, 28 insertions, 87 deletions

diff --git a/rofi/colors/dracula.rasi b/rofi/colors/dracula.rasi
deleted file mode 100644
index 7ae606d..0000000
--- a/rofi/colors/dracula.rasi
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- *
- * Author : Aditya Shakya (adi1090x)
- * Github : @adi1090x
- * 
- * Colors
- **/
-
-* {
-    background:     #1E1F29FF;
-    background-alt: #282A36FF;
-    foreground:     #FFFFFFFF;
-    selected:       #BD93F9FF;
-    active:         #50FA7BFF;
-    urgent:         #FF5555FF;
-}
diff --git a/rofi/colors/onedark.rasi b/rofi/colors/onedark.rasi
deleted file mode 100644
index 7c76108..0000000
--- a/rofi/colors/onedark.rasi
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- *
- * Author : Aditya Shakya (adi1090x)
- * Github : @adi1090x
- * 
- * Colors
- **/
-
-* {
-    background:     #1E2127FF;
-    background-alt: #282B31FF;
-    foreground:     #FFFFFFFF;
-    selected:       #61AFEFFF;
-    active:         #98C379FF;
-    urgent:         #E06C75FF;
-}
diff --git a/rofi/colors/tokyonight.rasi b/rofi/colors/tokyonight.rasi
deleted file mode 100644
index 1145cbd..0000000
--- a/rofi/colors/tokyonight.rasi
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- *
- * Author : Levi Lacoss (fishyfishfish55)
- * Github : @fishyfishfish55
- *
- * Colors
- **/
-
-* {
-    background:     #15161EFF;
-    background-alt: #1A1B26FF;
-    foreground:     #C0CAF5FF;
-    selected:       #33467CFF;
-    active:         #414868FF;
-    urgent:         #F7768EFF;
-}
diff --git a/rofi/colors/yousai.rasi b/rofi/colors/yousai.rasi
deleted file mode 100644
index 757cab3..0000000
--- a/rofi/colors/yousai.rasi
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- *
- * Author : Aditya Shakya (adi1090x)
- * Github : @adi1090x
- * 
- * Colors
- **/
-
-* {
-    background:     #F5E7DEFF;
-    background-alt: #EBDCD2FF;
-    foreground:     #34302DFF;
-    selected:       #D97742FF;
-    active:         #BF8F60FF;
-    urgent:         #B23636FF;
-}
diff --git a/rofi/config.rasi b/rofi/config.rasi
index 61b12ab..a67fd05 100644
--- a/rofi/config.rasi
+++ b/rofi/config.rasi
@@ -2,7 +2,7 @@
  *
  * Author : Aditya Shakya (adi1090x)
  * Github : @adi1090x
- * 
+ *
  * Rofi Theme File
  * Rofi Version: 1.7.3
  **/
@@ -20,36 +20,41 @@ configuration {
 }
 
 /*****----- Global Properties -----*****/
-@import                          "colors/tokyonight.rasi"
-
 * {
     font: "JetBrainsMono Nerd Font Propo 12";
 }
 
 * {
-    border-colour:               var(selected);
-    handle-colour:               var(selected);
-    background-colour:           var(background);
-    foreground-colour:           var(foreground);
-    alternate-background:        var(background-alt);
-    normal-background:           var(background);
-    normal-foreground:           var(foreground);
+    bg:     #0a0a0a;
+    bg-alt: #141414;
+    fg:     #b8a5e6;
+    sel:    #ff7645;
+    active: #b8a5e6;
+    urgent: #cc5533;
+
+    border-colour:               var(sel);
+    handle-colour:               var(sel);
+    background-colour:           var(bg);
+    foreground-colour:           var(fg);
+    alternate-background:        var(bg-alt);
+    normal-background:           var(bg);
+    normal-foreground:           var(fg);
     urgent-background:           var(urgent);
-    urgent-foreground:           var(background);
+    urgent-foreground:           var(bg);
     active-background:           var(active);
-    active-foreground:           var(background);
-    selected-normal-background:  var(selected);
-    selected-normal-foreground:  var(background);
+    active-foreground:           var(bg);
+    selected-normal-background:  var(sel);
+    selected-normal-foreground:  var(bg);
     selected-urgent-background:  var(active);
-    selected-urgent-foreground:  var(background);
+    selected-urgent-foreground:  var(bg);
     selected-active-background:  var(urgent);
-    selected-active-foreground:  var(background);
-    alternate-normal-background: var(background);
-    alternate-normal-foreground: var(foreground);
+    selected-active-foreground:  var(bg);
+    alternate-normal-background: var(bg);
+    alternate-normal-foreground: var(fg);
     alternate-urgent-background: var(urgent);
-    alternate-urgent-foreground: var(background);
+    alternate-urgent-foreground: var(bg);
     alternate-active-background: var(active);
-    alternate-active-foreground: var(background);
+    alternate-active-foreground: var(bg);
 }
 
 /*****----- Main Window -----*****/
@@ -134,7 +139,7 @@ listview {
     reverse:                     false;
     fixed-height:                true;
     fixed-columns:               true;
-    
+
     spacing:                     0px;
     margin:                      0px;
     padding:                     0px;
@@ -178,8 +183,8 @@ element normal.active {
     text-color:                  var(active-foreground);
 }
 element selected.normal {
-    background-color:            var(alternate-background);
-    text-color:                  var(foreground-colour);
+    background-color:            var(selected-normal-background);
+    text-color:                  var(selected-normal-foreground);
 }
 element selected.urgent {
     background-color:            var(selected-urgent-background);