From 94145e931fa176b24e04057b3fbc6077e6b6f661 Mon Sep 17 00:00:00 2001 From: Shaun Setlock Date: Tue, 31 Dec 2024 14:25:52 -0500 Subject: [PATCH] Separated fish configs for each distro family and updated docs. --- fish/README.md | 10 +++++++++- fish/config.fish | 9 --------- fish/config.fish.debian | 4 ++++ fish/config.fish.redhat | 4 ++++ 4 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 fish/config.fish create mode 100644 fish/config.fish.debian create mode 100644 fish/config.fish.redhat diff --git a/fish/README.md b/fish/README.md index f32db3a..52041a2 100644 --- a/fish/README.md +++ b/fish/README.md @@ -1,6 +1,7 @@ # Shaun's `fish` Dotfiles ## Location +### Config Directory The configuration files need to be present at this location, `~/.config/fish`. So, we can use the following command to softlink/symlink, ```bash @@ -8,7 +9,14 @@ ln -s ~/.config/fish # e.g. # ln -s ~/dotfiles/fish ~/.config/fish ``` -Ensure the file is adjusted (or a copy is made instead) which uncomments lines for the corresponding linux distro. +### Config File +The paths for certain distributions of Linux can be different. Two files are provided here, for RedHat and Debian family distro's, so we must ensure the correct file is linked. + +```bash +ln -s ~/.config/fish/config.fish.debian ~/.config/fish/config.fish +# or ... +ln -s ~/.config/fish/config.fish.redhat ~/.config/fish/config.fish +``` ## Install Powerline Font This font is expected within our configuration so we should install it. diff --git a/fish/config.fish b/fish/config.fish deleted file mode 100644 index 8d0521f..0000000 --- a/fish/config.fish +++ /dev/null @@ -1,9 +0,0 @@ -# For Debian-based Distro -#set fish_function_path $fish_function_path /usr/share/powerline/bindings/fish -#source /usr/share/powerline/bindings/fish/powerline-setup.fish -#powerline-setup - -# For RedHat-based Distro -set fish_function_path $fish_function_path /usr/share/powerline/bindings/fish -source /usr/share/powerline/fish/powerline-setup.fish -powerline-setup diff --git a/fish/config.fish.debian b/fish/config.fish.debian new file mode 100644 index 0000000..c9108c0 --- /dev/null +++ b/fish/config.fish.debian @@ -0,0 +1,4 @@ +# For Debian-based Distro +set fish_function_path $fish_function_path /usr/share/powerline/bindings/fish +source /usr/share/powerline/bindings/fish/powerline-setup.fish +powerline-setup diff --git a/fish/config.fish.redhat b/fish/config.fish.redhat new file mode 100644 index 0000000..dd8cb8e --- /dev/null +++ b/fish/config.fish.redhat @@ -0,0 +1,4 @@ +# For RedHat-based Distro +set fish_function_path $fish_function_path /usr/share/powerline/bindings/fish +source /usr/share/powerline/fish/powerline-setup.fish +powerline-setup