about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/dwm/config.h18
-rw-r--r--pkgs/dwmblocks/config.h36
-rw-r--r--pkgs/dwmblocks/default.nix3
-rw-r--r--pkgs/signal.nix10
4 files changed, 61 insertions, 6 deletions
diff --git a/pkgs/dwm/config.h b/pkgs/dwm/config.h
index 7a8b085..ef29169 100644
--- a/pkgs/dwm/config.h
+++ b/pkgs/dwm/config.h
@@ -19,8 +19,8 @@ static const int swallowfloating    = 0;        /* 1 means swallow floating wind
 static const int smartgaps          = 0;        /* 1 means no outer gap when there is only one window */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "monospace:size=10", "JoyPixels:pixelsize=10:antialias=true:autohint=true"  };
-static char dmenufont[]             = "monospace:size=10";
+static const char *fonts[]          = { "monospace:size=11", "JoyPixels:pixelsize=11:antialias=true:autohint=true"  };
+static char dmenufont[]             = "monospace:size=11";
 static char normbgcolor[]           = "#222222";
 static char normbordercolor[]       = "#444444";
 static char normfgcolor[]           = "#bbbbbb";
@@ -46,7 +46,7 @@ static Sp scratchpads[] = {
 };
 
 /* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+static const char *tags[] = { "1", "πŸŒβ‚‚", "πŸ’»β‚ƒ", "πŸ–¨β‚„", "5", "6"," ▢₇", "πŸŽ΅β‚ˆ", "πŸ’¬β‚‰" };
 
 static const Rule rules[] = {
 	/* xprop(1):
@@ -54,12 +54,18 @@ static const Rule rules[] = {
 	 *	WM_NAME(STRING) = title
 	*/
 	/* class    instance      title       	 tags mask    iscentered	isfloating   isterminal  noswallow  monitor */
-	{ "Gimp",     NULL,       NULL,       	    1 << 8,       0,  		  0,           0,         0,        -1 },
+	/* { "Gimp",     NULL,       NULL,       	    1 << 8,       0,  		  0,           0,         0,        -1 }, */
+	{ "Pidgin",     NULL,       NULL,       	    1 << 8,       0,  		  0,           0,         0,        -1 },
+	{ "Brave-browser",     NULL,       NULL,       	    1 << 1,       0,  		  0,           0,         0,        -1 },
+	{ "Spotify",     NULL,       NULL,       	    1 << 7,       0,  		  0,           0,         0,        -1 },
+	{ "mpv",     NULL,       NULL,       	    1 << 6,       0,  		  0,           0,         0,        -1 },
+	{ NULL,     NULL,       "ncmpcpp 0.8.2",       	    1 << 7,       0,  		  0,           0,         0,        -1 },
 	{ TERMCLASS,   NULL,       NULL,       	    0,            0,  		  0,           1,         0,        -1 },
 	{ NULL,       NULL,       "Event Tester",   0,            0,  		  0,           0,         1,        -1 },
 	{ NULL,      "spterm",    NULL,       	    SPTAG(0),     0,  		  1,           1,         0,        -1 },
 	{ NULL,      "spcalc",    NULL,       	    SPTAG(1),     0,  		  1,           1,         0,        -1 },
   { NULL,      "telegram-desktop",  NULL,     0,            1,        1,           0,         0,        -1 },
+  { NULL,      "signal",  NULL,     0,            1,        1,           0,         0,        -1 },
 };
 
 /* layout(s) */
