From df825e3f4c04ca1c8b18c4503af8a2b00da02f2e Mon Sep 17 00:00:00 2001
From: Chris Josten <chris@netsoj.nl>
Date: Wed, 27 May 2020 22:21:35 +0200
Subject: [PATCH] Added printing and bluetooth support

---
 common/console.nix          | 1 +
 common/devel/pkgs.nix       | 2 ++
 common/gui/default.nix      | 8 +++++++-
 common/gui/pkgs.nix         | 7 +++++++
 overlays/default.nix        | 2 +-
 specific/laptop/default.nix | 5 ++++-
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/common/console.nix b/common/console.nix
index 3a7ddf8..64ce121 100644
--- a/common/console.nix
+++ b/common/console.nix
@@ -6,4 +6,5 @@
   ];
   nixpkgs.config.allowUnfree = true;
   services.openssh.enable = true;
+  environment.variables.EDITOR = "nvim";
 }
diff --git a/common/devel/pkgs.nix b/common/devel/pkgs.nix
index 40c0f9e..82ad8a9 100644
--- a/common/devel/pkgs.nix
+++ b/common/devel/pkgs.nix
@@ -11,10 +11,12 @@
       gcc
       cmake
       gnumake
+      llvmPackages.bintools
       ninja
       pkgconfig
       qtcreator
       qt5.full
+      zlib
       
       # Java
       gradle
diff --git a/common/gui/default.nix b/common/gui/default.nix
index 1bd729d..b7ec861 100644
--- a/common/gui/default.nix
+++ b/common/gui/default.nix
@@ -1,5 +1,5 @@
 # Defines comfig for a "gui" system, in most cases a Desktop or Laptop
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [ ./pkgs.nix ];
@@ -37,4 +37,10 @@
   services.syncthing.user = "chris";
   services.syncthing.configDir = "/home/chris/.config/syncthing";
   services.syncthing.dataDir = "/home/chris";
+
+  # Printing
+  services.printing.enable = true;
+  services.printing.drivers = [ pkgs.gutenprint ];
+  services.avahi.enable = true;
+  services.avahi.nssmdns = true;
 }
diff --git a/common/gui/pkgs.nix b/common/gui/pkgs.nix
index 77629ba..d6fc018 100644
--- a/common/gui/pkgs.nix
+++ b/common/gui/pkgs.nix
@@ -40,17 +40,24 @@
       latte-dock # My PC has enough RAM by now
       kdeApplications.kleopatra
       kdeApplications.korganizer
+      kdeFrameworks.qqc2-desktop-style # Makes QtQuick applications look like desktop ones
       okular
       packagekit
       packagekit-qt
       plasma-desktop
       plasma-integration
+      # plasma5
+      plasma5.polkit-kde-agent
+      plasma5.powerdevil
       plasma5.sddm-kcm
+      plasma5.user-manager
       plasma5.xdg-desktop-portal-kde
       my.plasma-applet-window-buttons
       my.sddm-nx
       sddm
       kdeApplications.spectacle
+      
+      cantata
 
       # To show of your distro
       neofetch
diff --git a/overlays/default.nix b/overlays/default.nix
index 2414800..49702de 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -9,7 +9,7 @@ rec {
   latte-dock = super.latte-dock.overrideAttrs (oldAttrs: rec{
     src = fetchGit {
       url = https://invent.kde.org/plasma/latte-dock.git;
-      rev = "3c73bff0ac983625f31ec2ed9bc388221e778e75";
+      rev = "84a5eecf7903a53ef914576c24cdbb31e7be09d7";
     };
   });
 }
diff --git a/specific/laptop/default.nix b/specific/laptop/default.nix
index 1054357..4c069cb 100644
--- a/specific/laptop/default.nix
+++ b/specific/laptop/default.nix
@@ -1,4 +1,4 @@
-{config, ...}:
+{config, pkgs,  ...}:
 
 {
   imports = [
@@ -10,4 +10,7 @@
   ];
   
   networking.hostName = "nix-te-vinden"; 
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.package = pkgs.bluezFull;
+  hardware.pulseaudio.package = pkgs.pulseaudioFull;
 }