From b3fb5fe4913d09070b12589fbf0b4b8b26e3ac12 Mon Sep 17 00:00:00 2001
From: Chris Josten <chris@netsoj.nl>
Date: Mon, 18 May 2020 13:40:41 +0200
Subject: [PATCH] Added half-baked Syncthing, added pihole

---
 common/console.nix                 |  1 +
 common/devel/pkgs.nix              |  1 +
 common/gui/default.nix             | 10 +++++++++-
 common/gui/pkgs.nix                |  5 ++++-
 common/networking-home/default.nix |  1 +
 overlays/nx-sddm.nix               |  2 +-
 6 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/console.nix b/common/console.nix
index 977e19c..3a7ddf8 100644
--- a/common/console.nix
+++ b/common/console.nix
@@ -5,4 +5,5 @@
     ./pkgs/console-core.nix 
   ];
   nixpkgs.config.allowUnfree = true;
+  services.openssh.enable = true;
 }
diff --git a/common/devel/pkgs.nix b/common/devel/pkgs.nix
index 728fb27..40c0f9e 100644
--- a/common/devel/pkgs.nix
+++ b/common/devel/pkgs.nix
@@ -5,6 +5,7 @@
     systemPackages = with pkgs; [
       # General
       git
+      socat
       # C/C++
       bison
       gcc
diff --git a/common/gui/default.nix b/common/gui/default.nix
index 0772d1d..1bd729d 100644
--- a/common/gui/default.nix
+++ b/common/gui/default.nix
@@ -18,7 +18,6 @@
   hardware.pulseaudio.enable = true;
 
   # Additional services
-  services.syncthing.enable = true;
   services.flatpak.enable = true;
   xdg.portal.enable = true;
   xdg.portal.gtkUsePortal = true;
@@ -28,5 +27,14 @@
     synaptics.tapButtons = false;
     libinput.enable = true;
   };
+
+  # PulseAUdio networking
+  hardware.pulseaudio.tcp.enable = true;
+  hardware.pulseaudio.zeroconf.discovery.enable = true;
   
+  # Syncthing
+  services.syncthing.enable = true;
+  services.syncthing.user = "chris";
+  services.syncthing.configDir = "/home/chris/.config/syncthing";
+  services.syncthing.dataDir = "/home/chris";
 }
diff --git a/common/gui/pkgs.nix b/common/gui/pkgs.nix
index d4385b4..baa27a7 100644
--- a/common/gui/pkgs.nix
+++ b/common/gui/pkgs.nix
@@ -7,8 +7,10 @@
       firefox
       keepassxc
       riot-desktop
-      syncthing
       qsyncthingtray
+
+      # Spelling
+      hunspell
       
       # Wire(less) internet support
       dnsmasq
@@ -34,6 +36,7 @@
       kdeApplications.kmailtransport
       kdeApplications.knotes
       kdeApplications.kolourpaint
+      kdeApplications.kontact
       latte-dock # My PC has enough RAM by now
       kdeApplications.kleopatra
       kdeApplications.korganizer
diff --git a/common/networking-home/default.nix b/common/networking-home/default.nix
index f8a7004..67dce3b 100644
--- a/common/networking-home/default.nix
+++ b/common/networking-home/default.nix
@@ -3,6 +3,7 @@
 {
   networking = {
     # PiHole
+    nameservers = ["192.168.178.151"];
     networkmanager.insertNameservers = ["192.168.178.151"];
   };
 }
diff --git a/overlays/nx-sddm.nix b/overlays/nx-sddm.nix
index 133b8af..a793072 100644
--- a/overlays/nx-sddm.nix
+++ b/overlays/nx-sddm.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
 	name = "nx-sddm";
     src = fetchGit {
       url = https://githee.netsoj.nl/chris-config/sddm-nx.git;
-      rev ="636e786f88d2e9838c8096465d8b4e9b3b0914aa";
+      rev ="bf79c1c1ee8af4966b0d756efcee4d8499d762de";
       #sha256 = "1nwfisz13y2pfkrnxlkrqp1j546m1na9bkdrd0khm5ilb71d7win";
     };
     installPhase = ''