From 82d6a445a7b3b0dd285f62f3cd4aa8fba0636af5 Mon Sep 17 00:00:00 2001 From: Sloane Perrault Date: Tue, 20 Sep 2022 12:03:20 -0400 Subject: [PATCH] install tailscale --- .Brewfile | 3 +++ .Brewfile.lock.json | 11 +++++++++-- .config/fish/fish_variables | 9 +++++++++ .tool-versions | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.Brewfile b/.Brewfile index addad5d..85bb436 100644 --- a/.Brewfile +++ b/.Brewfile @@ -37,4 +37,7 @@ cask "ngrok" brew "httpie" brew "fd" cask "tailscale" +<<<<<<< Updated upstream cask "discord" +======= +>>>>>>> Stashed changes diff --git a/.Brewfile.lock.json b/.Brewfile.lock.json index 1ae5271..02b6d6f 100644 --- a/.Brewfile.lock.json +++ b/.Brewfile.lock.json @@ -705,26 +705,33 @@ "options": { "full_name": "tailscale" } +<<<<<<< Updated upstream }, "discord": { "version": "0.0.268", "options": { "full_name": "discord" } +======= +>>>>>>> Stashed changes } }, "tap": { "homebrew/cask-fonts": { +<<<<<<< Updated upstream "revision": "dd754afae30462d97f5fb7729153eb460b7a6878" +======= + "revision": "a8e6cf6d9226d1f0c9d2d0562419d48759e84318" +>>>>>>> Stashed changes } } }, "system": { "macos": { "monterey": { - "HOMEBREW_VERSION": "3.5.9", + "HOMEBREW_VERSION": "3.5.10", "HOMEBREW_PREFIX": "/opt/homebrew", - "Homebrew/homebrew-core": "9341434f53b7dfcb58a9c64b9ad0f804bad40cde", + "Homebrew/homebrew-core": "a6ca0deb4375420a7826a540ba804fbb0161f2f1", "CLT": "13.4.0.0.1.1651278267", "Xcode": "13.4", "macOS": "12.5" diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index ba169e8..1729e93 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -25,6 +25,14 @@ SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fish SETUVAR _fisher_jorgebucaran_2F_hydro_files:\x7e/\x2econfig/fish/functions/fish_mode_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_prompt\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/hydro\x2efish SETUVAR _fisher_plugins:jorgebucaran/fisher\x1edracula/fish\x1ejorgebucaran/hydro SETUVAR _fisher_upgraded_to_4_4:\x1d +SETUVAR _hydro_git_16272:sloanelybutsurely/DRP\x2d961\x2dmaintain\x2dheaders\x2dwhen\x2dselecting\x2dbirthday\x2drow\x20 +SETUVAR _hydro_git_20464:sloanelybutsurely/DRP\x2d961\x2dmaintain\x2dheaders\x2dwhen\x2dselecting\x2dbirthday\x2drow\x20 +SETUVAR _hydro_git_35292:\x1d +SETUVAR _hydro_git_4001:main\u2022\x20 +SETUVAR _hydro_git_41063:main\x20 +SETUVAR _hydro_git_71345:main\x20 +SETUVAR _hydro_git_75079:main\x20 +SETUVAR _hydro_git_8703:main\x20 SETUVAR fish_color_autosuggestion:555\x1ebrblack SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_command:005fd7 @@ -53,3 +61,4 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr +SETUVAR fish_user_paths:/opt/homebrew/opt/grep/libexec/gnubin\x1e/opt/homebrew/opt/coreutils/libexec/gnubin diff --git a/.tool-versions b/.tool-versions index f6de5b0..b66aa3d 100644 --- a/.tool-versions +++ b/.tool-versions @@ -2,3 +2,4 @@ direnv 2.32.1 elixir 1.14.0-otp-25 erlang 25.0.4 nodejs 18.7.0 +racket 8.6