From 903ad983139229ea5abb69fd73c137ff46fee7df Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Sun, 29 May 2022 13:39:17 +0200
Subject: [PATCH] small fixes

---
 flake.nix                         |  7 +++++--
 hosts/microwave/configuration.nix | 28 +---------------------------
 modules/wireguard.nix             |  6 +++---
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/flake.nix b/flake.nix
index d570cc9..109e0d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,10 @@
 
   inputs = {
     nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
-    sops-nix.url = github:Mic92/sops-nix;
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+    sops-nix = {
+      url = github:Mic92/sops-nix;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     microvm = {
       url = github:astro/microvm.nix;
       inputs.nixpkgs.follows = "nixpkgs";
@@ -18,6 +20,7 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./hosts/microwave/configuration.nix
+          ./hosts/microwave/hardware-configuration.nix
           ./modules/graphical.nix
           ./modules/hw-accel-intel.nix
           ./modules/kernel-latest.nix
diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix
index 7020447..9359ac7 100644
--- a/hosts/microwave/configuration.nix
+++ b/hosts/microwave/configuration.nix
@@ -5,11 +5,6 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
   # SWAP
   zramSwap = {
     enable = true;
@@ -24,9 +19,8 @@
     gimp
     inkscape
   ];
-  networking.firewall.enable = true;
-  services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
 
+  networking.firewall.enable = true;
   networking = {
     hostName = "microwave"; # Define your hostname.
     networkmanager.enable = true;
@@ -55,26 +49,6 @@
   hardware.cpu.intel.updateMicrocode = true;
   hardware.enableAllFirmware = true;
 
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
-
-  # Enable touchpad support.
-  services.xserver.libinput = {
-    enable = true;
-    touchpad = {
-    disableWhileTyping = true;
-    naturalScrolling = true;
-    scrollMethod = "twofinger";
-    tapping = true;
-    accelProfile = "adaptive";
-    # clickMethod = "clickfinger";
-  };
-  };
-
   # Shell config (bash)
   programs.bash = {
     enableCompletion = true;
diff --git a/modules/wireguard.nix b/modules/wireguard.nix
index 728f291..9a01f74 100644
--- a/modules/wireguard.nix
+++ b/modules/wireguard.nix
@@ -3,7 +3,7 @@
 {
   networking.wg-quick.interfaces = {
     wg-zw = {
-      privateKeyFile="/root/zw-wg-key";
+      privateKeyFile="/etc/wg/zw-wg-key";
       address = ["172.20.76.226" ];
       dns = [ "172.20.73.8" ];
       peers = [
@@ -15,7 +15,7 @@
       ];
     };
     wg-dvb = {
-      privateKeyFile = "/root/wg-dvb";
+      privateKeyFile="/etc/wg/wg-dvb";
       address = [ "10.13.37.3/32" ];
 
       peers = [
@@ -29,7 +29,7 @@
     };
 
     mlwd-nl = {
-      privateKeyFile = "/root/mlvd";
+      privateKeyFile = "/etc/wg/mlvd";
       address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ];
       dns = [ "193.138.218.74" ];