Fix typos

flake.nix

@@ -38,9 +38,9 @@
     {
       devShell = pkgs.mkShell {
         packages = with pkgs; [
-          inputs.home-manager.defaultPackage.${system};
+          inputs.home-manager.defaultPackage.${system}
         ];
-      }
+      };
     }
   );
 }

home/fzf.nix

@@ -3,6 +3,6 @@
     enable = true;
     enableZshIntegration = true;
     fileWidgetCommand = "fd --type f --no-ignore";
-    historyWidgedOptions = [ "--reverse" "--sort" "--exact" ];
+    historyWidgetOptions = [ "--reverse" "--sort" "--exact" ];
   };
 }

home/rust.nix

@@ -4,5 +4,5 @@
     rust-analyzer
     rustup
     sccache
-  ]
+  ];
 }

machines/common.nix

@@ -1,16 +1,20 @@
 inputs:
-{ config, libs, pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   nix = {
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
-    binaryCaches = lib.mkForce [
-      "https://cache.nixos.org/"
-      "https://nix-community.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
+    settings = {
+      substituters = lib.mkForce [
+        "https://cache.nixos.org/"
+        "https://nix-community.cachix.org"
+      ];
+      trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+    };
+    # nix shell and nix build should use the same channel as the flake
+    registry.nixpkgs.flake = nixpkgs;
   };
   nixpkgs.config.allowUnfree = true;
 
@@ -25,7 +29,8 @@ inputs:
 
   hardware = {
     pulseaudio = {
-      enable = true;
+      # TODO: pipewire
+      enable = false;
       # stop mumble from muting other processes
       extraConfig = "unload-module module-role-cork";
     };
@@ -146,5 +151,5 @@ inputs:
         serif = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" ];
       };
     };
-  }
+  };
 }

machines/w1n5t0n.nix

@@ -40,7 +40,7 @@ inputs.nixpkgs.lib.nixosSystem {
         };
         kernelModules = [ "kvm-intel" ];
         # use latest kernel
-        kernelPackages = pkgs.linuxPackages.latest;
+        kernelPackages = pkgs.linuxPackages_latest;
         kernel.sysctl = {
           # function keys on keychron keyboard won't work otherwise
           "module.hid_apple.parameters.fnmode" = "2";