6 files changed, 14 insertions, 14 deletions

diff --git a/accounts/gkleen@sif/xmobar/shell.nix b/accounts/gkleen@sif/xmobar/shell.nix
index 18188e78..16beb322 100644
--- a/accounts/gkleen@sif/xmobar/shell.nix
+++ b/accounts/gkleen@sif/xmobar/shell.nix
@@ -24,5 +24,5 @@ let
     name = "interactive-xmobar-environment";
     shellHook = "";
   };
-in pkgs.stdenv.lib.overrideDerivation dummy override
-  #pkgs.stdenv.lib.overrideDerivation drv.env override
+in pkgs.lib.overrideDerivation dummy override
+  #pkgs.lib.overrideDerivation drv.env override
diff --git a/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix b/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix
index 1dfc619b..852fb8e5 100644
--- a/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix
+++ b/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, hpack, stdenv, xmobar }:
+{ mkDerivation, base, hpack, lib, xmobar }:
 mkDerivation {
   pname = "xmobar-yggdrasil";
   version = "0.0.0";
@@ -9,5 +9,5 @@ mkDerivation {
   executableHaskellDepends = [ base xmobar ];
   preConfigure = "hpack";
   license = "unknown";
-  hydraPlatforms = stdenv.lib.platforms.none;
+  hydraPlatforms = lib.platforms.none;
 }
diff --git a/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix b/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
index e8786d35..d3d72310 100644
--- a/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
+++ b/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, base, bytestring, containers, directory
-, filepath, hostname, hpack, mtl, network, parsec, process, stdenv
+, filepath, hostname, hpack, mtl, network, parsec, process, lib
 , temporary, transformers, unix, utf8-string, X11, xmonad
 , xmonad-contrib, libnotify
 }:
@@ -17,5 +17,5 @@ mkDerivation {
   ];
   preConfigure = "hpack";
   license = "unknown";
-  hydraPlatforms = stdenv.lib.platforms.none;
+  hydraPlatforms = lib.platforms.none;
 }
diff --git a/flake.lock b/flake.lock
index 4ce01041..d5e943cd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1617894699,
-        "narHash": "sha256-zlG3xNXgqo5pbMmfq8YaqGoVjElHnTDnEz13A+pUbZY=",
+        "lastModified": 1618041827,
+        "narHash": "sha256-17Fzc8rmT6HOarCp+8k9RhmgMorNtzTk/rzew+FqHrA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "56f5f41ed42f7d476a7c79fa8ec71f5605487abf",
+        "rev": "f567ea8228e0ce718871d7346e444dd15ad702e5",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1617987980,
-        "narHash": "sha256-0D5vcBHvccMIpdZN9h4TqPGdiiRuGMpaO4jaj4iJu50=",
+        "lastModified": 1618153411,
+        "narHash": "sha256-xevpO/rTac+Fcf/8KmGGAxdoMN9WoosZTo9tAM8rHKY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae09772927566314ad11e366ddb46a9c7ffb666a",
+        "rev": "20443c348225791ca7ecb2787f403f4be56ab223",
         "type": "github"
       },
       "original": {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 50b7ebbc..68fb82c3 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -208,7 +208,7 @@
 
       bluetooth = {
         enable = true;   
-        config = {
+        settings = {
           General = {
             Enable = "Source,Sink,Media,Socket";
           };
diff --git a/modules/uucp.nix b/modules/uucp.nix
index 8d8ac1a2..0334a3db 100644
--- a/modules/uucp.nix
+++ b/modules/uucp.nix
@@ -307,7 +307,7 @@ in {
     in listToAttrs (map wrapper ["uucico" "cu" "uucp" "uuname" "uustat" "uux" "uuxqt"]);
 
     nixpkgs.overlays = [(self: super: {
-      uucp = super.stdenv.lib.overrideDerivation super.uucp (oldAttrs: {
+      uucp = super.lib.overrideDerivation super.uucp (oldAttrs: {
         configureFlags = "--with-newconfigdir=/etc/uucp";
         patches = [
           (super.writeText "mailprogram" ''