From 05bbbd6871128988b1988037de1e1db74f7b2d08 Mon Sep 17 00:00:00 2001
From: Alexander Szczepanski <alexander@szczepan.ski>
Date: Thu, 15 Jul 2021 21:14:37 +0200
Subject: [PATCH] made nextdns default dns

---
 configs/common.nix   | 34 +++++++++++++++++++++++++++++++++-
 configs/gui.nix      |  1 +
 configs/user.nix     |  4 ++++
 configs/vscode.nix   | 27 ---------------------------
 machine/desktop.nix  |  6 ++++++
 machine/thinkpad.nix |  9 ---------
 6 files changed, 44 insertions(+), 37 deletions(-)
 delete mode 100644 configs/vscode.nix

diff --git a/configs/common.nix b/configs/common.nix
index e812d29..023e150 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -37,7 +37,28 @@
     };
   };
 
-  boot.tmpOnTmpfs = true;
+  #nextdns
+  services.nextdns = {
+    enable = true;
+    arguments = [
+      "-config"
+      "aaa56c"
+      "-cache-size"
+      "10MB"
+      "-listen"
+      "127.0.0.1:53"
+      "-report-client-info"
+    ];
+  };
+
+  networking = {
+    nameservers = [ "127.0.0.1" "::1" ];
+    # If using dhcpcd:
+    dhcpcd.extraConfig = "nohook resolv.conf";
+    # If using NetworkManager:
+    networkmanager.dns = "none";
+  };
+
   environment.systemPackages = with pkgs; [
     ack
     atop
@@ -68,6 +89,8 @@
     usbutils
     wget
     zsh
+    neofetch
+    cargo
   ];
 
   documentation.enable = false;
@@ -78,6 +101,15 @@
 
   nix.autoOptimiseStore = true;
 
+  boot = {
+    tmpOnTmpfs = true;
+    kernelParams = [ "quiet" ];
+    consoleLogLevel = 0;
+    kernel.sysctl = {
+      "vm.max_map_count" = 262144;
+    };
+  };
+
   nix.gc = {
     automatic = true;
     dates = "weekly";
diff --git a/configs/gui.nix b/configs/gui.nix
index 4948727..4f0e6f5 100644
--- a/configs/gui.nix
+++ b/configs/gui.nix
@@ -31,6 +31,7 @@
     fslint
     transmission-gtk
     bitwarden
+    libreoffice
   ];
 
   fonts = {
diff --git a/configs/user.nix b/configs/user.nix
index 5bffb56..27bb66d 100644
--- a/configs/user.nix
+++ b/configs/user.nix
@@ -59,6 +59,10 @@
           hostname = "szczepan.ski";
         };
 
+        matchBlocks."nixos-vm" = {
+          hostname = "192.168.122.33";
+        };
+
         matchBlocks."router" = {
           hostname = "192.168.1.1";
           user = "root";
diff --git a/configs/vscode.nix b/configs/vscode.nix
deleted file mode 100644
index 9b541c7..0000000
--- a/configs/vscode.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs, ... }:
-
-let
-  extensions = (with pkgs.vscode-extensions; [
-      bbenoist.Nix
-      ms-python.python
-      ms-azuretools.vscode-docker
-      ms-vscode-remote.remote-ssh
-    ]) ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [{
-      name = "remote-ssh-edit";
-      publisher = "ms-vscode-remote";
-      version = "0.47.2";
-      sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
-  } { 
-      name = "rafaelmaiolla.remote-vscode";
-      publisher = "rafaelmaiolla";
-  }];
-  vscode-with-extensions = pkgs.vscode-with-extensions.override {
-      vscodeExtensions = extensions;
-    };
-in {
-  config = {
-    environment.systemPackages = [
-      vscode-with-extensions
-    ];
-  };
-}
diff --git a/machine/desktop.nix b/machine/desktop.nix
index e08904c..e0432a9 100644
--- a/machine/desktop.nix
+++ b/machine/desktop.nix
@@ -92,6 +92,12 @@ in
   environment.systemPackages = with pkgs; [
     elementary-xfce-icon-theme
     gnomeExtensions.appindicator
+    cpu-x
+    hwinfo
+    zenmonitor
+    hardinfo
+    phoronix-test-suite
+    fswatch
   ];
 
   services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
diff --git a/machine/thinkpad.nix b/machine/thinkpad.nix
index 389c10b..b271222 100644
--- a/machine/thinkpad.nix
+++ b/machine/thinkpad.nix
@@ -155,15 +155,6 @@ in
     ];
   };
 
-  #nextdns
-  services.nextdns = {
-    enable = true;
-    arguments = [
-      "-config"
-      "aaa56c"
-    ];
-  };
-
   environment.systemPackages = with pkgs; [
     nvidia-offload
     xorg.xf86videointel