From 3147727b7792a1c683e47c21725a44274eff6d9f Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Mon, 11 May 2020 06:39:22 +0200
Subject: [PATCH] Switch from SDDM to LightDM and fix Wireguard

---
 modules/gui.nix        | 18 ++++++++----------
 modules/networking.nix | 14 +++++---------
 modules/software.nix   | 10 +++++++++-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/modules/gui.nix b/modules/gui.nix
index 743d6cb..eb6c69c 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -5,7 +5,7 @@
   services.xserver.enable = true;
   services.xserver.displayManager = {
     defaultSession = "sway";
-    sddm = {
+    lightdm = {
       enable = true;
       autoLogin = {
         enable = true;
@@ -34,8 +34,6 @@
       kitty
     ];
     extraSessionCommands = ''
-      export MOZ_ENABLE_WAYLAND=1
-      export MOZ_DBUS_REMOTE=1
       export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots
       export _JAVA_AWT_WM_NONREPARENTING=1
       export QT_QPA_PLATFORM=wayland
@@ -48,21 +46,21 @@
   programs.light.enable = true;
 
   # Blue light filter
+  location = {
+    latitude = 35.89;
+    longitude = -5.32;
+    provider = "manual";
+  };
+
   services.redshift = {
     package = pkgs.redshift-wlr;
     enable = true;
     temperature = {
       day = 6500;
-      night = 5000;
+      night = 5300;
     };
   };
 
-  location = {
-    latitude = 35.89;
-    longitude = -5.32;
-    provider = "manual";
-  };
-
   # Bar
   programs.waybar.enable = true;
 
diff --git a/modules/networking.nix b/modules/networking.nix
index 4485543..73028ce 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,18 +1,13 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
-    avahi
-    wireguard
-  ];
+  environment.systemPackages = with pkgs; [ avahi wireguard ];
 
   # Set hostname and hostid
   networking = {
     hostName = "panacea";
     hostId = "8feb0bb8";
-    wireless = {
-      enable = true;
-    };
+    wireless.enable = true;
   };
 
   # Enable zeroconf
@@ -22,10 +17,11 @@
   };
 
   # Wireguard setup
-  networking.wireguard.interfaces = {
+  networking.wg-quick.interfaces = {
     wg0 = {
-      ips = [ "10.8.0.4/32" ];
+      address = [ "10.8.0.4/32" ];
       privateKeyFile = "/home/coolneng/.wg/keys/privatekey";
+      dns = [ "198.100.148.224" "151.80.222.79" ];
       peers = [
         # zion
         {
diff --git a/modules/software.nix b/modules/software.nix
index bcac804..79f08c5 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -11,7 +11,7 @@
     passff-host
     gitAndTools.pass-git-helper
     # Browsers
-    (firefox.override { extraNativeMessagingHosts = [ passff-host ]; })
+    (firefox-wayland.override { extraNativeMessagingHosts = [ passff-host ]; })
     chromium
     # LaTeX
     texlive.combined.scheme-full
@@ -33,8 +33,16 @@
     lorri
     nixfmt
     # Rice
+    gtk_engines
     adapta-gtk-theme
     paper-icon-theme
+    # Audio
+    mopidy
+    ncmpcpp
+    # Productivity
+    fff
+    zathura
+    libreoffice
   ];
 
   # Fonts declaration