diff --git a/fish/dot-config/fish/conf.d/go.fish b/fish/dot-config/fish/conf.d/go.fish
new file mode 100644
index 0000000..53e081e
--- /dev/null
+++ b/fish/dot-config/fish/conf.d/go.fish
@@ -0,0 +1,3 @@
+if not contains $GOBIN $PATH
+    set -x PATH $GOBIN $PATH
+end
diff --git a/fish/dot-config/fish/conf.d/virtualfish-loader.fish b/fish/dot-config/fish/conf.d/virtualfish-loader.fish
deleted file mode 100644
index f3a828a..0000000
--- a/fish/dot-config/fish/conf.d/virtualfish-loader.fish
+++ /dev/null
@@ -1,10 +0,0 @@
-set -g VIRTUALFISH_VERSION 2.5.9
-switch (uname -s)
-    case Darwin
-        set -g VIRTUALFISH_PYTHON_EXEC /opt/homebrew/Cellar/virtualfish/2.5.9/libexec/bin/python
-        source /opt/homebrew/Cellar/virtualfish/2.5.9/libexec/lib/python3.12/site-packages/virtualfish/virtual.fish
-    case Linux
-        set -g VIRTUALFISH_PYTHON_EXEC /usr/bin/python
-        source $HOME/.local/lib/python3.12/site-packages/virtualfish/virtual.fish
-end
-emit virtualfish_did_setup_plugins
diff --git a/fish/dot-config/fish/config.fish b/fish/dot-config/fish/config.fish
index 7b69259..14f204d 100755
--- a/fish/dot-config/fish/config.fish
+++ b/fish/dot-config/fish/config.fish
@@ -8,11 +8,6 @@ set -x SHELL /usr/bin/fish
 set -x GOPATH $HOME/.local/share/go
 set -x GOBIN $GOPATH/bin
 
-## Add custom paths on shell PATH
-for p in $GOBIN
-    set PATH $p $PATH
-end
-
 ## Export variable need for qt-theme
 if type qtile >>/dev/null 2>&1
     set -x QT_QPA_PLATFORMTHEME qt5ct
@@ -140,7 +135,7 @@ function paths
 end
 
 function system-upgrade
-    sudo dnf upgrade && brew upgrade && mise upgrade && rustup upgrade
+    sudo dnf upgrade && flatpak upgrade && mise upgrade && rustup upgrade
 end
 
 ## Useful aliases
diff --git a/fish/dot-config/fish/fish_variables b/fish/dot-config/fish/fish_variables
index ad8c1fb..81c255b 100755
--- a/fish/dot-config/fish/fish_variables
+++ b/fish/dot-config/fish/fish_variables
@@ -4,7 +4,6 @@ SETUVAR --export BAT_PAGER:moar
 SETUVAR --export EDITOR:nvim
 SETUVAR --export FZF_DEFAULT_COMMAND:fd\x20\x2d\x2dtype\x20f
 SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23414559\x2cbg\x3a\x23303446\x2cspinner\x3a\x23f2d5cf\x2chl\x3a\x23e78284\x20\x2d\x2dcolor\x3dfg\x3a\x23c6d0f5\x2cheader\x3a\x23e78284\x2cinfo\x3a\x23ca9ee6\x2cpointer\x3a\x23f2d5cf\x20\x2d\x2dcolor\x3dmarker\x3a\x23f2d5cf\x2cfg\x2b\x3a\x23c6d0f5\x2cprompt\x3a\x23ca9ee6\x2chl\x2b\x3a\x23e78284
-SETUVAR --export HOMEBREW_NO_ENV_HINTS:1
 SETUVAR --export MANPAGER:sh\x20\x2dc\x20\x27col\x20\x2dbx\x20\x7c\x20bat\x20\x2dl\x20man\x20\x2dp\x27
 SETUVAR --export MANROFFOPT:\x2dc
 SETUVAR __done_min_cmd_duration:10000
