From 9cf2b82e92f899ff90ada320c89fcdb4b7b9d64f Mon Sep 17 00:00:00 2001
From: Zuckerberg <zuckerberg@neet.dev>
Date: Sat, 12 Aug 2023 19:40:22 -0600
Subject: [PATCH] Update nixpkgs and cleanup

---
 common/boot/bios.nix       |  2 --
 common/boot/efi.nix        |  2 --
 common/pc/default.nix      |  2 +-
 flake.lock                 | 24 ------------------------
 flake.nix                  |  6 ------
 machines/router/router.nix | 20 ++++++++++----------
 6 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/common/boot/bios.nix b/common/boot/bios.nix
index b4cf3e3..434b9f4 100644
--- a/common/boot/bios.nix
+++ b/common/boot/bios.nix
@@ -13,13 +13,11 @@ in
   };
 
   config = mkIf cfg.enable {
-    # Use GRUB 2 for BIOS
     boot.loader = {
       timeout = 2;
       grub = {
         enable = true;
         device = cfg.device;
-        version = 2;
         useOSProber = true;
         configurationLimit = 20;
         theme = pkgs.nixos-grub2-theme;
diff --git a/common/boot/efi.nix b/common/boot/efi.nix
index d9b8d61..6789fce 100644
--- a/common/boot/efi.nix
+++ b/common/boot/efi.nix
@@ -10,14 +10,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    # Use GRUB2 for EFI
     boot.loader = {
       efi.canTouchEfiVariables = true;
       timeout = 2;
       grub = {
         enable = true;
         device = "nodev";
-        version = 2;
         efiSupport = true;
         useOSProber = true;
         #       memtest86.enable = true;
diff --git a/common/pc/default.nix b/common/pc/default.nix
index cd31e74..a240a0d 100644
--- a/common/pc/default.nix
+++ b/common/pc/default.nix
@@ -52,7 +52,7 @@ in
       jellyfin-media-player
       joplin-desktop
       config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
-      pavucontrol-qt
+      lxqt.pavucontrol-qt
 
       # For Nix IDE
       nixpkgs-fmt
diff --git a/flake.lock b/flake.lock
index 74a6017..b677064 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,29 +22,6 @@
         "type": "github"
       }
     },
-    "archivebox": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1648612759,
-        "narHash": "sha256-SJwlpD2Wz3zFoX2mIYCQfwIOYHaOdeiWGFeDXsLGM84=",
-        "ref": "refs/heads/master",
-        "rev": "39d338b9b24159d8ef3309eecc0d32a2a9f102b5",
-        "revCount": 2,
-        "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/archivebox.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/archivebox.git"
-      }
-    },
     "blobs": {
       "flake": false,
       "locked": {
@@ -281,7 +258,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "archivebox": "archivebox",
         "dailybuild_modules": "dailybuild_modules",
         "deploy-rs": "deploy-rs",
         "flake-utils": "flake-utils",
diff --git a/flake.nix b/flake.nix
index fcdb946..b7b9011 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,11 +24,6 @@
     dailybuild_modules.inputs.nixpkgs.follows = "nixpkgs";
     dailybuild_modules.inputs.flake-utils.follows = "flake-utils";
 
-    # archivebox
-    archivebox.url = "git+https://git.neet.dev/zuckerberg/archivebox.git";
-    archivebox.inputs.nixpkgs.follows = "nixpkgs";
-    archivebox.inputs.flake-utils.follows = "flake-utils";
-
     # nixos config deployment
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
@@ -55,7 +50,6 @@
             simple-nixos-mailserver.nixosModule
             agenix.nixosModules.default
             dailybuild_modules.nixosModule
-            archivebox.nixosModule
             nix-index-database.nixosModules.nix-index
             ({ lib, ... }: {
               config = {
diff --git a/machines/router/router.nix b/machines/router/router.nix
index 75bbc5c..4a7eace 100644
--- a/machines/router/router.nix
+++ b/machines/router/router.nix
@@ -92,7 +92,7 @@ in
       radios = {
         # 2.4GHz
         wlp4s0 = {
-          hwMode = "g";
+          band = "2g";
           noScan = true;
           channel = 6;
           countryCode = "US";
@@ -124,15 +124,15 @@ in
             #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
             # };
           };
-          extraConfig = ''
-            he_oper_centr_freq_seg0_idx=8
-            vht_oper_centr_freq_seg0_idx=8
-          '';
+          settings = {
+            he_oper_centr_freq_seg0_idx = 8;
+            vht_oper_centr_freq_seg0_idx = 8;
+          };
         };
 
         # 5GHz
         wlan1 = {
-          hwMode = "a";
+          band = "5g";
           noScan = true;
           channel = 128;
           countryCode = "US";
@@ -164,10 +164,10 @@ in
             #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
             # };
           };
-          extraConfig = ''
-            vht_oper_centr_freq_seg0_idx=114
-            he_oper_centr_freq_seg0_idx=114
-          '';
+          settings = {
+            vht_oper_centr_freq_seg0_idx = 114;
+            he_oper_centr_freq_seg0_idx = 114;
+          };
         };
       };
     };