From d1b144f441adc7126c872f1875cd7953a3981afb Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Tue, 13 Dec 2022 21:02:42 -0700 Subject: [PATCH] upgrade macos to ventura --- flake.lock | 84 +++++++++++++++++++-------------------- hosts/common.nix | 4 +- modules/darwin/system.nix | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 50e5f9a..227cebd 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -156,11 +156,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1670280307, - "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=", + "lastModified": 1670513770, + "narHash": "sha256-muL74fsbGA8K8WlZSPNWddOiuBnC54kAajncX6nXrh4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2af0d07678fc15612345e0dd55337550dcf6465f", + "rev": "054d9e3187ca00479e8036dc0e92900a384f30fd", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1670273694, - "narHash": "sha256-Rb+AIMyncKNnP0EahDg5w37v6TXlGtd2SczugSQzMQU=", + "lastModified": 1670595719, + "narHash": "sha256-9jvA0QdcZtGWImiRZ8KRhXNsy5NxgZBm0TXtNLmFbyM=", "owner": "oxalica", "repo": "nil", - "rev": "101387fb2f54ebc67c894979d1ae0efac2b4ad5c", + "rev": "1c122ae707c6365ea731565daf307844df03e95e", "type": "github" }, "original": { @@ -265,11 +265,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669809720, - "narHash": "sha256-RMT77f6CPOYtLLQ2esj+EJ1BPVWxf4RDidjrSvA5OhI=", + "lastModified": 1670559856, + "narHash": "sha256-xUkgQRFqE6HIFQXs9SIXMZiXcLaH2415UR6w/FnsgcY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "227de2b3bbec142f912c09d5e8a1b4e778aa54fb", + "rev": "6bc6f77cb171a74001033d94f17f49043a9f1804", "type": "github" }, "original": { @@ -281,11 +281,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1670152712, - "narHash": "sha256-LJttwIvJqsZIj8u1LxVRv82vwUtkzVqQVi7Wb8gxPS4=", + "lastModified": 1670841420, + "narHash": "sha256-mSEia1FzrsHbfqjorMyYiX8NXdDVeR1Pw1k55jMJlJY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "14ddeaebcbe9a25748221d1d7ecdf98e20e2325e", + "rev": "33e0d99cbedf2acfd7340d2150837fbb28039a64", "type": "github" }, "original": { @@ -297,11 +297,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1667653703, - "narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=", + "lastModified": 1669418739, + "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09ad462c5a121d0239fde645aacb2221553a217", + "rev": "695b3515251873e0a7e2021add4bba643c56cde3", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "null-ls-nvim-src": { "flake": false, "locked": { - "lastModified": 1670247790, - "narHash": "sha256-fAqhpPJV53XmFQaJ7xnTOd+DKFLxGyfDnvSYW6ZOMQc=", + "lastModified": 1670864857, + "narHash": "sha256-YUHT88JLXHpbHg1IIze3QTJaT4zpdVgyCt3ojk9osk8=", "owner": "jose-elias-alvarez", "repo": "null-ls.nvim", - "rev": "b3d2ebdb75cf1fa4290822b43dc31f61bd0023f8", + "rev": "623cc25016647eb62392aead7612f27d539c33de", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nur": { "locked": { - "lastModified": 1670315682, - "narHash": "sha256-/v0RgZZIjvsFuJbJLUlzRbzSlYFXq3olgJTuJBNtcoY=", + "lastModified": 1670905794, + "narHash": "sha256-wpg/ZYga8aDmUogB8YRK8KLiUsOLw0cnhJtaKutvKEk=", "owner": "nix-community", "repo": "nur", - "rev": "af814db16c89385c65e758608296440555f61ccc", + "rev": "a0869f532570fb0bbff84a158299c40c4af3fadd", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "nvim-lspconfig-src": { "flake": false, "locked": { - "lastModified": 1670318621, - "narHash": "sha256-cySTYqdmOktCmwC0mh6gJoGYzyfrOVqNtUBOV5RBSCw=", + "lastModified": 1670933229, + "narHash": "sha256-qnU1Uq858bAVRYjEvVwqRDzAbCM2XkV2+GuaPuLMElY=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "8faa599646f482d3ed04e645eb04af94bcd12feb", + "rev": "cbf8762f15fac03a51eaa2c6f983d4a5045c95b4", "type": "github" }, "original": { @@ -360,11 +360,11 @@ "nvim-tree-lua-src": { "flake": false, "locked": { - "lastModified": 1670039798, - "narHash": "sha256-mQfo9KlNHbZtDIO3U8BZ7PGVBP5EtLUDpETq+bfqpVU=", + "lastModified": 1670847281, + "narHash": "sha256-vHCbR3f5LYJLYk0vNVoELSR4ZAH7YIavdCIuenRLdas=", "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "f8489c992998e1e1b45aec65bdb9615e5cd59a61", + "rev": "0cd8ac4751c39440a1c28c6be4704f3597807d29", "type": "github" }, "original": { @@ -376,11 +376,11 @@ "nvim-treesitter-src": { "flake": false, "locked": { - "lastModified": 1670321697, - "narHash": "sha256-lL9cPP7t852Zst1n0nWDp1r31Sx17T+xAiJvIylh4vo=", + "lastModified": 1670914677, + "narHash": "sha256-ku6oYE8gXPB91H3o3U/8608obXyiiJV25JbAdwdR/uE=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "7eb553ce4dc9af6631a823b5e4b5aa33fdc45bfd", + "rev": "eadfcad580edc74b258dc1380f1e3edea35cc6d4", "type": "github" }, "original": { @@ -425,11 +425,11 @@ ] }, "locked": { - "lastModified": 1669775522, - "narHash": "sha256-6xxGArBqssX38DdHpDoPcPvB/e79uXyQBwpBcaO/BwY=", + "lastModified": 1670552927, + "narHash": "sha256-lCE51eAGrAFS4k9W5aDGFpVtOAwQQ/rFMN80PCDh0vo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3158e47f6b85a288d12948aeb9a048e0ed4434d6", + "rev": "a0fdafd18c9cf599fde17fbaf07dbb20fa57eecb", "type": "github" }, "original": { @@ -473,11 +473,11 @@ "toggleterm-nvim-src": { "flake": false, "locked": { - "lastModified": 1667475764, - "narHash": "sha256-gazqaTsK5hAFqk6OONqTsR/zmjN3P8fPKsYufBhkeRA=", + "lastModified": 1670593071, + "narHash": "sha256-0n3WbUM3rYyR2BXgeyYuyTZIbIs5dzuIu8imsSvAc8U=", "owner": "akinsho", "repo": "toggleterm.nvim", - "rev": "3ba683827c623affb4d9aa518e97b34db2623093", + "rev": "b02a1674bd0010d7982b056fd3df4f717ff8a57a", "type": "github" }, "original": { @@ -524,11 +524,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1669863592, - "narHash": "sha256-g0YVtM5Hi8k27yIWvPR7ZRRE1JscL6XtC5dv9Li1tMM=", + "lastModified": 1670775588, + "narHash": "sha256-TCfA98qfZhBj0SN9RN23l/tuz82KwGHH7r2axkjQZig=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "522219248de4b5876f18e47f34d979dd9f4fcbdc", + "rev": "3721fe7c056e18c4ded6c405dbee719692a4528a", "type": "github" }, "original": { diff --git a/hosts/common.nix b/hosts/common.nix index a28916a..16eb8e2 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -3,7 +3,7 @@ imports = [ ../modules/shell ../modules/neovim ../modules/repositories/dotfiles.nix ]; - options = rec { + options = { user = lib.mkOption { type = lib.types.str; description = "Primary user of the system"; @@ -74,7 +74,7 @@ }; }; - config = let stateVersion = "22.11"; + config = let stateVersion = "23.05"; in { # Enable features in Nix commands diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix index 0294446..a9083c6 100644 --- a/modules/darwin/system.nix +++ b/modules/darwin/system.nix @@ -174,7 +174,7 @@ "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \ "$(__dock_item /Applications/Obsidian.app)" \ "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \ - "$(__dock_item /System/Applications/System\ Preferences.app)" + "$(__dock_item /System/Applications/System\ Settings.app)" ''; };