From 189cf2bffcf7dec7c7bcadab8f95fdd2da4bcca5 Mon Sep 17 00:00:00 2001
From: Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>
Date: Sun, 7 Mar 2021 14:49:46 +0100
Subject: XDG + new lan

---
 modules/dockd.nix     |  8 ++++----
 modules/internet.nix  | 22 +++++++++++++++-------
 modules/pulseaudio.pa |  6 +++---
 3 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'modules')

diff --git a/modules/dockd.nix b/modules/dockd.nix
index d8a1582..0993e81 100644
--- a/modules/dockd.nix
+++ b/modules/dockd.nix
@@ -21,15 +21,15 @@ in
     environment.etc = {
       "dockd/docked.conf".text = ''
 [Screen]
-height=1180
-width=3940
+height=1080
+width=3840
 mm_height=311
 mm_width=1041
 
 [CRTC]
 crtc=63
 x=0
-y=100
+y=0
 rotation=1
 mode=1920x1080
 outputs_len=1
@@ -37,7 +37,7 @@ outputs_0=HDMI3
 
 [CRTC]
 crtc=64
-x=2020
+x=1920
 y=0
 rotation=1
 mode=1920x1080
diff --git a/modules/internet.nix b/modules/internet.nix
index dedc269..bb0e554 100644
--- a/modules/internet.nix
+++ b/modules/internet.nix
@@ -1,15 +1,23 @@
 ## Basic rules for interacting with the internet
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
-  networking.nameservers = [
-    "1.1.1.1"
-    "8.8.8.8"
-  ];
+  # networking.nameservers = lib.mkForce [
+  #   "192.168.1.136"
+  #   "1.1.1.1"
+  #   "8.8.8.8"
+  # ];
+
+  environment.etc."resolv.conf".text = ''
+    nameserver 192.168.1.136
+    nameserver 1.1.1.1
+    nameserver 8.8.8.8
+    options edns0
+  '';
 
 
   networking.extraHosts = pkgs.stdenv.lib.readFile ( pkgs.fetchurl {
-    url = "https://raw.githubusercontent.com/StevenBlack/hosts/5a5016ab5bf0166e004147cb49ccd0114ed29b72/alternates/fakenews-gambling-porn/hosts";
-    sha256 = "1c60fyzxz89bic6ymcvb8fcanyxpzr8v2z5vixxr79d8mj0vjswm";
+    url = "https://raw.githubusercontent.com/StevenBlack/hosts/d2be343994aacdec74865ff8d159cf6e46359adf/alternates/fakenews-gambling-porn/hosts";
+    sha256 = "1la5rd0znc25q8yd1iwbx22zzqi6941vyzmgar32jx568j856s8j";
   } );
 
 }
diff --git a/modules/pulseaudio.pa b/modules/pulseaudio.pa
index a4c2c0b..deb25e6 100755
--- a/modules/pulseaudio.pa
+++ b/modules/pulseaudio.pa
@@ -65,9 +65,9 @@ load-module module-bluetooth-discover
 .endif
 
 ### Load several protocols
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
+###.ifexists module-esound-protocol-unix.so
+###load-module module-esound-protocol-unix
+###.endif
 load-module module-native-protocol-unix
 
 ### Network access (may be configured with paprefs, so leave this commented
-- 
cgit 1.4.1