Merge pull request #1 from ellmau/polybar_rework

Polybar rework

home/config/nixpkgs/polybar.nix

@@ -5,16 +5,44 @@
     package = pkgs.polybarFull;
     settings =
       let
-        background_col = "#120030";
-        foreground_col = "#9e66ff";
+        # solarized theme colours ~ https://en.wikipedia.org/wiki/Solarized
+
+        #content tones
+        Base01 = "#586e75";
+        Base00 = "#657b83";
+        Base0 = "#839496";
+        Base1 = "#93a1a1";
+        # background tones
+        Base2 = "#eee8d5";
+        Base3 = "#fdf6e3";
+        # accent tones
+        Yellow = "#b58900";
+        Orange = "#cb4b16";
+        Red = "#dc322f";
+        Magenta = "#d33682";
+        Violet = "#6c71c4";
+        Blue = "#268bd2";
+        Cyan = "#2aa198";
+        Green = "#859900";
+
+        foreground_col = Base3;
+        background_col = Base01;
+
+        # old bg/fg stuff
+        #foreground_col = "#eee8d5";
+        #background_col = "#6c71c4";
         foreground_altcol = "#66deff";
         primary_col = "#ffb52a";
         secondary_col = "#e60053";
-        alert_col = "#bd2c40";
-      in
-        {
-          "bar/main" = {
-            font = [
+        alert_col = "#dc322f";
+
+        dpi = ''
+          ''${env:DPI:0}
+          '';
+
+        #polyheight = 60;
+        
+        fonts = [
           "Hasklig:style=Regular"
           "all-the-icons:style=Regular"
           "Webdings:style=Regular"
@@ -24,8 +52,12 @@
           "Weather Icons:size=12;0"
           "Hasklug Nerd Font,Hasklig Medium:style=Medium,Regular"
         ];
+      in
+        {
+          "bar/main" = {
+            font = fonts;
             modules = {
-              left = "i3";
+              left = "i3 xwindow";
               center = "";
               right = " xbacklight xkeyboard eth wlan battery date powermenu dunst volume ";
             };
@@ -37,24 +69,24 @@
           ''${env:MONITOR:}
         '';
             width = "100%";
+            #height = polyheight;
+            padding = 0;
+            padding-right = 2;
+            radius = 14;
             module-margin = 1;
+            line-size = 2;
+            
+            dpi-x = dpi;
+            dpi-y = dpi;
+            
             tray = {
               position = "right";
               padding = 2;
-              background = foreground_col;
+              background = Base2;
             };
           };
           "bar/aux" = {
-            font = [
-              "Hasklig:style=Regular"
-              "all-the-icons:style=Regular"
-              "Webdings:style=Regular"
-              "Noto Emoji:scale=10"
-              "Unifont:style=Regular"
-              "Material Icons:size=12;0"
-              "Weather Icons:size=12;0"
-              "Hasklug Nerd Font,Hasklig Medium:style=Medium,Regular"
-            ];
+            font = fonts;
             modules = {
               left = "i3";
               center = "";
@@ -68,7 +100,13 @@
           ''${env:MONITOR:}
         '';
             width = "100%";
+            #height = polyheight;
+            radius = 14;
             module-margin = 1;
+            line-size = 2;
+
+            dpi-x = dpi;
+            dpi-y = dpi;
           };
           
           "module/volume" = {
@@ -78,6 +116,8 @@
             label.muted.foreground = "#666";
             ramp.volume = ["🔈" "🔉" "🔊"];
             click.right = "${pkgs.pavucontrol}/bin/pavucontrol &";
+            # format-volume-underline = Base2;
+            # format-muted-underline = Base2;
           };
           "module/i3" = { 
             type = "internal/i3";
@@ -97,23 +137,25 @@
             #;label-focused-background = ${colors.background-alt}
             #;label-focused-background = #9f78e1
             label-focused-background = foreground_col;
-            label-focused-underline= primary_col;
-            label-focused-foreground = "#cccccc";
+            label-focused-underline= foreground_col;
+            label-focused-foreground = background_col;
             label-focused-padding = "2";
 
             #; unfocused = Inactive workspace on any monitor
             label-unfocused = "%name%";
             label-unfocused-padding = "2";
+            label-unfocused-underline = foreground_col;
 
             #; visible = Active workspace on unfocused monitor
-            label-visible = "%index%";
-            label-visible-background = "#6c419a";
-            label-visible-underline = primary_col;
+            label-visible = "%name%";
+            label-visible-background = Violet;
+            label-visible-underline = Yellow;
             label-visible-padding = 2;
 
             #; urgent = Workspace with urgency hint set
             label-urgent = "%name%";
             label-urgent-background = alert_col;
+            label-urgent-foreground = primary_col;
             label-urgent-padding = "2";
             
             #; Separator in between workspaces
@@ -289,6 +331,17 @@
             interval = 10;
             click-left = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl set-paused toggle";
           };
+
+          "module/xwindow" = {
+            type = "internal/xwindow";
+
+            format = "<label>";
+            format-background = Cyan;
+            format-foreground = foreground_col;
+            format-padding = 2;
+            label-maxlen = 50;
+            label = "%title%";
+          };
         };
     script = ''
     for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do