diff --git a/files/fish/config.fish b/files/fish/config.fish
index fc036d8..338b857 100644
--- a/files/fish/config.fish
+++ b/files/fish/config.fish
@@ -2,6 +2,8 @@ set -g fish_user_paths "/usr/local/sbin" $fish_user_paths
 
 set -x PIPENV_VENV_IN_PROJECT true
 
+eval "$(/opt/homebrew/bin/brew shellenv)"
+
 export GOPATH="$HOME/.go"
 if type -q brew
   export GOROOT=(brew --prefix go)"/libexec"
@@ -16,6 +18,6 @@ if [ -f '$HOME/Desktop/google-cloud-sdk/path.fish.inc' ]; . '$HOME/Desktop/googl
 [ -f ~/.config/tabtab/fish/__tabtab.fish ]; and . ~/.config/tabtab/fish/__tabtab.fish; or true
 
 # pnpm
-set -gx PNPM_HOME "/Users/nicco/Library/pnpm"
+set -gx PNPM_HOME "$HOME/Library/pnpm"
 set -gx PATH "$PNPM_HOME" $PATH
-# pnpm end
\ No newline at end of file
+# pnpm end
diff --git a/files/git/config.lenovo b/files/git/config.lenovo
deleted file mode 100644
index 6088a02..0000000
--- a/files/git/config.lenovo
+++ /dev/null
@@ -1,4 +0,0 @@
-[user]
-	name = cupcakearmy
-	email = hi@nicco.io
-	signingkey = AA0B5902A4F2F4F4
diff --git a/files/git/config.work b/files/git/config.work
index ec0eedf..dcb9b24 100644
--- a/files/git/config.work
+++ b/files/git/config.work
@@ -1,4 +1,4 @@
 [user]
 	name = Niccolo Borgioli
-	email = niccolo.borgioli@lovoo.com
-	signingkey = 9ACAD419A6BEAAAC
+	email = hi@nicco.io
+	signingkey = 0929BB4153C1164A
diff --git a/files/git/gitconfig b/files/git/gitconfig
index 40eddd4..3d8cff5 100644
--- a/files/git/gitconfig
+++ b/files/git/gitconfig
@@ -13,10 +13,8 @@
 [includeIf "gitdir:/Users/nicco/"]
 	path = "~/.dotfiles/files/git/config.personal"
 
-[includeIf "gitdir:/Users/niccolo.borgioli/"]
+[includeIf "gitdir:/Users/niccoloborgioli/"]
 	path = "~/.dotfiles/files/git/config.work"
 
-[includeIf "gitdir:/home/nicco/"]
-	path = "~/.dotfiles/files/git/config.lenovo"
 [pull]
 	rebase = false