From 1bfdd2a6f6fa737adfc5c8f8b95cc0ea0baf208d Mon Sep 17 00:00:00 2001
From: Felix Wittwer <dev@felixwittwer.de>
Date: Wed, 15 Jun 2022 17:14:20 +0200
Subject: [PATCH] Update to NixOS 22.05

---
 entropy/nixos/configuration.nix    |  2 +-
 entropy/nixos/modules/audio.nix    |  1 -
 entropy/nixos/modules/hardware.nix | 10 +++++-----
 entropy/nixos/modules/r.nix        |  4 +++-
 entropy/nixos/modules/sway.nix     |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix
index 957be56..f568b32 100644
--- a/entropy/nixos/configuration.nix
+++ b/entropy/nixos/configuration.nix
@@ -38,6 +38,7 @@ in
       ./modules/python.nix
     ];
 
+
   # set up LUKS discovery
   boot.initrd.luks.devices.cryptlvm.device = "/dev/disk/by-uuid/f382cd01-9048-4b1b-8a73-48e1f61e6c08";
 
@@ -147,7 +148,6 @@ in
     ncdu
     tldr
     unzip
-    ncat
     bind
     inetutils
     usbutils
diff --git a/entropy/nixos/modules/audio.nix b/entropy/nixos/modules/audio.nix
index bb4fdf7..a2e6741 100644
--- a/entropy/nixos/modules/audio.nix
+++ b/entropy/nixos/modules/audio.nix
@@ -101,7 +101,6 @@
   # configure pulseaudio to work with bluetooth headsets using aptx
   hardware.pulseaudio = {
     enable = true;
-    extraModules = [ pkgs.pulseaudio-modules-bt ];
     # the full package is necessary for BT support
     package = pkgs.pulseaudioFull;
     # switch to bluetooth automatically if they are connected
diff --git a/entropy/nixos/modules/hardware.nix b/entropy/nixos/modules/hardware.nix
index 9a82f40..863ae0e 100644
--- a/entropy/nixos/modules/hardware.nix
+++ b/entropy/nixos/modules/hardware.nix
@@ -6,11 +6,11 @@
 
   services.udev.packages = [ pkgs.libu2f-host ];
 
-  ## enable fingerprint reader
-  #services.fprintd.enable = true;
-  #security.pam.services.login.fprintAuth = true;
-  ##security.pam.services.xscreensaver.fprintAuth = true;
-  #security.pam.services.sudo.fprintAuth = true;
+  # enable fingerprint reader
+  services.fprintd.enable = true;
+  security.pam.services.login.fprintAuth = true;
+  #security.pam.services.xscreensaver.fprintAuth = true;
+  security.pam.services.sudo.fprintAuth = true;
 
   environment.systemPackages = with pkgs; [
     # tool for flashing firmware
diff --git a/entropy/nixos/modules/r.nix b/entropy/nixos/modules/r.nix
index 91543a7..b697c09 100644
--- a/entropy/nixos/modules/r.nix
+++ b/entropy/nixos/modules/r.nix
@@ -6,6 +6,7 @@
     R-with-my-packages = rWrapper.override {
       packages = with rPackages; [
         ggplot2
+        tidyverse
         rlang
         lazyeval
         patchwork
@@ -21,5 +22,6 @@
       ];
     };
   in
-    [ R-with-my-packages rstudioEnv ];
+    #[ R-with-my-packages rstudioEnv ];
+    [ R-with-my-packages ];
 }
diff --git a/entropy/nixos/modules/sway.nix b/entropy/nixos/modules/sway.nix
index 289fae3..6bad02a 100644
--- a/entropy/nixos/modules/sway.nix
+++ b/entropy/nixos/modules/sway.nix
@@ -34,7 +34,7 @@
 
   services.redshift = {
     enable = true;
-    package = pkgs.redshift-wlr;
+    package = pkgs.gammastep;
     temperature.night = 3500;
   };