From 93b80d45f49b481b68d4c9f468b7e7447164e99e Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Fri, 17 Nov 2023 21:31:06 +0100
Subject: [PATCH] among other things, make my polybar cuter

---
 hosts/catbook-j/hardware-configuration.nix |  2 +-
 modules/desktop/gaming.nix                 |  3 --
 modules/desktop/polybar.nix                | 43 ++++++++++++++--------
 other/scripts/dispatcher.nu                |  2 +-
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/hosts/catbook-j/hardware-configuration.nix b/hosts/catbook-j/hardware-configuration.nix
index 38a5aa6..4124bce 100644
--- a/hosts/catbook-j/hardware-configuration.nix
+++ b/hosts/catbook-j/hardware-configuration.nix
@@ -40,7 +40,7 @@
 
   swapDevices = [{
     device = "/swap/swapfile";
-    size = (1024 * 12);
+    size = (1024 * 24);
   }];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/modules/desktop/gaming.nix b/modules/desktop/gaming.nix
index 79e262a..ff11744 100644
--- a/modules/desktop/gaming.nix
+++ b/modules/desktop/gaming.nix
@@ -7,9 +7,6 @@ in with lib; {
     enable = mkEnableOption "Enable gaming stuff";
   };
   config = mkIf cfg.enable {
-    #nixpkgs.overlays = [
-      #(import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay
-    #];
     programs.steam.enable = true;
     home-manager.users.jade = { pkgs, ... }: {
       home.packages = with pkgs; [
diff --git a/modules/desktop/polybar.nix b/modules/desktop/polybar.nix
index d50424c..a989ac9 100644
--- a/modules/desktop/polybar.nix
+++ b/modules/desktop/polybar.nix
@@ -87,41 +87,54 @@
           "network-base" = {
             type = "internal/network";
             interval = 5;
-            format-connected = "<label-connected>";
+            format-connected = "<ramp-signal> <label-connected>";
             format-disconnected = "<label-disconnected>";
-            label-disconnected = "%{F#F0C674}%ifname%%{F#707880} disconnected";
+            label-disconnected = "󰣼";
+            label-disconnected-foreground = "#d65d0e";
+            ramp.signal = [ "󰣾" "󰣴" "󰣶" "󰣸" "󰣺" ];
+            ramp-signal-foreground = "#d65d0e";
+            ramp-signal-foreground-0 = "#cc241d";
+            ramp-signal-foreground-4 = "#bdae93";
           };
 
           "module/wlan" = {
             "inherit" = "network-base";
             interface-type = "wireless";
-            label-connected = "%{F#F0C674}%ifname%%{F-} %essid% %local_ip%";
+            label-connected = "%{F#F0C674}%{F-} %local_ip%";
           };
 
           "module/battery" = {
             type = "internal/battery";
             poll-interval = 1;
-            full-at = 96;
             battery = "BAT0";
             adapter = "ADP1";
-            time-format = "%H:%M";
-            label-charging = "%percentage%% %time%";
-            format-charging = "<ramp-capacity> 󰚥 <label-charging>";
-            label-discharging = "%percentage%% %time%";
+            time-format = "%H%{F#7c6f64}:%{F#d5c4a1}%M";
+            label-charging = "%{F#98971a}󰚥 %{F#ebdbb2}%percentage%%%{F#d5c4a1} %time%";
+            format-charging = "<ramp-capacity> <label-charging>";
+            label-discharging = "%percentage%%%{F#bdae93} %time%";
             format-discharging = "<ramp-capacity> <label-discharging>";
-            label-full = "%percentage%%";
-            format-full = "󰁹 <label-full>";
-            label-low = "%percentage%%";
-            format-low = "󰂎 <label-low>";
+            label-full = "%{F#d65d0e}󰁹%{F#ebdbb2} %percentage%%";
+            format-full = "<label-full>";
+            label-low = "%{F#d65d0e}󰂎%{F#ebdbb2} %percentage%%";
+            format-low = "<label-low>";
             ramp.capacity = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
+            ramp-capacity-foreground = "#d65d0e";
+
+            ramp-capacity-foreground-0 = "#cc241d";
+            ramp-capacity-foreground-1 = "#cc241d";
+            ramp-capacity-foreground-2 = "#cc241d";
+
+            ramp-capacity-foreground-7 = "#bdae93";
+            ramp-capacity-foreground-8 = "#bdae93";
+            ramp-capacity-foreground-9 = "#bdae93";
           };
 
           "module/date" = {
             type = "internal/date";
             interval = 1;
-            date = "%Y-%m-%d %H:%M:%S";
-            label = "%date%";
-            label-foreground = "\${colors.foreground}";
+            date = "%Y%{F#7c6f64}-%{F#ebdbb2}%m%{F#7c6f64}-%{F#ebdbb2}%d";
+            time = "%H%{F#7c6f64}:%{F#ebdbb2}%M%{F#7c6f64}:%{F#ebdbb2}%S";
+            label = "%{F#d65d0e}󰃭%{F#ebdbb2} %date% %{F#d65d0e}󱑌%{F#ebdbb2} %time%";
           };
 
           "settings" = {
diff --git a/other/scripts/dispatcher.nu b/other/scripts/dispatcher.nu
index f4e9f71..30cc91b 100755
--- a/other/scripts/dispatcher.nu
+++ b/other/scripts/dispatcher.nu
@@ -6,7 +6,7 @@ def main [
 
   let currentnet = ( 
     nmcli -m tabular connection show --active
-    | detect columns
+    | from ssv
     | first
     | get name
     );