From c40a7f66fc3e4f5f8b0bea493e43623e634c1f01 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Sat, 24 Sep 2022 14:37:07 +0000
Subject: [PATCH] Update packages

---
 configuration.nix |  3 +++
 desktop.nix       | 22 ++++++++++++----------
 packages.nix      | 16 ++++++++--------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 5f1e4ec..44ba812 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -21,6 +21,9 @@ in {
       ./auto-update.nix
     ];
 
+  boot.kernelPackages = nixos-small.linuxPackages_latest;
+  boot.kernelParams = [ "nouveau.modeset=0" ]; # comment out in case of nvidia
+
   time.timeZone = "UTC";
 
   services.logind.extraConfig = ''
diff --git a/desktop.nix b/desktop.nix
index b03df78..a478dbe 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -17,9 +17,11 @@ in {
       enable = true;
       enableContribAndExtras = true;
     };
-    dpi = 282;   # 15.6 inch, 3840x2160
+    dpi = 282;   # 15.6 inch, 3840x2160, comment out in case of nvidia
   };
 
+  #services.xserver.videoDrivers = [ "nvidia" ];
+
   services.xserver.xautolock = {
     enable = true;
 
@@ -44,8 +46,8 @@ in {
   programs.dconf.enable = true;
   programs.light.enable = true;
 
-  hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
-
+  hardware.opengl.enable = true;
+  hardware.opengl.extraPackages = [ pkgs.vaapiVdpau pkgs.vaapiIntel ];
   sound.enable = true;
 
   # > bluetooth audio
@@ -63,7 +65,6 @@ in {
   hardware.pulseaudio = {
     enable = true;
     package = pkgs.pulseaudioFull;
-    extraModules = [ pkgs.pulseaudio-modules-bt ];
   };
   # < bluetooth audio
 
@@ -78,7 +79,7 @@ in {
     fonts = with pkgs; [
       ubuntu_font_family
       noto-fonts-emoji
-      cantarell_fonts
+      cantarell-fonts
       cm_unicode
       google-fonts
       go-font
@@ -141,6 +142,7 @@ in {
       "fihnjjcciajhdojfnbdddfaoknhalnja" # I don't care about cookies
       "kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
       "mnjggcdmjocbbbhaepdhchncahnbgone" # SponsorBlock
+      "gkmndgjgpolmikgnipipfekglbbgjcel" # AutoHideDownloadsBar
     ];
     extraOpts = {
       DefaultBrowserSettingEnabled = true;
@@ -162,17 +164,17 @@ in {
       SyncDisabled = true;
 
       SigninAllowed = false;
-      AudioCaptureAllowed = false;
-      VideoCaptureAllowed = false;
+      # AudioCaptureAllowed = false;
+      # VideoCaptureAllowed = false;
       SSLErrorOverrideAllowed = false;
       AutoplayAllowed = false;
 
       # 0 = Disable browser sign-in
       BrowserSignin = 0;
 
-      DefaultSearchProviderEnabled = true;
-      DefaultSearchProviderSearchURL = "https://duckduckgo.com/"
-        + "?kae=d&k1=-1&kc=1&kav=1&kd=-1&kh=1&q={searchTerms}";
+      #DefaultSearchProviderEnabled = true;
+      #DefaultSearchProviderSearchURL = "https://duckduckgo.com/"
+      #+ "?kae=d&k1=-1&kc=1&kav=1&kd=-1&kh=1&q={searchTerms}";
 
       # Do not allow any site to show desktop notifications
       DefaultNotificationsSetting = 2;
diff --git a/packages.nix b/packages.nix
index 9e1d406..ae9108b 100644
--- a/packages.nix
+++ b/packages.nix
@@ -60,15 +60,15 @@ in {
     unstable.exoscale-cli unstable.metal-cli
 
     # development
-    sbcl go
+    sbcl go global
 
     # gpg-related
     gnupg yubikey-manager yubikey-personalization
 
     # virtualization
-    kvm
+    qemu_kvm
     virtmanager
-    virtviewer
+    virt-viewer
     spice
     spice-gtk
 
@@ -87,8 +87,8 @@ in {
       (with epkgs.melpaPackages; [
         # Programming languages modes
         haskell-mode rust-mode scala-mode csharp-mode d-mode
-        solidity-mode php-mode go-mode ponylang-mode zig-mode
-        goimports
+        solidity-mode go-mode ponylang-mode zig-mode
+        gotools
         # Development
         helm-gtags slime xcscope go-autocomplete
         # Configuration languages modes
@@ -122,10 +122,10 @@ in {
     gnome3.gnome-font-viewer
 
     # base x
-    rofi xlibs.xmodmap xsecurelock kitty
+    rofi xorg.xmodmap xsecurelock kitty
     libnotify gtk_engines x2x evtest
     pulsemixer arc-theme xclip
-    gnome3.dconf gnome3.dconf-editor gsettings-desktop-schemas gsettings-qt
+    dconf gnome3.dconf-editor gsettings-desktop-schemas gsettings-qt
     xorg.xcursorthemes capitaine-cursors gnome3.cheese
 
     # x apps
@@ -133,7 +133,7 @@ in {
     android-file-transfer libreoffice electrum gnome3.nautilus
     signal-desktop signal-cli rdesktop wire-desktop
 
-    ghidra
+    ghidra nonfree.davinci-resolve
 
     (writeShellScriptBin "chromium" ''
       ${chromium}/bin/chromium --force-dark-mode \