From 3747b2c826d0c28b19fafa81522d064609f92e2c Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Thu, 18 Jun 2020 01:31:42 +0200
Subject: [PATCH] move polybar config to separate file

---
 profiles/xsession/default.nix | 173 +-------------------------------
 profiles/xsession/polybar.nix | 181 ++++++++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+), 172 deletions(-)
 create mode 100644 profiles/xsession/polybar.nix

diff --git a/profiles/xsession/default.nix b/profiles/xsession/default.nix
index 013c51c..f0aa1ef 100644
--- a/profiles/xsession/default.nix
+++ b/profiles/xsession/default.nix
@@ -4,7 +4,7 @@ let
   cfg = config.profiles.xsession;
 in
 {
-  imports = [ ./dunstrc.nix ./terminal.nix ./audio.nix ];
+  imports = [ ./dunstrc.nix ./terminal.nix ./audio.nix ./polybar.nix ];
 
   options.profiles.xsession = {
     enable = lib.mkEnableOption "Whether or not to control the xsession";
@@ -73,177 +73,6 @@ in
             titlebar = false;
             hideEdgeBorders = "smart";
           };
-          bars = [];
-          startup = [
-             { command = "systemctl --user restart polybar"; always = true; notification = false; }
-          ];
-        };
-      };
-    };
-
-    services.polybar = {
-      enable = true;
-      package = pkgs.polybar.override {
-        i3Support = true;
-      };
-      script = "polybar bot &";
-      config = {
-        "colors" = {
-          background = "#B2000000";
-          background-alt = "#444";
-          foreground = "#dfdfdf";
-          foreground-alt = "#BBB";
-          primary = "#ffb52a";
-          secondary = "#e60053";
-          alert = "#bd2c40";
-        };
-        "bar/bot" = {
-          bottom = true;
-          width = "100%";
-          height = 27;
-
-          font-0 = "MesloLGS NF:fontformat=truetype:pixelsize=11;1";
-
-          background = "\${colors.background}";
-          foreground = "\${colors.foreground}";
-
-          padding-left = "0";
-          padding-right = "2";
-
-          module-margin-left = "1";
-          module-margin-right = "2";
-
-          modules-left = "i3 title";
-          modules-right = "wlan eth filesystem cpu memory battery date";
-        };
-
-        "module/i3" = {
-          type = "internal/i3";
-          format = "<label-state> <label-mode>";
-          scroll-up = "i3wm-wsnext";
-          scroll-down = "i3wm-wsprev";
-
-          label-mode-padding = "0";
-          label-mode-foreground = "#000";
-          label-mode-background = "\${colors.primary}";
-
-          label-focused = "%index%";
-          label-focused-background = "\${colors.background-alt}";
-          label-focused-underline= "\${colors.primary}";
-          label-focused-padding = "1";
-
-          label-unfocused = "%index%";
-          label-unfocused-padding = "1";
-
-          label-visible = "%index%";
-          label-visible-background = "\${self.label-focused-background}";
-          label-visible-underline = "\${self.label-focused-underline}";
-          label-visible-padding = "\${self.label-focused-padding}";
-
-          label-urgent = "%index%";
-          label-urgent-background = "\${colors.alert}";
-          label-urgent-padding = "1";
-
-        };
-        "module/title" = {
-          type = "internal/xwindow";
-        };
-        "module/wlan" = {
-          type = "internal/network";
-          interface = "wlp4s0";
-          interval = "3.0";
-
-          format-connected = "<ramp-signal> <label-connected>";
-          format-connected-underline = "#9f78e1";
-          label-connected = "(%signal%% on %essid%) %local_ip%";
-
-          format-disconnected = "";
-          
-          ramp-signal-0 = "";
-          ramp-signal-1 = "";
-          ramp-signal-2 = "";
-          ramp-signal-3 = "";
-          ramp-signal-4 = "";
-          ramp-signal-foreground = "\${colors.foreground-alt}";
-        };
-        "module/eth" = {
-          type = "internal/network";
-          interface = "${config.machine.eth}";
-          interval = "3.0";
-
-          format-connected-underline = "#55aa55";
-          format-connected-prefix = " ";
-          format-connected-prefix-foreground = "\${colors.foreground-alt}";
-          label-connected = "%local_ip%";
-
-          format-disconnected = "";
-        };
-        "module/filesystem" = {
-          type = "internal/fs";
-          interval = 25;
-
-          mount-0 = "/";
-
-          label-mounted = "%{F#0a81f5}%mountpoint%%{F-}: %free%";
-          label-unmounted = "%mountpoint% not mounted";
-          label-unmounted-foreground = "\${colors.foreground-alt}";
-        };
-        "module/cpu" = {
-          type = "internal/cpu";
-          interval = 2;
-          format-prefix = " ";
-          format-prefix-foreground = "\${colors.foreground-alt}";
-          format-underline = "#f90000";
-          label = "%percentage:2%%";
-        };
-        "module/memory" = {
-          type = "internal/memory";
-          interval = "2";
-          format-prefix = " ";
-          format-prefix-foreground = "\${colors.foreground-alt}";
-          format-underline = "#4bffdc";
-          label = "%percentage_used%%";
-        };
-        "module/battery" = {
-          type = "internal/battery";
-          battery = "BAT0";
-          adapter = "AC";
-
-          format-charging = "<animation-charging> <label-charging>";
-          format-charging-underline = "#ffb52a";
-
-          format-discharging = "<animation-discharging> <label-discharging>";
-          format-discharging-underline = "\${self.format-charging-underline}";
-
-          format-full-prefix-foreground = "\${colors.foreground-alt}";
-          format-full-underline = "\${self.format-charging-underline}";
-
-          ramp-capacity-foreground = "\${colors.foreground-alt}";
-
-          format-full-prefix = " ";
-          
-          ramp-capacity-0 = "";
-          ramp-capacity-1 = "";
-          ramp-capacity-2 = "";
-          
-          animation-charging-0 = "";
-          animation-charging-1 = "";
-          animation-charging-2 = "";
-          animation-charging-foreground = "\${colors.foreground-alt}";
-          animation-charging-framerate = "750";
-
-          animation-discharging-0 = "";
-          animation-discharging-1 = "";
-          animation-discharging-2 = "";
-          animation-discharging-foreground = "\${colors.foreground-alt}";
-          animation-discharging-framerate = "750";
-        };
-        "module/date" = {
-          type = "internal/date";
-          internal = 5;
-          date = "%Y-%m-%d";
-          time = "%H:%M:%S";
-          label = "%date% %time%";
         };
       };
     };
