From b25d2b44a3109e67f4558a9239eccd445335c121 Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Fri, 5 Aug 2022 00:18:25 +0200
Subject: [PATCH] switch rust toolchain to stable

---
 flake.nix            | 14 ++++++++------
 modules/chromium.nix |  8 ++++----
 modules/science.nix  | 15 ++++++---------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index c4ae1e3..2b85bb2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,18 +32,20 @@
           modules = [
             sops-nix.nixosModules.sops
             ./hosts/microwave
-            ./modules/graphical.nix
             ./modules/basic-tools.nix
-            ./modules/gnupg.nix
-            ./modules/hw-accel-intel.nix
-            ./modules/radio.nix
-            ./modules/tlp.nix
             ./modules/binary-caches.nix
+            ./modules/chromium.nix
+            ./modules/gnupg.nix
+            ./modules/graphical.nix
+            ./modules/hw-accel-intel.nix
             ./modules/mail.nix
+            ./modules/radio.nix
+            ./modules/science.nix
+            ./modules/tlp.nix
             ({ pkgs, ... }: {
               nixpkgs.overlays = [ fenix.overlay ];
               environment.systemPackages = with pkgs; [
-                (fenix.packages."x86_64-linux".complete.withComponents [
+                (fenix.packages."x86_64-linux".stable.withComponents [
                   "cargo"
                   "clippy"
                   "rust-src"
diff --git a/modules/chromium.nix b/modules/chromium.nix
index dd3ac49..ab03742 100644
--- a/modules/chromium.nix
+++ b/modules/chromium.nix
@@ -2,11 +2,10 @@
 
 {
   environment.systemPackages = with pkgs; [
-    # (ungoogled-chromium.override { enableVaapi = true; })
     chromium
   ];
 
-  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland  --force-dark-mode --enable-features=WebUIDarkMode";
+  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland  --force-dark-mode --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,WebUIDarkMode";
 
   programs.chromium = {
     enable = true;
@@ -26,8 +25,9 @@
       "AutoplayAllowed" = false;
       "DefaultNotificationSetting" = 2;
       "BackgroundModeEnabled" = false;
-      "DefaultSearchProviderEnabled" = true;
-      "DefaultSearchProviderSearchURL" = "https://google.com/?q={searchTerms}";
+      # "DefaultSearchProviderEnabled" = true;
+      # "DefaultSearchProviderSearchURL" = "https://google.com/search?q={searchTerms}";
+      # "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}";
       "SearchSuggestEnable" = false;
     };
   };
diff --git a/modules/science.nix b/modules/science.nix
index b30093b..afa5c98 100644
--- a/modules/science.nix
+++ b/modules/science.nix
@@ -2,15 +2,12 @@
 
 {
   environment.systemPackages = with pkgs; [
-    # (rWrapper.override{ packages = with rPackages; [
-    #                       ggplot2
-    #                       swirl
-    #                       languageserver
-    #                       dplyr
-    #                       data_table
-    #                     ]; })
-    #(rstudioWrapper.override{ packages = with rPackages; [ ggplot2 ]; })
-    texlive.combined.scheme-full
+    (rWrapper.override{ packages = with rPackages; [
+                          ggplot2
+                          swirl
+                          dplyr
+                          data_table
+                        ]; })
     gnuplot
     graphicsmagick
     zotero