update lockfile and fix some darwin configs

This commit is contained in:
Noah Masur 2022-09-27 21:30:27 -04:00
parent 1addb7ec21
commit e6b7938218
5 changed files with 22 additions and 21 deletions

View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1662478528, "lastModified": 1664210064,
"narHash": "sha256-Myjd0HPL5lXri3NXOcJ6gP7IKod2eMweQBKM4uxgEGw=", "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "3b69bf3cc26ae19de847bfe54d6ab22d7381a90a", "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1663328500, "lastModified": 1664273942,
"narHash": "sha256-7n+J/exp8ky4dmk02y5a9R7CGmJvHpzrHMzfEkMtSWA=", "narHash": "sha256-PFQR1UJQs7a7eaH5YoCZky5dmxR5cjaKRK+MpPbR7YE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5427f3d1f0ea4357cd4af0bffee7248d640c6ffc", "rev": "1f5ef2bb419a327fae28a83b50fab50959132c24",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,11 +76,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1663357389, "lastModified": 1664195620,
"narHash": "sha256-oYA2nVRSi6yhCBqS5Vz465Hw+3BQOVFEhfbfy//3vTs=", "narHash": "sha256-/0V1a1gAR+QbiQe4aCxBoivhkxss0xyt2mBD6yDrgjw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da6a05816e7fa5226c3f61e285ef8d9dfc868f3c", "rev": "62228ccc672ed000f35b1e5c82e4183e46767e52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,11 +107,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1663440270, "lastModified": 1664282944,
"narHash": "sha256-RkBoLyxamsBqRn9lB9RbFSDg7KHiGgHBsrpffEVXWCQ=", "narHash": "sha256-PrID+Tc90HWhkbO4b2kk3MFgjK+iBDWtDd534Y2D2Zs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "7511d58da488c67887745f40fd4846aa8c876d25", "rev": "dcc2af3d2504af6726c5cf40eb5e1165d5700721",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -5,6 +5,7 @@
./fonts.nix ./fonts.nix
./hammerspoon.nix ./hammerspoon.nix
./homebrew.nix ./homebrew.nix
./networking.nix
./nixpkgs.nix ./nixpkgs.nix
./system.nix ./system.nix
./tmux.nix ./tmux.nix

View File

@ -1,8 +1,8 @@
{ ... }: { { config, ... }: {
networking = { networking = {
computerName = "MacBook"; # Host name computerName = "${config.fullName}'\\''s Mac";
hostName = "MacBook"; hostName = "${config.user}-mac";
}; };
} }

View File

@ -141,12 +141,12 @@
echo "Define dock icon function" echo "Define dock icon function"
__dock_item() { __dock_item() {
printf '%s%s%s%s%s' \ printf "%s%s%s%s%s" \
'<dict><key>tile-data</key><dict><key>file-data</key><dict>' \ "<dict><key>tile-data</key><dict><key>file-data</key><dict>" \
'<key>_CFURLString</key><string>' \ "<key>_CFURLString</key><string>" \
"$1" \ "$1" \
'</string><key>_CFURLStringType</key><integer>0</integer>' \ "</string><key>_CFURLStringType</key><integer>0</integer>" \
'</dict></dict></dict>' "</dict></dict></dict>"
} }
echo "Choose and order dock icons" echo "Choose and order dock icons"

View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { { config, pkgs, lib, ... }: {
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
programs.fish = { programs.fish = {