diff --git a/profiles/xsession/polybar.nix b/profiles/xsession/polybar.nix
new file mode 100644
index 0000000..28355dc
--- /dev/null
+++ b/profiles/xsession/polybar.nix
@@ -0,0 +1,181 @@
+{ pkgs, config, lib, ... }:
+
+let
+  cfg = config.profiles.xsession;
+in
+{
+  config = lib.mkIf cfg.enable {
+    xsession.windowManager.i3.config = {
+      bars = [];
+      startup = [
+        { command = "systemctl --user restart polybar"; always = true; notification = false; }
+      ];
+    };
+    services.polybar = {
+      enable = true;
+      package = pkgs.polybar.override {
+        i3Support = true;
+      };
+      script = "polybar bot &";
+      config = {
+        "colors" = {
+          background = "#B2000000";
+          background-alt = "#444";
+          foreground = "#dfdfdf";
+          foreground-alt = "#BBB";
+          primary = "#ffb52a";
+          secondary = "#e60053";
+          alert = "#bd2c40";
+        };
+        "bar/bot" = {
+          bottom = true;
+          width = "100%";
+          height = 27;
+
+          font-0 = "MesloLGS NF:fontformat=truetype:pixelsize=11;1";
+
+          background = "\${colors.background}";
+          foreground = "\${colors.foreground}";
+
+          padding-left = "0";
+          padding-right = "2";
+
+          module-margin-left = "1";
+          module-margin-right = "2";
+
+          modules-left = "i3 title";
+          modules-right = "wlan eth filesystem cpu memory battery date";
+        };
+
+        "module/i3" = {
+          type = "internal/i3";
+          format = "<label-state> <label-mode>";
+          scroll-up = "i3wm-wsnext";
+          scroll-down = "i3wm-wsprev";
+
+          label-mode-padding = "0";
+          label-mode-foreground = "#000";
+          label-mode-background = "\${colors.primary}";
+
+          label-focused = "%index%";
+          label-focused-background = "\${colors.background-alt}";
+          label-focused-underline= "\${colors.primary}";
+          label-focused-padding = "1";
+
+          label-unfocused = "%index%";
+          label-unfocused-padding = "1";
+
+          label-visible = "%index%";
+          label-visible-background = "\${self.label-focused-background}";
+          label-visible-underline = "\${self.label-focused-underline}";
+          label-visible-padding = "\${self.label-focused-padding}";
+
+          label-urgent = "%index%";
+          label-urgent-background = "\${colors.alert}";
+          label-urgent-padding = "1";
+
+        };
+        "module/title" = {
+          type = "internal/xwindow";
+        };
+        "module/wlan" = {
+          type = "internal/network";
+          interface = "wlp4s0";
+          interval = "3.0";
+
+          format-connected = "<ramp-signal> <label-connected>";
+          format-connected-underline = "#9f78e1";
+          label-connected = "(%signal%% on %essid%) %local_ip%";
+
+          format-disconnected = "";
+          
+          ramp-signal-0 = "";
+          ramp-signal-1 = "";
+          ramp-signal-2 = "";
+          ramp-signal-3 = "";
+          ramp-signal-4 = "";
+          ramp-signal-foreground = "\${colors.foreground-alt}";
+        };
+        "module/eth" = {
+          type = "internal/network";
+          interface = "${config.machine.eth}";
+          interval = "3.0";
+
+          format-connected-underline = "#55aa55";
+          format-connected-prefix = " ";
+          format-connected-prefix-foreground = "\${colors.foreground-alt}";
+          label-connected = "%local_ip%";
+
+          format-disconnected = "";
+        };
+        "module/filesystem" = {
+          type = "internal/fs";
+          interval = 25;
+
+          mount-0 = "/";
+
+          label-mounted = "%{F#0a81f5}%mountpoint%%{F-}: %free%";
+          label-unmounted = "%mountpoint% not mounted";
+          label-unmounted-foreground = "\${colors.foreground-alt}";
+        };
+        "module/cpu" = {
+          type = "internal/cpu";
+          interval = 2;
+          format-prefix = " ";
+          format-prefix-foreground = "\${colors.foreground-alt}";
+          format-underline = "#f90000";
+          label = "%percentage:2%%";
+        };
+        "module/memory" = {
+          type = "internal/memory";
+          interval = "2";
+          format-prefix = " ";
+          format-prefix-foreground = "\${colors.foreground-alt}";
+          format-underline = "#4bffdc";
+          label = "%percentage_used%%";
+        };
+        "module/battery" = {
+          type = "internal/battery";
+          battery = "BAT0";
+          adapter = "AC";
+
+          format-charging = "<animation-charging> <label-charging>";
+          format-charging-underline = "#ffb52a";
+
+          format-discharging = "<animation-discharging> <label-discharging>";
+          format-discharging-underline = "\${self.format-charging-underline}";
+
+          format-full-prefix-foreground = "\${colors.foreground-alt}";
+          format-full-underline = "\${self.format-charging-underline}";
+
+          ramp-capacity-foreground = "\${colors.foreground-alt}";
+
+          format-full-prefix = " ";
+          
+          ramp-capacity-0 = "";
+          ramp-capacity-1 = "";
+          ramp-capacity-2 = "";
+          
+          animation-charging-0 = "";
+          animation-charging-1 = "";
+          animation-charging-2 = "";
+          animation-charging-foreground = "\${colors.foreground-alt}";
+          animation-charging-framerate = "750";
+
+          animation-discharging-0 = "";
+          animation-discharging-1 = "";
+          animation-discharging-2 = "";
+          animation-discharging-foreground = "\${colors.foreground-alt}";
+          animation-discharging-framerate = "750";
+        };
+        "module/date" = {
+          type = "internal/date";
+          internal = 5;
+          date = "%Y-%m-%d";
+          time = "%H:%M:%S";
+          label = "%date% %time%";
+        };
+      };
+    };
+  };
+}