From 5a37a4d4822c10bc14b1ec9788ed9194dc687cd7 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Sat, 14 Aug 2021 14:17:56 -0700
Subject: [PATCH] Fix some deprecation warnings

---
 home-manager/modules/fonts.nix |  5 +++-
 home-manager/users/notgne2.nix | 43 +++++++++++++++++-----------------
 modules/fuckingprint.nix       |  2 ++
 modules/workstation.nix        |  2 +-
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/home-manager/modules/fonts.nix b/home-manager/modules/fonts.nix
index f73ff3f..7cdb980 100644
--- a/home-manager/modules/fonts.nix
+++ b/home-manager/modules/fonts.nix
@@ -54,7 +54,10 @@ in
 
       programs.mako.font = "${cfg.favFont.name} ${toString cfg.favFont.size}";
 
-      wayland.windowManager.sway.config.fonts = [ cfg.favFont.name ];
+      wayland.windowManager.sway.config.fonts = {
+        names = [ cfg.favFont.name ];
+        size = cfg.favFont.size + 0.0;
+      };
       xsession.windowManager.i3.config.fonts = [ cfg.favFont.name ];
 
       programs.neovim.extraConfig = ''
diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix
index 7b5cc08..0968db9 100644
--- a/home-manager/users/notgne2.nix
+++ b/home-manager/users/notgne2.nix
@@ -17,28 +17,27 @@
 
   programs.htop = {
     enable = true;
-    meters.left = [
-      "LeftCPUs"
-      "Blank"
-      "Memory"
-      {
-        kind = "Uptime";
-        mode = 4;
-      }
-    ];
-    meters.right = [ "RightCPUs" "Blank" "CPU" ];
-    fields = [
-      "USER"
-      "PRIORITY"
-      "NICE"
-      "M_RESIDENT"
-      "PERCENT_MEM"
-      "PERCENT_CPU"
-      "TIME"
-      "COMM"
-    ];
-    delay = 10;
-    cpuCountFromZero = true;
+    settings = {
+      cpu_count_from_zero = true;
+      delay = 10;
+      fields = [
+        "USER"
+        "PRIORITY"
+        "NICE"
+        "M_RESIDENT"
+        "PERCENT_MEM"
+        "PERCENT_CPU"
+        "TIME"
+        "COMM"
+      ];
+      left_meters = [
+        "LeftCPUs"
+        "Blank"
+        "Memory"
+        "Uptime"
+      ];
+      right_meters = [ "RightCPUs" "Blank" "CPU" ];
+    };
   };
 
   programs.git = {
diff --git a/modules/fuckingprint.nix b/modules/fuckingprint.nix
index 2e0a4fe..4a9ed0f 100644
--- a/modules/fuckingprint.nix
+++ b/modules/fuckingprint.nix
@@ -91,6 +91,8 @@ in
       utsushi
       epkowa
       hplipWithPlugin
+      brscan4
+      dsseries
     ];
   };
 }
diff --git a/modules/workstation.nix b/modules/workstation.nix
index 08d26a6..ecf5887 100644
--- a/modules/workstation.nix
+++ b/modules/workstation.nix
@@ -115,6 +115,6 @@ in
     services.blueman.enable = true;
     hardware.bluetooth.enable = true;
     hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-modules-bt ];
-    hardware.bluetooth.config.General.Enable = "Source,Sink,Media,Socket";
+    hardware.bluetooth.settings.General.Enable = "Source,Sink,Media,Socket";
   };
 }