From cd02dad22ff8cf2b21cfa85a730ff27a288f721b Mon Sep 17 00:00:00 2001
From: Morten Strandbo <morten@strandbo.no>
Date: Wed, 29 Nov 2023 12:47:39 +0100
Subject: [PATCH] v1?

---
 initial_setup.sh     | 10 +++++-----
 zx_customconfig.fish | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/initial_setup.sh b/initial_setup.sh
index 0939fff..904dcab 100644
--- a/initial_setup.sh
+++ b/initial_setup.sh
@@ -11,15 +11,15 @@ sudo nala install exa fish neofetch -y
 # Get some custom configs
 echo "## Downloading configs"
 sleep 1
-wget -O /tmp/zx_customconfig.fish https://code.strandbo.no/morten/Initial_linux_setup/raw/branch/main/zx_customconfig.fish
-wget -O /tmp/config.conf https://code.strandbo.no/morten/Initial_linux_setup/raw/branch/main/config.conf
-wget -O /tmp/st_combadge.ascii https://code.strandbo.no/morten/Initial_linux_setup/raw/branch/main/st_combadge.ascii
+wget -q -O /tmp/zx_customconfig.fish https://code.strandbo.no/morten/Initial_linux_setup/raw/branch/main/zx_customconfig.fish
+wget -q -O /tmp/config.conf https://code.strandbo.no/morten/Initial_linux_setup/raw/branch/main/config.conf
+wget -q -O /tmp/st_combadge.ascii https://code.strandbo.no/morten/Initial_linux_setup/raw/branch/main/st_combadge.ascii
 
 # Move them about and rub
 echo "## Placing files and rubbing 'em"
 # Global stuff
 sudo /bin/cp -f /tmp/zx_customconfig.fish /etc/profile.d/02-zx_customaliases.sh
-sudo sed -i '1,3d' /etc/profile.d/02-zx_customaliases.sh
+sudo sed -i '1,9d' /etc/profile.d/02-zx_customaliases.sh
 sudo /bin/mv -f /tmp/zx_customconfig.fish /etc/fish/conf.d/
 sudo chown root:root /etc/fish/conf.d/zx_customconfig.fish
 if [[ ! -d /etc/neofetch/ ]]; then
@@ -29,6 +29,6 @@ fi
 sudo cp /tmp/st_combadge.ascii /etc/neofetch/ascii/
 sudo cp /tmp/config.conf /etc/neofetch/config.conf
 echo "## Disabling default motd"
-sudo chmod -x /etc/update-motd.d/
+sudo chmod -x /etc/update-motd.d/*
 
 echo "## All set up! Time to change shell ##"
\ No newline at end of file
diff --git a/zx_customconfig.fish b/zx_customconfig.fish
index d13e889..ac895e2 100644
--- a/zx_customconfig.fish
+++ b/zx_customconfig.fish
@@ -2,6 +2,12 @@ if status is-interactive
     # Commands to run in interactive sessions can go here
 end
 
+# functions and changes
+set -U fish_prompt_pwd_dir_length 0
+function fish_greeting
+    neofetch --ascii /etc/neofetch/ascii/st_combadge.ascii --config /etc/neofetch/config.conf
+end
+
 # A few aliases for exa, a ls replacement
 alias ll="exa --sort Name --long --header"
 alias la="exa --sort Name --long --all --header"
@@ -14,8 +20,3 @@ alias ls="exa --sort Name --header"
 # other aliases
 alias copy='rsync -ah --progress'
 
-# functions and changes
-set -U fish_prompt_pwd_dir_length 0
-function fish_greeting
-    neofetch --ascii /etc/neofetch/ascii/st_combadge.ascii
-end
\ No newline at end of file