Polybar and stuff

1 files changed, 37 insertions, 16 deletions

diff --git a/home.nix b/home.nix
index 60d177d..af866f8 100644
--- a/home.nix
+++ b/home.nix
@@ -1,5 +1,14 @@
 { pkgs, ... }:
 
+let
+  solarized-xresources =
+    pkgs.fetchFromGitHub {
+      owner = "solarized";
+      repo = "xresources";
+      rev = "025ceddbddf55f2eb4ab40b05889148aab9699fc";
+      sha256 = "0lxv37gmh38y9d3l8nbnsm1mskcv10g3i83j0kac0a2qmypv1k9f";
+    };
+in
 {
   home.packages = import ./packages.nix { inherit pkgs; };
 
@@ -13,41 +22,53 @@
       "XTerm*termName" = "xterm-256color";
       "XTerm*metaSendsEscape" = true;
     };
-    extraConfig = builtins.readFile (
-      pkgs.fetchFromGitHub {
-        owner = "solarized";
-        repo = "xresources";
-        rev = "025ceddbddf55f2eb4ab40b05889148aab9699fc";
-        sha256 = "0lxv37gmh38y9d3l8nbnsm1mskcv10g3i83j0kac0a2qmypv1k9f";
-      } + "/Xresources.light"
-    );
+    extraConfig = builtins.readFile(solarized-xresources + "/Xresources.light");
   };
 
   services.network-manager-applet.enable = true;
 
   services.polybar = {
-    enable = false;
-    script = "polybar bar &";
+    enable = true;
+
     config = {
       "bar/top" = {
-        monitor = "${env:MONITOR:HDMI1}";
+        font-0 = "mononoki:size-10";
+        monitor = "\${env:MONITOR:eDP1}";
+        monitor-fallback = "HDMI1";
         width = "100%";
-        height = "3%";
+        height = "2%";
         radius = 0;
+        background = "#fdf6e3"; # solarized base3
+        foreground = "#657b83"; # solarized base00
+        module-margin = 4;
         modules-center = "date";
+        modules-right = "battery";
       };
+
       "module/date" = {
         type = "internal/date";
         internal = 5;
-        date = "%y.%m.%d";
+        date = "%Y.%m.%d";
         time = "%H.%M";
-        label = "%time%  %date%";
+        label = "%date%..%time%";
+      };
+
+      "module/battery" = {
+        type = "internal/battery";
+        battery = "BAT0";
+        adapter = "AC";
+        full-at = 99;
       };
     };
+    script = ''
+      #!/usr/bin/env sh
+      systemctl --user daemon-reload
+      polybar top &
+    '';
   };
 
   services.taffybar = {
-    enable = true;
+    enable = false;
   };
 
   services.redshift = {
@@ -77,7 +98,7 @@
       path = https://github.com/rycee/home-manager/archive/release-18.03.tar.gz;
     };
 
-    vim = import ./vim.nix;
+    vim = import ./vim.nix { inherit pkgs; inherit (pkgs) vimUtils fetchFromGitHub; };
 
     git = {
       enable = true;