about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>2021-04-20 09:26:23 +0200
committerPatryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>2021-04-20 09:26:23 +0200
commit49487eefca4e92e4d83e2cae2d91e8d5517a9e0c (patch)
tree49fb490c0d42ee9f80cb87074abec416cfa39e01
parent167733884d9e80b56ce168d45c08404bc4aabe5b (diff)
downloaddots-49487eefca4e92e4d83e2cae2d91e8d5517a9e0c.tar.gz
dots-49487eefca4e92e4d83e2cae2d91e8d5517a9e0c.zip
Updates
-rw-r--r--modules/internet.nix20
-rw-r--r--pkgs/dwm/config.h7
-rwxr-xr-xusers/pn.nix2
3 files changed, 22 insertions, 7 deletions
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/pkgs/dwm/config.h b/pkgs/dwm/config.h
index 20cf0c2..ef29169 100644
--- a/pkgs/dwm/config.h
+++ b/pkgs/dwm/config.h
@@ -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):
@@ -56,6 +56,10 @@ static const Rule rules[] = {
 	/* class    instance      title       	 tags mask    iscentered	isfloating   isterminal  noswallow  monitor */
 	/* { "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 },
@@ -167,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") },
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 = {