diff --git a/fish/dot-config/fish/functions/__sdkman-noexport-init.sh b/fish/dot-config/fish/functions/__sdkman-noexport-init.sh
deleted file mode 100755
index a86652c..0000000
--- a/fish/dot-config/fish/functions/__sdkman-noexport-init.sh
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/env bash
-
-#
-#   Copyright 2021 Marco Vermeulen
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# set env vars if not set
-if [ -z "$SDKMAN_CANDIDATES_API" ]; then
-	:
-fi
-
-if [ -z "$SDKMAN_DIR" ]; then
-	:
-fi
-
-# Load the sdkman config if it exists.
-if [ -f "${SDKMAN_DIR}/etc/config" ]; then
-	source "${SDKMAN_DIR}/etc/config"
-fi
-
-# Read the platform file
-SDKMAN_PLATFORM="$(cat "${SDKMAN_DIR}/var/platform")"
-:
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-darwin=false
-solaris=false
-freebsd=false
-SDKMAN_KERNEL="$(uname -s)"
-case "${SDKMAN_KERNEL}" in
-	CYGWIN*)
-		cygwin=true
-		;;
-	Darwin*)
-		darwin=true
-		;;
-	SunOS*)
-		solaris=true
-		;;
-	FreeBSD*)
-		freebsd=true
-esac
-
-# Determine shell
-zsh_shell=false
-bash_shell=false
-
-if [[ -n "$ZSH_VERSION" ]]; then
-	zsh_shell=true
-elif [[ -n "$BASH_VERSION" ]]; then
-	bash_shell=true
-fi
-
-# Source sdkman module scripts and extension files.
-#
-# Extension files are prefixed with 'sdkman-' and found in the ext/ folder.
-# Use this if extensions are written with the functional approach and want
-# to use functions in the main sdkman script. For more details, refer to
-# <https://github.com/sdkman/sdkman-extensions>.
-OLD_IFS="$IFS"
-IFS=$'\n'
-scripts=($(find "${SDKMAN_DIR}/src" "${SDKMAN_DIR}/ext" -type f -name 'sdkman-*.sh'))
-for f in "${scripts[@]}"; do
-	source "$f"
-done
-IFS="$OLD_IFS"
-unset OLD_IFS scripts f
-
-# Create upgrade delay file if it doesn't exist
-if [[ ! -f "${SDKMAN_DIR}/var/delay_upgrade" ]]; then
-	touch "${SDKMAN_DIR}/var/delay_upgrade"
-fi
-
-# set curl connect-timeout and max-time
-if [[ -z "$sdkman_curl_connect_timeout" ]]; then sdkman_curl_connect_timeout=7; fi
-if [[ -z "$sdkman_curl_max_time" ]]; then sdkman_curl_max_time=10; fi
-
-# set curl retry
-if [[ -z "${sdkman_curl_retry}" ]]; then sdkman_curl_retry=0; fi
-
-# set curl retry max time in seconds
-if [[ -z "${sdkman_curl_retry_max_time}" ]]; then sdkman_curl_retry_max_time=60; fi
-
-# set curl to continue downloading automatically
-if [[ -z "${sdkman_curl_continue}" ]]; then sdkman_curl_continue=true; fi
-
-# read list of candidates and set array
-SDKMAN_CANDIDATES_CACHE="${SDKMAN_DIR}/var/candidates"
-SDKMAN_CANDIDATES_CSV=$(<"$SDKMAN_CANDIDATES_CACHE")
-__sdkman_echo_debug "Setting candidates csv: $SDKMAN_CANDIDATES_CSV"
-if [[ "$zsh_shell" == 'true' ]]; then
-	SDKMAN_CANDIDATES=(${(s:,:)SDKMAN_CANDIDATES_CSV})
-else
-	IFS=',' read -a SDKMAN_CANDIDATES <<< "${SDKMAN_CANDIDATES_CSV}"
-fi
-
-:
-
-for candidate_name in "${SDKMAN_CANDIDATES[@]}"; do
-	candidate_dir="${SDKMAN_CANDIDATES_DIR}/${candidate_name}/current"
-	if [[ -h "$candidate_dir" || -d "${candidate_dir}" ]]; then
-		:
-		:
-	fi
-done
-unset candidate_name candidate_dir
-:
-
-# source completion scripts
-if [[ "$sdkman_auto_complete" == 'true' ]]; then
-	if [[ "$zsh_shell" == 'true' ]]; then
-		# initialize zsh completions (if not already done)
-		if ! (( $+functions[compdef] )) ; then
-			autoload -Uz compinit
-			if [[ $ZSH_DISABLE_COMPFIX == 'true' ]]; then
-				compinit -u -C
-			else
-				compinit
-			fi
-		fi
-		autoload -U bashcompinit
-		bashcompinit
-		source "${SDKMAN_DIR}/contrib/completion/bash/sdk"
-		__sdkman_echo_debug "ZSH completion script loaded..."
-	elif [[ "$bash_shell" == 'true' ]]; then
-		source "${SDKMAN_DIR}/contrib/completion/bash/sdk"
-		__sdkman_echo_debug "Bash completion script loaded..."
-	else
-		__sdkman_echo_debug "No completion scripts found for $SHELL"
-	fi
-fi
-
-if [[ "$sdkman_auto_env" == "true" ]]; then
-	if [[ "$zsh_shell" == "true" ]]; then
-		function sdkman_auto_env() {
-			if [[ -n $SDKMAN_ENV ]] && [[ ! $PWD =~ ^$SDKMAN_ENV ]]; then
-				sdk env clear
-			fi
-			if [[ -f .sdkmanrc ]]; then
-				sdk env
-			fi
-		}
-
-		chpwd_functions+=(sdkman_auto_env)
-	else
-		function sdkman_auto_env() {
-			if [[ -n $SDKMAN_ENV ]] && [[ ! $PWD =~ ^$SDKMAN_ENV ]]; then
-				sdk env clear
-			fi
-			if [[ "$SDKMAN_OLD_PWD" != "$PWD" ]] && [[ -f ".sdkmanrc" ]]; then
-				sdk env
-			fi
-
-			:
-		}
-		
-		trimmed_prompt_command="${PROMPT_COMMAND%"${PROMPT_COMMAND##*[![:space:]]}"}"
-		[[ -z "$trimmed_prompt_command" ]] && PROMPT_COMMAND="sdkman_auto_env" || PROMPT_COMMAND="${trimmed_prompt_command%\;};sdkman_auto_env"
-	fi
-
-	sdkman_auto_env
-fi