From 8588bf6033d8521444787cdff70280267945d12c Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 8 Jul 2021 20:43:14 +0200
Subject: [PATCH] fixing sterni 21.05 problems

---
 configs/sternchen/hardware-configuration.nix | 2 +-
 configs/sterni/hardware-configuration.nix    | 5 +++--
 modules/system/audio.nix                     | 8 ++++++++
 modules/system/bluetooth.nix                 | 2 +-
 modules/system/font.nix                      | 7 ++++---
 modules/system/x11.nix                       | 2 ++
 system/desktop/home-manager/xmonad/Main.hs   | 2 +-
 system/desktop/remote-install.nix            | 2 +-
 8 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/configs/sternchen/hardware-configuration.nix b/configs/sternchen/hardware-configuration.nix
index 91e4833..0090a4a 100644
--- a/configs/sternchen/hardware-configuration.nix
+++ b/configs/sternchen/hardware-configuration.nix
@@ -38,7 +38,7 @@
   #};
 
   nix.maxJobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 
   # lvm volume group
   # ----------------
diff --git a/configs/sterni/hardware-configuration.nix b/configs/sterni/hardware-configuration.nix
index 271183a..f152758 100644
--- a/configs/sterni/hardware-configuration.nix
+++ b/configs/sterni/hardware-configuration.nix
@@ -25,7 +25,8 @@
   };
 
   fileSystems."/share" = {
-    device = "/dev/ram1";
+    #device = "/dev/ram1";
+    device = "none";
     fsType = "tmpfs";
   };
 
@@ -38,7 +39,7 @@
   };
 
   nix.maxJobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 
   # lvm volume group
   # ----------------
diff --git a/modules/system/audio.nix b/modules/system/audio.nix
index e1e0a6a..c8c8190 100644
--- a/modules/system/audio.nix
+++ b/modules/system/audio.nix
@@ -86,6 +86,14 @@ in {
     # because of systemWide ensure main user is in audio group
     system.custom.mainUser.extraGroups = [ "audio" ];
 
+    #services.pipewire = {
+    #  enable = true;
+    #  alsa.enable = true;
+    #  jack.enable = true;
+    #  media-session.enable = true;
+    #  pulse.enable = true;
+    #};
+
     hardware.pulseaudio = {
       enable = true;
       package = pkgs.pulseaudioFull;
diff --git a/modules/system/bluetooth.nix b/modules/system/bluetooth.nix
index 5d03065..79088d2 100644
--- a/modules/system/bluetooth.nix
+++ b/modules/system/bluetooth.nix
@@ -14,7 +14,7 @@ in {
     hardware.bluetooth = {
       enable = true;
       powerOnBoot = true;
-      config.General.AutoConnect = true;
+      settings.General.AutoConnect = true;
     };
 
     services.blueman.enable = true;
diff --git a/modules/system/font.nix b/modules/system/font.nix
index 9855a2a..9cb0ab3 100644
--- a/modules/system/font.nix
+++ b/modules/system/font.nix
@@ -26,8 +26,9 @@ in {
 
     fonts = {
 
-      enableFontDir = true;
+      enableDefaultFonts = true;
       enableGhostscriptFonts = true;
+      fontDir.enable = true;
 
       fontconfig = {
         dpi = cfg.dpi;
@@ -41,7 +42,7 @@ in {
         };
         enable = true;
         antialias = true;
-        defaultFonts = { monospace = [ "inconsolata" ]; };
+        #defaultFonts = { monospace = [ "inconsolata" ]; };
       };
 
       fonts = with pkgs; [
@@ -55,7 +56,7 @@ in {
 
         # symbol fonts
         # ------------
-        #nerdfonts
+        # nerdfonts
         powerline-fonts
         font-awesome-ttf
         fira-code-symbols
diff --git a/modules/system/x11.nix b/modules/system/x11.nix
index 6ce656e..a78def2 100644
--- a/modules/system/x11.nix
+++ b/modules/system/x11.nix
@@ -53,10 +53,12 @@ in {
       # --------------
       libinput = {
         enable = true;
+        touchpad = {
         disableWhileTyping = true;
         tapping = true;
         scrollMethod = "twofinger";
         accelSpeed = "2";
+        };
       };
 
       # Wacom configuraton
diff --git a/system/desktop/home-manager/xmonad/Main.hs b/system/desktop/home-manager/xmonad/Main.hs
index 3789a40..32016b9 100644
--- a/system/desktop/home-manager/xmonad/Main.hs
+++ b/system/desktop/home-manager/xmonad/Main.hs
@@ -519,7 +519,7 @@ myXPConfig =
     { bgColor = Solarized.base03
     , fgColor = Solarized.base0
     , promptBorderWidth = 0
-    , font = "xft:inconsolata:pixelsize=18:antialias=true:hinting=true"
+    -- , font = "xft:inconsolata:pixelsize=18:antialias=true:hinting=true"
     }
 
 data LibNotifyUrgencyHook = LibNotifyUrgencyHook deriving (Read, Show)
diff --git a/system/desktop/remote-install.nix b/system/desktop/remote-install.nix
index 0e923fd..4f2cafb 100644
--- a/system/desktop/remote-install.nix
+++ b/system/desktop/remote-install.nix
@@ -3,7 +3,7 @@
   services.tor = {
     enable = true;
     client.enable = true;
-    hiddenServices.liveos.map = [{ port = 1337; }];
+    relay.onionServices.liveos.map = [{ port = 1337; }];
   };
 
   environment.systemPackages = [