From 2000d68b07477d0f310352e6529aee8b444a45a8 Mon Sep 17 00:00:00 2001
From: zoe <ZoeOosting@outlook.com>
Date: Sun, 19 Mar 2023 13:30:09 +0100
Subject: [PATCH] no more polybar

---
 home.nix           |   2 +-
 i3/mainbar.nix     |   5 ++-
 polybar/config.nix | 101 ---------------------------------------------
 sync.sh            |   3 +-
 user.nix           |   1 -
 5 files changed, 6 insertions(+), 106 deletions(-)
 delete mode 100644 polybar/config.nix

diff --git a/home.nix b/home.nix
index 23ebdbe..ca028f2 100644
--- a/home.nix
+++ b/home.nix
@@ -12,7 +12,7 @@ in
     ./rofi/settings.nix
     ./i3/i3status-rust.nix
     ./dunst/settings.nix
-    ./polybar/config.nix
+    # ./polybar/config.nix
     # ./hyprland/settings.nix
     # ./waybar/settings.nix
   ];
diff --git a/i3/mainbar.nix b/i3/mainbar.nix
index 2d7bec5..a20564a 100644
--- a/i3/mainbar.nix
+++ b/i3/mainbar.nix
@@ -4,6 +4,9 @@
       block = "music";
       format = "$play $player {$combo.str(max_w:25,rot_interval:0.5)|}";
     };
+    pomodoro = {
+      block = "pomodoro";
+    };
   in
 {
   home-manager.users.zoe.programs.i3status-rust.bars.main = {
@@ -45,7 +48,7 @@
         format = "{percentage}";
         interval = 120;
       }
-
+      pomodoro
       # time
       {
         block = "time";
diff --git a/polybar/config.nix b/polybar/config.nix
deleted file mode 100644
index 8b62c02..0000000
--- a/polybar/config.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ pkgs, config, ... }:
-let
-  radius = 0;
-  padding = 1;
-  font = "${config.font.mono}:size=12";
-  color_active = "#${config.color.green}";
-  color_inactive = "#${config.color.cyan}";
-  color_evil = "#${config.color.red}";
-  color_bg = "#${config.color.background}";
-  color_fg = "#${config.color.foreground}";
-in
-{
-  home-manager.users.zoe.services.polybar = {
-    enable = true;
-    script = "polybar main &";
-    package = pkgs.unstable.polybarFull;
-    config = {
-      "bar/main" = {
-        "font-0" = font;
-        width = "100%";
-        radius = radius;
-        module-margin = padding;
-        foreground = color_fg;
-        background = color_bg;
-        modules-left = [ "i3" ];
-        modules-right = [
-          "mic"
-          "wifi"
-          "mullvad"
-          "battery"
-          "date"
-        ];
-      };
-      "module/date" = {
-        type = "internal/date";
-        inteval = 1;
-        date = "%a %d.%m";
-        time = "%H:%M:%S";
-        label = " %date%  %time%";
-        label-foreground = color_inactive;
-      };
-      "module/i3" = {
-        type = "internal/i3";
-        "label-focused-foreground" = color_active;
-        "label-unfocused-foreground" = color_inactive;
-        "label-urgent-foreground" = color_evil;
-      };
-      "module/battery" = {
-        type = "internal/battery";
-        battery = "BAT1";
-        full-at = 70;
-        low-at = 30;
-        poll-interval = 60;
-
-        format-charging = "<animation-charging> <label-charging>";
-        format-full = "<ramp-capacity> <label-full>";
-        format-discharging = "<ramp-capacity> <label-discharging>";
-        format-low = "<ramp-capacity> <label-low>";
-        
-        label-full = "";
-        label-low = "%percentage_raw%%";
-        label-charging = "%percentage_raw%%";
-        label-discharging = "%percentage_raw%%";
-
-        format-full-foreground = color_active;
-        format-charging-foreground = color_active;
-        format-discharging-foreground = color_inactive;
-
-        ramp-capacity-0 = "󱃍";
-        ramp-capacity-1 = "󰁺";
-        ramp-capacity-2 = "󰁻";
-        ramp-capacity-3 = "󰁼";
-        ramp-capacity-4 = "󰁽";
-        ramp-capacity-5 = "󰁾";
-        ramp-capacity-6 = "󰁿";
-        ramp-capacity-7 = "󰂀";
-        ramp-capacity-8 = "󰂁";
-        ramp-capacity-9 = "󰂂";
-        ramp-capacity-10 = "󰁹";
-        
-        animation-charging-0 = "󰢜";
-        animation-charging-1 = "󰂅";
-      };
-      "module/mic" = {
-        type = "internal/alsa";
-        # master-mixer = "Capture";
-      };
-      "module/wifi" = {
-        type = "internal/network";
-        interface-type = "wireless";
-        interval = 5;
-
-      };
-      "module/mullvad" = {
-        type = "internal/network";
-        interface = "wg-mullvad";
-        interval = 5;
-      };
-    };
-  };
-}
diff --git a/sync.sh b/sync.sh
index 0224fb3..2af5950 100755
--- a/sync.sh
+++ b/sync.sh
@@ -7,10 +7,9 @@ git pull
 # cp -r /etc/nixos/ ./backup
 
 # copy over all the files to /etc/nixos/
-sudo cp -ru ./flake.nix ./configuration.nix ./wallpaper.png ./dunst ./helix ./rofi ./i3 ./fish ./kitty ./polybar ./nvim/ ./disks.nix ./variables.nix ./programs.nix ./defaults.nix ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/
+sudo cp -ru ./flake.nix ./configuration.nix ./wallpaper.png ./dunst ./helix ./rofi ./i3 ./fish ./kitty ./nvim/ ./disks.nix ./variables.nix ./programs.nix ./defaults.nix ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/
 
 cp -u ./.xinitrc $HOME
-cp -ur ./cursors $HOME/.local/share/icons
 
 # build penrose and copy it to nixos folder
 # cd ./penrose
diff --git a/user.nix b/user.nix
index 26392bc..a74d34f 100644
--- a/user.nix
+++ b/user.nix
@@ -72,7 +72,6 @@
       arandr
       lxappearance
       wacomtablet
-      polybarFull
 
       # terminal
       kitty