From 3924624e7516464d2f24cd19b62c02072436850c Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Wed, 8 Jun 2022 18:47:49 +0200
Subject: [PATCH] YOLO

---
 flake.lock                         | 30 +++++++++++++++---------------
 hosts/microwave/configuration.nix  |  5 +++++
 modules/chromium.nix               |  2 +-
 modules/dvb-dump-nfs-automount.nix | 11 +++++++----
 modules/graphical.nix              | 14 ++++++++++----
 5 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index e4d25b4..ae43949 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1653399543,
-        "narHash": "sha256-qLFw8U3xop5U5KtYGykOVa0oKHmTYg3TaNB043GMIks=",
+        "lastModified": 1654475993,
+        "narHash": "sha256-bGymMoL5Ut7KC9y2zO7/14y01xUqmSehbig2yBl8Sxw=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "309e172528cb6589210c2b19f0f8fc15a0fe2384",
+        "rev": "322acf99b1520ae803f84f2bfa305231adedc344",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653581809,
-        "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
+        "lastModified": 1654593855,
+        "narHash": "sha256-c+SyXvj7THre87OyIdZfRVR+HhI/g1ZDrQ3VUtTuHkU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
+        "rev": "033bd4fa9a8fbe0c68a88e925d9a884161044b25",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-21_11": {
       "locked": {
-        "lastModified": 1653132211,
-        "narHash": "sha256-5ugEYisGqixwarfn3BJvuWDnO6gT/AoxlsA6jnG8Fv8=",
+        "lastModified": 1654346688,
+        "narHash": "sha256-Y7QtZkfdxTvACCvWmDjpN6qOf4OKkZATufHcJP2VMKM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b5991e4971523a5fcc9413b9003b58e5c15aa7d8",
+        "rev": "2de556c4cd46a59e8ce2f85ee4dd400983213d45",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     },
     "nixpkgs-22_05": {
       "locked": {
-        "lastModified": 1653460991,
-        "narHash": "sha256-8MgFe84UUKw5k5MybirNH0S+oSluN2cRQGt+ZkW+dxQ=",
+        "lastModified": 1654373220,
+        "narHash": "sha256-3vKFnZz2oYHo4YcelaNOhO4XQ2jiIEXrp1s4w+e773c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c3bf3a5c3ab6be29138b88900c417660a284fbd",
+        "rev": "d6cb04299ce8964290ae7fdcb87aa50da0500b5c",
         "type": "github"
       },
       "original": {
@@ -100,11 +100,11 @@
         "nixpkgs-22_05": "nixpkgs-22_05"
       },
       "locked": {
-        "lastModified": 1653462763,
-        "narHash": "sha256-n0beO7WNvAeEtTtnetzQCaGs615tU/DfM97k8r/7bUw=",
+        "lastModified": 1654401128,
+        "narHash": "sha256-uCdQ2fzIPGakHw2TkvOncUvCl7Fo7z/vagpDWYooO7s=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "7385b12722ce903e477878147794bed9040227e2",
+        "rev": "f075361ecbde21535b38e41dfaa28a28f160855c",
         "type": "github"
       },
       "original": {
diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix
index 9359ac7..53464da 100644
--- a/hosts/microwave/configuration.nix
+++ b/hosts/microwave/configuration.nix
@@ -70,6 +70,11 @@
     uid = 1000;
   };
 
+  programs.wireshark = {
+    enable = true;
+    package = pkgs.wireshark;
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/chromium.nix b/modules/chromium.nix
index 5021ea6..412ec59 100644
--- a/modules/chromium.nix
+++ b/modules/chromium.nix
@@ -27,7 +27,7 @@
       "DefaultNotificationSetting" = 2;
       "BackgroundModeEnabled" = false;
       "DefaultSearchProviderEnabled" = true;
-      "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}";
+      "DefaultSearchProviderSearchURL" = "https://google.com/?q={searchTerms}";
       "SearchSuggestEnable" = false;
     };
   };
diff --git a/modules/dvb-dump-nfs-automount.nix b/modules/dvb-dump-nfs-automount.nix
index 182b844..9032402 100644
--- a/modules/dvb-dump-nfs-automount.nix
+++ b/modules/dvb-dump-nfs-automount.nix
@@ -1,23 +1,26 @@
 { pkgs, lib, ... }:
 {
+
+  environment.systemPackages = with pkgs; [ nfs-utils ];
   services.rpcbind.enable = true;
 
-  systemd.mounts = {
+  systemd.mounts = [{
     type = "nfs";
     mountConfig = {
       Options = "noatime";
     };
     what = "10.13.37.5:/";
     where = "/mnt/dvb";
-  };
+  }];
 
-  systemd.automounts = {
+  systemd.automounts = [{
     wantedBy = [ "multi-user.target" ];
+    requires = [ "wg-quick-wg-dvb.service" ];
     automountConfig= {
       TimeoutIdleSec = "600";
     };
     where = "/mnt/dvb";
-  };
+  }];
 }
 
 
diff --git a/modules/graphical.nix b/modules/graphical.nix
index 91369a7..729cb1d 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -11,16 +11,15 @@
     firefox-wayland
     dino
     alacritty
-    kitty
     xclip
     flameshot
     wl-clipboard
     brightnessctl
-    pulseaudio-ctl
     feh
     mpv
     zathura
     pulsemixer
+    pulseaudioFull
     screen-message
     cmus
     gtk-engine-murrine
@@ -43,7 +42,6 @@
     monoid
     spleen
     terminus_font
-    iosevka
     creep
     corefonts
     dina-font
@@ -76,11 +74,18 @@
   };
 
   # Enable sound.
+  sound.enable = true;
   security.rtkit.enable = true;
+  hardware.pulseaudio = {
+    zeroconf.discovery.enable = true;
+    extraClientConf = ''
+      autospawn=yes
+      '';
+    };
+
   services.pipewire = {
     enable = true;
     alsa.enable = true;
-    alsa.support32Bit = true;
     pulse.enable = true;
   };
 
@@ -128,4 +133,5 @@
   programs.bash.vteIntegration = true;
   services.upower.enable = true;
 
+  qt5.platformTheme = "gnome";
 }