UltraNav keyboard - use Alt

4 files changed, 26 insertions, 12 deletions

diff --git a/modules/larbs.nix b/modules/larbs.nix
index 7a3d737..e27c8a3 100755
--- a/modules/larbs.nix
+++ b/modules/larbs.nix
@@ -27,6 +27,12 @@ in
     ./slock.nix
   ];
 
+  gtk.iconCache.enable = true;
+
+  environment.shellAliases = {
+    cmus = "screen -q -r -D cmus || screen -S cmus /run/current-system/sw/bin/cmus";
+  };
+
   environment.systemPackages = with pkgs; [
     ## Scripts utils
     #TODO: move to larbs-scripts
@@ -38,9 +44,15 @@ in
     python3Packages.pywal
     xwallpaper
     xcompmgr
+    screen
+
+    cmus
 
     nur.repos.pn.groff
 
+    hicolor-icon-theme
+    gnome3.adwaita-icon-theme
+
     playerctl
 
     todos
diff --git a/pkgs/dwm/config.h b/pkgs/dwm/config.h
index ef29169..41928c4 100644
--- a/pkgs/dwm/config.h
+++ b/pkgs/dwm/config.h
@@ -93,7 +93,7 @@ static const Layout layouts[] = {
 };
 
 /* key definitions */
-#define MODKEY Mod4Mask
+#define MODKEY Mod1Mask
 #define TAGKEYS(KEY,TAG) \
 	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
 	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
@@ -102,7 +102,7 @@ static const Layout layouts[] = {
 #define STACKKEYS(MOD,ACTION) \
 	{ MOD,	XK_j,	ACTION##stack,	{.i = INC(+1) } }, \
 	{ MOD,	XK_k,	ACTION##stack,	{.i = INC(-1) } }, \
-	{ MOD,  XK_v,   ACTION##stack,  {.i = 0 } }, \
+	/* { MOD,  XK_v,   ACTION##stack,  {.i = 0 } }, \ */
 	/* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */
 	/* { MOD, XK_a,     ACTION##stack, {.i = 1 } }, \ */
 	/* { MOD, XK_z,     ACTION##stack, {.i = 2 } }, \ */
@@ -198,8 +198,8 @@ static Key keys[] = {
 	/* { MODKEY|ShiftMask,		XK_z,		spawn,		SHCMD("") }, */
 	{ MODKEY,			XK_x,		incrgaps,	{.i = -3 } },
 	/* { MODKEY|ShiftMask,		XK_x,		spawn,		SHCMD("") }, */
-	{ MODKEY,			XK_c,		spawn,		SHCMD("Discord") },
-	{ MODKEY|ShiftMask,		XK_c,		spawn,		SHCMD("caffeine") },
+	/* { MODKEY,			XK_c,		spawn,		SHCMD("Discord") }, */
+	/* { MODKEY|ShiftMask,		XK_c,		spawn,		SHCMD("caffeine") }, */
 	/* V is automatically bound above in STACKKEYS */
 	{ MODKEY,			XK_b,		togglebar,	{0} },
 	{ MODKEY|ShiftMask,		XK_b,		spawn,	SHCMD("y2mpv") },
@@ -212,10 +212,10 @@ static Key keys[] = {
 	{ MODKEY,			XK_period,	spawn,		SHCMD("mpc next") },
 	{ MODKEY|ShiftMask,		XK_period,	spawn,		SHCMD("mpc repeat") },
 
-	{ MODKEY,			XK_Left,	focusmon,	{.i = -1 } },
-	{ MODKEY|ShiftMask,		XK_Left,	tagmon,		{.i = -1 } },
-	{ MODKEY,			XK_Right,	focusmon,	{.i = +1 } },
-	{ MODKEY|ShiftMask,		XK_Right,	tagmon,		{.i = +1 } },
+	/* { MODKEY|ControlMask,			XK_Left,	focusmon,	{.i = -1 } }, */
+	/* { MODKEY|ShiftMask,		XK_Left,	tagmon,		{.i = -1 } }, */
+	/* { MODKEY|ControlMask,			XK_Right,	focusmon,	{.i = +1 } }, */
+	/* { MODKEY|ShiftMask,		XK_Right,	tagmon,		{.i = +1 } }, */
 
 	{ MODKEY,			XK_Page_Up,	shiftview,	{ .i = -1 } },
 	{ MODKEY|ShiftMask,		XK_Page_Up,	shifttag,	{ .i = -1 } },
diff --git a/pkgs/dwmblocks/config.h b/pkgs/dwmblocks/config.h
index b40020e..68a6705 100644
--- a/pkgs/dwmblocks/config.h
+++ b/pkgs/dwmblocks/config.h
@@ -7,17 +7,17 @@ static const Block blocks[] = {
 	{"",	"sb-music",	0,	11},
 	/* {"",	"sb-pacpackages",	0,	8}, */
 	/* {"",	"sb-news",		0,	6}, */
-	/* {"",	"sb-price lbc \"LBRY Token\" 📚",			9000,	22}, */
+	{"",	"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 xmr \"Monero\" 🔒",			9000,	24},
 	/* {"",	"sb-price eth Ethereum 🍸",	9000,	23}, */
-	{"",	"sb-price btc Bitcoin 💰",				9000,	21},
+	/* {"",	"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-forecast",	18000,	5}, */
 	{"",	"sb-mailbox",	180,	12},
 	{"",	"sb-nettraf",	1,	16},
 	{"",	"sb-volume",	0,	10},
diff --git a/users/pn.nix b/users/pn.nix
index 8feacda..034ce78 100755
--- a/users/pn.nix
+++ b/users/pn.nix
@@ -27,6 +27,8 @@ in
         # ../platforms/linux/gtk.nix
       ];
 
+      gtk.enable = true;
+
       xsession = {
         enable = true;
         windowManager.command = "dbus-run-session -- dwm";