@@ -165,6 +171,7 @@ static Key keys[] = {
 	{ MODKEY,			XK_bracketright,	spawn,		SHCMD("mpc seek +10") },
 	{ MODKEY|ShiftMask,		XK_bracketright,	spawn,		SHCMD("mpc seek +60") },
 	{ MODKEY,			XK_backslash,		spawn,		SHCMD("telegram-desktop") },
+	{ MODKEY|ControlMask,			XK_backslash,		spawn,		SHCMD("signal-desktop") },
 	{ MODKEY|ShiftMask,		XK_backslash,		spawn,		SHCMD("passmenu") },
 
 	{ MODKEY,			XK_a,		spawn,	SHCMD(TERMINAL " -e amfora") },
@@ -226,7 +233,8 @@ static Key keys[] = {
 	{ MODKEY,			XK_F8,		spawn,		SHCMD("mw -Y") },
 	{ MODKEY,			XK_F9,		spawn,		SHCMD("dmenumount") },
 	{ MODKEY,			XK_F10,		spawn,		SHCMD("dmenuumount") },
-	{ MODKEY,			XK_F11,		spawn,		SHCMD("mpv --no-cache --no-osc --no-input-default-bindings --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") },
+	/* { MODKEY,			XK_F11,		spawn,		SHCMD("mpv --no-cache --no-osc --no-input-default-bindings --input-conf=/dev/null --title=webcam $(ls /dev/video[1,4,6,8] | tail -n 1)") }, */
+	{ MODKEY,			XK_F11,		spawn,		SHCMD("guvcview -d /dev/video1 -g none") },
 	{ MODKEY,			XK_F12,		xrdb,		{.v = NULL } },
 	{ MODKEY,			XK_space,	zoom,		{0} },
 	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	{0} },
diff --git a/pkgs/dwmblocks/config.h b/pkgs/dwmblocks/config.h
new file mode 100644
index 0000000..b40020e
--- /dev/null
+++ b/pkgs/dwmblocks/config.h
@@ -0,0 +1,36 @@
+//Modify this file to change what commands output to your statusbar, and recompile using the make command.
+static const Block blocks[] = {
+	/*Icon*/	/*Command*/		/*Update Interval*/	/*Update Signal*/
+	/* {"⌨", "sb-kbselect", 0, 30}, */
+	{"", "cat /tmp/recordingicon 2>/dev/null",	0,	9},
+	{"",	"sb-tasks",	10,	26},
+	{"",	"sb-music",	0,	11},
+	/* {"",	"sb-pacpackages",	0,	8}, */
+	/* {"",	"sb-news",		0,	6}, */
+	/* {"",	"sb-price lbc \"LBRY Token\" πŸ“š",			9000,	22}, */
+	{"",	"sb-price bat \"Basic Attention Token\" 🦁",	9000,	20},
+	/* {"",	"sb-price link \"Chainlink\" πŸ”—",			300,	25}, */
+	/* {"",	"sb-price xmr \"Monero\" πŸ”’",			9000,	24}, */
+	/* {"",	"sb-price eth Ethereum 🍸",	9000,	23}, */
+	{"",	"sb-price btc Bitcoin πŸ’°",				9000,	21},
+	{"",	"sb-torrent",	20,	7},
+	{"",	"sb-memory",	10,	14},
+	{"",	"sb-cpu",		10,	18},
+	/* {"",	"sb-moonphase",	18000,	17}, */
+	{"",	"sb-forecast",	18000,	5},
+	{"",	"sb-mailbox",	180,	12},
+	{"",	"sb-nettraf",	1,	16},
+	{"",	"sb-volume",	0,	10},
+	{"",	"sb-battery",	5,	3},
+	{"",	"sb-clock",	10,	1},
+	{"",	"sb-internet",	5,	4},
+	/* {"",	"sb-help-icon",	0,	15}, */
+};
+
+//Sets delimiter between status commands. NULL character ('\0') means no delimiter.
+static char *delim = " ";
+
+// Have dwmblocks automatically recompile and run when you edit this file in
+// vim with the following line in your vimrc/init.vim:
+
+// autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid dwmblocks & }
diff --git a/pkgs/dwmblocks/default.nix b/pkgs/dwmblocks/default.nix
index d582780..ecc3b5b 100644
--- a/pkgs/dwmblocks/default.nix
+++ b/pkgs/dwmblocks/default.nix
@@ -1,7 +1,8 @@
 pkgs:
   pkgs.nur.repos.pn.dwmblocks.override {
     patches = [
-      ./dwmblocks.diff
+      #./dwmblocks.diff
       # ./dwmblocks-todo.diff
     ];
+    config_h = ./config.h;
   }
diff --git a/pkgs/signal.nix b/pkgs/signal.nix
new file mode 100644
index 0000000..3a45a60
--- /dev/null
+++ b/pkgs/signal.nix
@@ -0,0 +1,10 @@
+{ makeWrapper, symlinkJoin, signal-desktop }:
+symlinkJoin {
+  name = "signal-desktop";
+  paths = [ signal-desktop ];
+  buildInputs = [ makeWrapper ];
+  postBuild = ''
+    wrapProgram $out/bin/signal-desktop \
+      --add-flags "--use-tray-icon"
+  '';
+}