Merge branch 'master' of https://github.com/pniedzwiedzinski/dots

14 files changed, 321 insertions, 36 deletions

diff --git a/machines/base.nix b/machines/base.nix
index 75935ec..035ee59 100755
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -16,7 +16,7 @@
     wget vim curl htop file
     stdenv git zip unzip
     dnsutils ripgrep jq
-    any-nix-shell
+    any-nix-shell fd
   ];
 
   console.font = "${pkgs.terminus_font}/share/consolefonts/ter-v22n";
@@ -37,6 +37,8 @@
 
   ## === XDG ===
   environment.variables = rec {
+    PATH = "$HOME/scripts:$PATH";
+
     XDG_CONFIG_HOME = "$HOME/.config";
     XDG_CACHE_HOME = "$HOME/.cache";
     XDG_DATA_HOME = "$HOME/.local/share";
@@ -79,6 +81,7 @@
     syntaxHighlighting.enable = true;
 
     promptInit = ''
+      [ "$(tty)" = "/dev/tty1" ] && startx
       any-nix-shell zsh --info-right | source /dev/stdin
       autoload -U colors && colors
       PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
diff --git a/machines/x220/configuration.nix b/machines/x220/configuration.nix
index c98548f..73c8a59 100644
--- a/machines/x220/configuration.nix
+++ b/machines/x220/configuration.nix
@@ -1,6 +1,7 @@
 { pkgs, lib, ... }:
 
 let
+  signal = pkgs.callPackage ../../pkgs/signal.nix { };
   busybox_utils = pkgs.stdenv.mkDerivation {
     name = "strings";
     unpackPhase = "true";
@@ -24,7 +25,7 @@ in
     ];
 
     boot.plymouth.enable = true;
-    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+    # boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
     networking = {
       hostName = "x220";
@@ -44,11 +45,19 @@ in
       show-trace = true
     '';
 
+    environment.variables = {
+      ELECTRUMDIR="$\{XDG_DATA_HOME:-$HOME/.local/share}/electrum";
+    };
+
+    environment.binsh = "${pkgs.dash}/bin/dash";
+
     environment.systemPackages = with pkgs; [
+      guvcview
+      signal
       usbutils
       discord
     # Basic tools
-    groff file ssh-ident busybox_utils
+    file ssh-ident busybox_utils
 
     # XORG perfs
     dunst
@@ -57,7 +66,7 @@ in
     zathura sxiv pulsemixer
     lynx lf arandr wpa_supplicant_gui
     system-config-printer libreoffice
-    vscodium abook
+    abook
 
     # Audio/Video
     mpd mpc_cli mpv ffmpeg youtube-dl
@@ -66,13 +75,10 @@ in
     gitAndTools.gh docker-compose xsel
     bc libnotify
     pamixer maim killall
-    quickserve ueberzug chafa
+    ueberzug chafa
 
     # Thinkpad utils
-    nur.repos.pn.dockd acpi tpacpi-bat
-
-    wineStaging
-
+    acpi tpacpi-bat
   ];
 
   fonts.fonts = with pkgs; [
@@ -90,8 +96,6 @@ in
   programs.browserpass.enable = true;
   programs.dockd.enable = true;
 
-  virtualisation.anbox.enable = true;
-  programs.adb.enable = true;
 
   virtualisation.docker.enable = true;
   systemd.services.docker.wantedBy = lib.mkForce [];
diff --git a/machines/x220/hardware-configuration.nix b/machines/x220/hardware-configuration.nix
index cf9c47e..d2c7fbc 100755
--- a/machines/x220/hardware-configuration.nix
+++ b/machines/x220/hardware-configuration.nix
@@ -12,8 +12,8 @@
 
   boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" "tp_smapi" "v4l2loopback" ];
-  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback tp_smapi ];
+  boot.kernelModules = [ "kvm-intel" "tp_smapi" "v4l2loopback" "acpi_call" ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback tp_smapi acpi_call ];
 
 
   boot.loader.grub.enable = true;
diff --git a/modules/dockd.nix b/modules/dockd.nix
index 0993e81..e2b5870 100644
--- a/modules/dockd.nix
+++ b/modules/dockd.nix
@@ -18,26 +18,26 @@ in
   };
 
   config = lib.mkIf (cfg.enable) {
+    environment.systemPackages = [ pkgs.nur.repos.pn.dockd ];
     environment.etc = {
       "dockd/docked.conf".text = ''
 [Screen]
 height=1080
-width=3840
-mm_height=311
-mm_width=1041
+width=1920
+mm_height=282
+mm_width=502
 
 [CRTC]
 crtc=63
 x=0
 y=0
 rotation=1
-mode=1920x1080
-outputs_len=1
-outputs_0=HDMI3
+mode=None
+outputs_len=0
 
 [CRTC]
 crtc=64
-x=1920
+x=0
 y=0
 rotation=1
 mode=1920x1080
@@ -51,6 +51,7 @@ y=0
 rotation=1
 mode=None
 outputs_len=0
+
      '';
       "dockd/undocked.conf".text = ''
 [Screen]
diff --git a/modules/internet.nix b/modules/internet.nix
index bb0e554..c24b112 100644
--- a/modules/internet.nix
+++ b/modules/internet.nix
@@ -1,5 +1,12 @@
 ## Basic rules for interacting with the internet
 { pkgs, lib, ... }:
+let
+  blocklist = pkgs.writeText "hosts" ''
+    0.0.0.0 netflix.com
+    0.0.0.0 hbogo.com
+    0.0.0.0 www.facebook.com
+  '';
+in
 {
   # networking.nameservers = lib.mkForce [
   #   "192.168.1.136"
@@ -15,9 +22,12 @@
   '';
 
 
-  networking.extraHosts = pkgs.stdenv.lib.readFile ( pkgs.fetchurl {
-    url = "https://raw.githubusercontent.com/StevenBlack/hosts/d2be343994aacdec74865ff8d159cf6e46359adf/alternates/fakenews-gambling-porn/hosts";
-    sha256 = "1la5rd0znc25q8yd1iwbx22zzqi6941vyzmgar32jx568j856s8j";
-  } );
+  networking.hostFiles = [
+    ( pkgs.fetchurl {
+      url = "https://raw.githubusercontent.com/StevenBlack/hosts/d2be343994aacdec74865ff8d159cf6e46359adf/alternates/fakenews-gambling-porn/hosts";
+      sha256 = "1la5rd0znc25q8yd1iwbx22zzqi6941vyzmgar32jx568j856s8j";
+    } )
+      blocklist
+    ];
 
-}
+  }
diff --git a/modules/larbs.nix b/modules/larbs.nix
index fc94655..6389831 100755
--- a/modules/larbs.nix
+++ b/modules/larbs.nix
@@ -1,9 +1,9 @@
 { pkgs, ... }:
 let
-  xwallpaper_fix = (import (pkgs.fetchTarball {
-    url = "https://github.com/IvarWithoutBones/nixpkgs/archive/xwallpaper-fix.tar.gz";
-    sha256 = "1jdlchn1x5gwdya9blqs85accr82f3y6j50av073d69mm7bfa1mn";
-  }) {}).xwallpaper;
+  xwallpaper = (import (pkgs.fetchzip {
+    url = "https://github.com/nixos/nixpkgs/archive/7138a338b58713e0dea22ddab6a6785abec7376a.zip";
+    sha256 = "sha256:1asgl1hxj2bgrxdixp3yigp7xn25m37azwkf3ppb248vcfc5kil3";
+  }) { }).xwallpaper;
   pnvim = import ../pkgs/nvim.nix pkgs;
   pndwm = import ../pkgs/dwm pkgs;
   pndwmblocks = import ../pkgs/dwmblocks pkgs;
@@ -39,6 +39,8 @@ in
     xwallpaper
     xcompmgr
 
+    nur.repos.pn.groff
+
     playerctl
 
     todos
diff --git a/modules/wayland/alacritty.yml b/modules/wayland/alacritty.yml
new file mode 100644
index 0000000..11e8c0d
--- /dev/null
+++ b/modules/wayland/alacritty.yml
@@ -0,0 +1,59 @@
+window:
+  padding:
+    x: 2
+    y: 8
+
+font:
+  size: 10
+  normal:
+    family: monospace
+    style: Regular
+
+colors:
+  # Default colors
+  primary:
+    background: '#2c2c2c'
+    foreground: '#d6d6d6'
+
+    dim_foreground:    '#dbdbdb'
+    bright_foreground: '#d9d9d9'
+    dim_background:    '#202020' # not sure
+    bright_background: '#3a3a3a' # not sure
+
+  # Cursor colors
+  cursor:
+    text:   '#2c2c2c'
+    cursor: '#d9d9d9'
+
+  # Normal colors
+  normal:
+    black:   '#5c5c8c'
+    red:     '#bc5653'
+    green:   '#909d63'
+    yellow:  '#ebc17a'
+    blue:    '#7eaac7'
+    magenta: '#aa6292'
+    cyan:    '#86d3ce'
+    white:   '#ffffff'
+
+  # Bright colors
+  bright:
+    black:   '#636363'
+    red:     '#bc5653'
+    green:   '#909d63'
+    yellow:  '#ebc17a'
+    blue:    '#7eaac7'
+    magenta: '#aa6292'
+    cyan:    '#86d3ce'
+    white:   '#f7f7f7'
+
+  # Dim colors
+  dim:
+    black:   '#232323'
+    red:     '#74423f'
+    green:   '#5e6547'
+    yellow:  '#8b7653'
+    blue:    '#556b79'
+    magenta: '#6e4962'
+    cyan:    '#5c8482'
+    white:   '#828282'
diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix
new file mode 100644
index 0000000..62a72a1
--- /dev/null
+++ b/modules/wayland/default.nix
@@ -0,0 +1,35 @@
+{pkgs, ...}:
+let
+  terminal = symlinkJoin {
+    name = "alacritty";
+    paths = [ pkgs.alacritty ];
+    buildInputs = [ pkgs.makeWrapper ];
+    postBuild = ''
+      wrapProgram $out/bin/alacritty \
+        --add-flags "--config-file ${./alacritty.yml}"
+    ''
+  };
+  dwl = (pkgs.dwl.overrideDerivation (old: {
+    src = pkgs.fetchFromGitHub {
+      owner = "djpohly";
+      repo = "dwl";
+      rev = "v0.2.1";
+      sha256 = "sha256:0js8xjc2rx1ml6s58s90jrak5n7vh3kj5na2j4yy3qy0cb501xcm";
+    };
+    patches = [];
+  })).override {
+    conf = ./dwl.config.h;
+  };
+in
+  {
+    environment.systemPackages = [
+      pkgs.firefox-wayland
+      terminal
+      dwl
+      pkgs.bemenu
+      pkgs.wl_clipboard
+      pkgs.grim
+      pkgs.slurp
+      pkgs.wf-recorder
+    ];
+  }
diff --git a/modules/wayland/dwl.config.h b/modules/wayland/dwl.config.h
new file mode 100644
index 0000000..3c1fc9b
--- /dev/null
+++ b/modules/wayland/dwl.config.h
@@ -0,0 +1,116 @@
+/* appearance */
+static const int sloppyfocus        = 1;  /* focus follows mouse */
+static const unsigned int borderpx  = 1;  /* border pixel of windows */
+static const float rootcolor[]      = {0.3, 0.3, 0.3, 1.0};
+static const float bordercolor[]    = {0.5, 0.5, 0.5, 1.0};
+static const float focuscolor[]     = {1.0, 0.0, 0.0, 1.0};
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+	/* app_id     title       tags mask     isfloating   monitor */
+	/* examples:
+	{ "Gimp",     NULL,       0,            1,           -1 },
+	{ "firefox",  NULL,       1 << 8,       0,           -1 },
+	*/
+};
+
+/* layout(s) */
+static const Layout layouts[] = {
+	/* symbol     arrange function */
+	{ "[]=",      tile },
+	{ "><>",      NULL },    /* no layout function means floating behavior */
+	{ "[M]",      monocle },
+};
+
+/* monitors
+ * The order in which monitors are defined determines their position.
+ * Non-configured monitors are always added to the left. */
+static const MonitorRule monrules[] = {
+	/* name       mfact nmaster scale layout       rotate/reflect x y */
+	/* example of a HiDPI laptop monitor:
+	{ "eDP-1",    0.5,  1,      2,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0 },
+	*/
+	/* defaults */
+	{ NULL,       0.55, 1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0 },
+};
+
+/* keyboard */
+static const struct xkb_rule_names xkb_rules = {
+	/* can specify fields: rules, model, layout, variant, options */
+	/* example:
+	.options = "ctrl:nocaps",
+	*/
+};
+
+static const int repeat_rate = 25;
+static const int repeat_delay = 600;
+
+/* Trackpad */
+static const int tap_to_click = 1;
+static const int natural_scrolling = 0;
+
+#define MODKEY WLR_MODIFIER_LOGO
+#define TAGKEYS(KEY,SKEY,TAG) \
+	{ MODKEY,                    KEY,            view,            {.ui = 1 << TAG} }, \
+	{ MODKEY|WLR_MODIFIER_CTRL,  KEY,            toggleview,      {.ui = 1 << TAG} }, \
+	{ MODKEY|WLR_MODIFIER_SHIFT, SKEY,           tag,             {.ui = 1 << TAG} }, \
+	{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+static const char *termcmd[] = { "alacritty", NULL };
+static const char *menucmd[] = { "bemenu-run", NULL };
+
+static const Key keys[] = {
+	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
+	/* modifier                  key                 function        argument */
+	{ MODKEY,                    XKB_KEY_d,          spawn,          {.v = menucmd} },
+	{ MODKEY,                    XKB_KEY_Return,     spawn,          {.v = termcmd} },
+	{ MODKEY,                    XKB_KEY_j,          focusstack,     {.i = +1} },
+	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
+	{ MODKEY,                    XKB_KEY_i,          incnmaster,     {.i = +1} },
+	{ MODKEY,                    XKB_KEY_d,          incnmaster,     {.i = -1} },
+	{ MODKEY,                    XKB_KEY_h,          setmfact,       {.f = -0.05} },
+	{ MODKEY,                    XKB_KEY_l,          setmfact,       {.f = +0.05} },
+	{ MODKEY,                    XKB_KEY_Tab,        view,           {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,          killclient,     {0} },
+	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
+	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
+	{ MODKEY,                    XKB_KEY_w,          spawn,     SHCMD("$BROWSER") },
+	{ MODKEY,                    XKB_KEY_space,      zoom,      {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
+	{ MODKEY, 					 XKB_KEY_e,    		togglefullscreen, {0} },
+	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
+	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },
+	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
+	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
+	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
+	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),
+	TAGKEYS(          XKB_KEY_4, XKB_KEY_dollar,                     3),
+	TAGKEYS(          XKB_KEY_5, XKB_KEY_percent,                    4),
+	TAGKEYS(          XKB_KEY_6, XKB_KEY_caret,                      5),
+	TAGKEYS(          XKB_KEY_7, XKB_KEY_ampersand,                  6),
+	TAGKEYS(          XKB_KEY_8, XKB_KEY_asterisk,                   7),
+	TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                  8),
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,          quit,           {0} },
+
+	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
+	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
+#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
+	CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
+	CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
+};
+
+static const Button buttons[] = {
+	{ MODKEY, BTN_LEFT,   moveresize,     {.ui = CurMove} },
+	{ MODKEY, BTN_MIDDLE, togglefloating, {0} },
+	{ MODKEY, BTN_RIGHT,  moveresize,     {.ui = CurResize} },
+};
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"
+  '';
+}
diff --git a/users/pn.nix b/users/pn.nix
index c708105..8feacda 100755
--- a/users/pn.nix
+++ b/users/pn.nix
@@ -17,7 +17,7 @@ in
 
     users.users.pn = {
       isNormalUser = true;
-      extraGroups = [ "wheel" "audio" ];
+      extraGroups = [ "wheel" "video" "audio" ];
     };
 
     home-manager.users.pn = {