From 720fc3f3d39bc631265e6d80d248a6f8152ee106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 10 Apr 2021 19:02:13 +0100
Subject: [PATCH] refactor to single bar definition block for different
 machines

---
 ...{status-double-bat.toml => i3-status.toml} |  5 +-
 .config/i3/status-single-bat.toml             | 51 -------------------
 nixos/boxes/foureighty/default.nix            |  2 -
 nixos/boxes/skinnyv/default.nix               |  2 -
 nixos/home-other-os.nix                       |  1 -
 nixos/i3/i3.nix                               |  2 +-
 6 files changed, 2 insertions(+), 61 deletions(-)
 rename .config/i3/{status-double-bat.toml => i3-status.toml} (94%)
 delete mode 100644 .config/i3/status-single-bat.toml

diff --git a/.config/i3/status-double-bat.toml b/.config/i3/i3-status.toml
similarity index 94%
rename from .config/i3/status-double-bat.toml
rename to .config/i3/i3-status.toml
index 8e1e342a..2f51f509 100644
--- a/.config/i3/status-double-bat.toml
+++ b/.config/i3/i3-status.toml
@@ -19,7 +19,7 @@ interval = 600
 [[block]]
 block = "cpu"
 interval = 5
-format = "{utilization}% {frequency}GHz"
+format = "{utilization}% {frequency}"
 
 [[block]]
 block = "memory"
@@ -45,9 +45,6 @@ alert = 10.0
 [[block]]
 block = "sound"
 
-[[block]]
-block = "backlight"
-
 [[block]]
 block = "kdeconnect"
 format = "{name}"
diff --git a/.config/i3/status-single-bat.toml b/.config/i3/status-single-bat.toml
deleted file mode 100644
index 30368e32..00000000
--- a/.config/i3/status-single-bat.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-theme = "solarized-dark"
-
-[icons]
-name = "awesome"
-[icons.overrides]
-memory_mem = " "
-cogs = "  "
-
-[[block]]
-block = "time"
-interval = 60
-format = "%R %a %d.%m"
-
-[[block]]
-block = "cpu"
-interval = 5
-format = "{utilization}% {frequency}GHz"
-
-[[block]]
-block = "memory"
-display_type = "memory"
-format_mem = "{Mup}%"
-format_swap = "{SUp}%"
-
-[[block]]
-block = "load"
-interval = 5
-format = "{1m} {5m}"
-
-[[block]]
-block = "disk_space"
-path = "/"
-alias = ""
-info_type = "available"
-unit = "GiB"
-interval = 20
-warning = 20.0
-alert = 10.0
-
-[[block]]
-block = "battery"
-device = "BAT0"
-interval = 10
-format = "{percentage}%"
-
-[[block]]
-block = "temperature"
-collapsed = true
-interval = 10
-format = "{max}° max, {average}° avg"
-
diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix
index 578da8bb..527f8267 100644
--- a/nixos/boxes/foureighty/default.nix
+++ b/nixos/boxes/foureighty/default.nix
@@ -38,8 +38,6 @@
 
     nixpkgs.overlays = config.nixpkgs.overlays;
     nixpkgs.config = config.nixpkgs.config;
-
-    home.file.".config/i3/status.toml".source = ../../../.config/i3/status-double-bat.toml;
   };
   fonts.fontconfig.enable = true;
   programs.steam.enable = true;
diff --git a/nixos/boxes/skinnyv/default.nix b/nixos/boxes/skinnyv/default.nix
index cbbfafbb..5dee9b03 100644
--- a/nixos/boxes/skinnyv/default.nix
+++ b/nixos/boxes/skinnyv/default.nix
@@ -28,8 +28,6 @@
 
     nixpkgs.overlays = config.nixpkgs.overlays;
     nixpkgs.config = config.nixpkgs.config;
-
-    home.file.".config/i3/status.toml".source = ../../../.config/i3/status-single-bat.toml;
   };
 
 }
diff --git a/nixos/home-other-os.nix b/nixos/home-other-os.nix
index 4cb8ca65..ac0c3359 100644
--- a/nixos/home-other-os.nix
+++ b/nixos/home-other-os.nix
@@ -20,7 +20,6 @@ in
 
     targets.genericLinux.enable = true;
     home.file.".gitconfig".source = ~/dev/dotfiles/.gitconfig.linux.form3;
-    home.file.".config/i3/status.toml".source = ~/dev/dotfiles/.config/i3/status-single-bat.toml;
 
     imports = [
       ./home-manager/default.nix
diff --git a/nixos/i3/i3.nix b/nixos/i3/i3.nix
index 737ac132..720b848a 100644
--- a/nixos/i3/i3.nix
+++ b/nixos/i3/i3.nix
@@ -32,7 +32,7 @@ in
             position = "top";
             colors.background = "#002b36";
             fonts = [ "Fira Code Nerd Font 10" ];
-            statusCommand = "${pkgs.unstable.i3status-rust}/bin/i3status-rs ${config.xdg.configHome}/i3/status.toml";
+            statusCommand = "${pkgs.unstable.i3status-rust}/bin/i3status-rs $HOME/dev/dotfiles/.config/i3/i3-status.toml";
             trayOutput = "primary";
           }
         ];