From 0addd25afa60ae00c0aaa38db5865b3e7e382871 Mon Sep 17 00:00:00 2001
From: Valentin Brandl <mail+github@vbrandl.net>
Date: Fri, 18 Feb 2022 12:13:34 +0100
Subject: [PATCH] Fix typos

---
 flake.nix            |  4 ++--
 home/fzf.nix         |  2 +-
 home/rust.nix        |  2 +-
 machines/common.nix  | 25 +++++++++++++++----------
 machines/w1n5t0n.nix |  2 +-
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4f5946d..1822811 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,9 +38,9 @@
     {
       devShell = pkgs.mkShell {
         packages = with pkgs; [
-          inputs.home-manager.defaultPackage.${system};
+          inputs.home-manager.defaultPackage.${system}
         ];
-      }
+      };
     }
   );
 }
diff --git a/home/fzf.nix b/home/fzf.nix
index 45521ed..b9fb642 100644
--- a/home/fzf.nix
+++ b/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" ];
   };
 }
diff --git a/home/rust.nix b/home/rust.nix
index 0e5f886..a06da8f 100644
--- a/home/rust.nix
+++ b/home/rust.nix
@@ -4,5 +4,5 @@
     rust-analyzer
     rustup
     sccache
-  ]
+  ];
 }
diff --git a/machines/common.nix b/machines/common.nix
index 4d98e54..ef05b06 100644
--- a/machines/common.nix
+++ b/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" ];
       };
     };
-  }
+  };
 }
diff --git a/machines/w1n5t0n.nix b/machines/w1n5t0n.nix
index 12bff8a..ee49467 100644
--- a/machines/w1n5t0n.nix
+++ b/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";