From e6b7938218132ee4597049d334aaaf184084984d Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 27 Sep 2022 21:30:27 -0400
Subject: [PATCH] update lockfile and fix some darwin configs

---
 flake.lock                    | 24 ++++++++++++------------
 modules/darwin/default.nix    |  1 +
 modules/darwin/networking.nix |  6 +++---
 modules/darwin/system.nix     | 10 +++++-----
 modules/shell/nixpkgs.nix     |  2 +-
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index a3a0bac..1d1d66c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662478528,
-        "narHash": "sha256-Myjd0HPL5lXri3NXOcJ6gP7IKod2eMweQBKM4uxgEGw=",
+        "lastModified": 1664210064,
+        "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "3b69bf3cc26ae19de847bfe54d6ab22d7381a90a",
+        "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1663328500,
-        "narHash": "sha256-7n+J/exp8ky4dmk02y5a9R7CGmJvHpzrHMzfEkMtSWA=",
+        "lastModified": 1664273942,
+        "narHash": "sha256-PFQR1UJQs7a7eaH5YoCZky5dmxR5cjaKRK+MpPbR7YE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5427f3d1f0ea4357cd4af0bffee7248d640c6ffc",
+        "rev": "1f5ef2bb419a327fae28a83b50fab50959132c24",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1663357389,
-        "narHash": "sha256-oYA2nVRSi6yhCBqS5Vz465Hw+3BQOVFEhfbfy//3vTs=",
+        "lastModified": 1664195620,
+        "narHash": "sha256-/0V1a1gAR+QbiQe4aCxBoivhkxss0xyt2mBD6yDrgjw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "da6a05816e7fa5226c3f61e285ef8d9dfc868f3c",
+        "rev": "62228ccc672ed000f35b1e5c82e4183e46767e52",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1663440270,
-        "narHash": "sha256-RkBoLyxamsBqRn9lB9RbFSDg7KHiGgHBsrpffEVXWCQ=",
+        "lastModified": 1664282944,
+        "narHash": "sha256-PrID+Tc90HWhkbO4b2kk3MFgjK+iBDWtDd534Y2D2Zs=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "7511d58da488c67887745f40fd4846aa8c876d25",
+        "rev": "dcc2af3d2504af6726c5cf40eb5e1165d5700721",
         "type": "github"
       },
       "original": {
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 6497ab2..dce21ae 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -5,6 +5,7 @@
     ./fonts.nix
     ./hammerspoon.nix
     ./homebrew.nix
+    ./networking.nix
     ./nixpkgs.nix
     ./system.nix
     ./tmux.nix
diff --git a/modules/darwin/networking.nix b/modules/darwin/networking.nix
index 319f49b..61fbc5f 100644
--- a/modules/darwin/networking.nix
+++ b/modules/darwin/networking.nix
@@ -1,8 +1,8 @@
-{ ... }: {
+{ config, ... }: {
 
   networking = {
-    computerName = "MacBook"; # Host name
-    hostName = "MacBook";
+    computerName = "${config.fullName}'\\''s Mac";
+    hostName = "${config.user}-mac";
   };
 
 }
diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix
index 083fe3b..4c2eaa1 100644
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@@ -141,12 +141,12 @@
 
       echo "Define dock icon function"
       __dock_item() {
-          printf '%s%s%s%s%s' \
-                 '<dict><key>tile-data</key><dict><key>file-data</key><dict>' \
-                 '<key>_CFURLString</key><string>' \
+          printf "%s%s%s%s%s" \
+                 "<dict><key>tile-data</key><dict><key>file-data</key><dict>" \
+                 "<key>_CFURLString</key><string>" \
                  "$1" \
-                 '</string><key>_CFURLStringType</key><integer>0</integer>' \
-                 '</dict></dict></dict>'
+                 "</string><key>_CFURLStringType</key><integer>0</integer>" \
+                 "</dict></dict></dict>"
       }
 
       echo "Choose and order dock icons"
diff --git a/modules/shell/nixpkgs.nix b/modules/shell/nixpkgs.nix
index c07cc66..bb2096f 100644
--- a/modules/shell/nixpkgs.nix
+++ b/modules/shell/nixpkgs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
   home-manager.users.${config.user} = {
 
     programs.fish = {