From 9a5439c21c565115d8a6a659ab8274be2c797c10 Mon Sep 17 00:00:00 2001
From: Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>
Date: Mon, 21 Dec 2020 13:03:50 +0100
Subject: Add pndwmblocks

---
 machines/base.nix             |  1 +
 modules/larbs.nix             |  6 ++++--
 pkgs/dwmblocks/default.nix    |  2 +-
 pkgs/dwmblocks/dwmblocks.diff | 21 +++++++++++++++------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/machines/base.nix b/machines/base.nix
index 0d204b3..52a32b5 100755
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -20,6 +20,7 @@
   console.font = "${pkgs.terminus_font}/share/consolefonts/ter-v22n";
 
   environment.shellAliases = {
+    cf = "cd /etc/nixos/dots";
     gs = "git status";
     gc = "git commit";
     ga = "git add";
diff --git a/modules/larbs.nix b/modules/larbs.nix
index 8e76006..993776c 100755
--- a/modules/larbs.nix
+++ b/modules/larbs.nix
@@ -2,7 +2,7 @@
 let
   pnvim = import ../pkgs/nvim.nix pkgs;
   pndwm = import ../pkgs/dwm pkgs;
-  # pndwmblocks = import ../pkgs/dwmblocks pkgs;
+  pndwmblocks = import ../pkgs/dwmblocks pkgs;
   todos = import ../pkgs/dwmblocks/todos.nix pkgs;
   larbs-packages = with pkgs.nur.repos.pn; [
     pnvim
@@ -11,7 +11,7 @@ let
     larbs-music
     dmenu
     pndwm
-    dwmblocks
+    pndwmblocks
     larbs-scripts
     st
   ];
@@ -29,6 +29,8 @@ in
     maim
     xclip
     xdotool
+    lm_sensors
+    mpc_cli
 
     todos
     brave
diff --git a/pkgs/dwmblocks/default.nix b/pkgs/dwmblocks/default.nix
index ad749a4..d582780 100644
--- a/pkgs/dwmblocks/default.nix
+++ b/pkgs/dwmblocks/default.nix
@@ -2,6 +2,6 @@ pkgs:
   pkgs.nur.repos.pn.dwmblocks.override {
     patches = [
       ./dwmblocks.diff
-      ./dwmblocks-todo.diff
+      # ./dwmblocks-todo.diff
     ];
   }
diff --git a/pkgs/dwmblocks/dwmblocks.diff b/pkgs/dwmblocks/dwmblocks.diff
index 4274c90..f205133 100644
--- a/pkgs/dwmblocks/dwmblocks.diff
+++ b/pkgs/dwmblocks/dwmblocks.diff
@@ -1,15 +1,24 @@
 diff --git a/config.h b/config.h
-index cc9281b..3df46fc 100644
+index 18b287b..9361f4a 100644
 --- a/config.h
 +++ b/config.h
-@@ -5,11 +5,11 @@ static const Block blocks[] = {
- 	/* {"",	"price btc Bitcoin 💰",				0,	21}, */
- 	/* {"",	"price lbc \"LBRY Token\" 📚",			0,	22}, */
- 	{"",	"torrent",	20,	7},
+@@ -3,7 +3,7 @@ static const Block blocks[] = {
+ 	/*Icon*/	/*Command*/		/*Update Interval*/	/*Update Signal*/
+ 	/* {"⌨", "kbselect", 0, 30}, */
+ 	{"", "cat /tmp/recordingicon 2>/dev/null",	0,	9},
+-	/* {"",	"music",	0,	11}, */
++	{"",	"music",	0,	11},
+ 	{"",	"pacpackages",	0,	8},
+ 	{"",	"news",		0,	6},
+ 	/* {"",	"crypto",	0,	13}, */
+@@ -14,8 +14,8 @@ static const Block blocks[] = {
+ 	/* {"",	"price eth Ethereum 🍸",	9000,	23}, */
+ 	/* {"",	"price btc Bitcoin 💰",				9000,	21}, */
+ 	/* {"",	"torrent",	20,	7}, */
 -	/* {"",	"memory",	10,	14}, */
 -	/* {"",	"cpu",		10,	18}, */
 +	{"",	"memory",	10,	14},
 +	{"",	"cpu",		10,	18},
  	/* {"",	"moonphase",	18000,	17}, */
- 	{"",	"weather",	18000,	5},
+ 	{"",	"forecast",	18000,	5},
  	{"",	"mailbox",	180,	12},
-- 
cgit 1.4.1