Merge branch 'master' of git.randomroad.net:dctrud/dotfiles

bin/backup_lab.sh

@@ -12,10 +12,10 @@ do
         --exclude "/run" \
         --exclude "/sys" \
         --exclude "/tmp" \
-        "root@${host}.randomroad.net:/" "/data/backup/pool_lab_${host}"
+        "root@${host}.randomroad.net:/" "/data/pool_lab_${host}"
 done
 
-DEST="/data/backup/borg_lab"
+DEST="/backup/borg_lab"
 echo "Creating borg backup..."
-borg create -s --progress "${DEST}::$(date '+%Y%m%d-%H%M')" /data/backup/pool_lab_*
+borg create -s --progress "${DEST}::$(date '+%Y%m%d-%H%M')" /data/pool_lab_*
 

bin/backup_web.sh

@@ -12,10 +12,10 @@ do
         --exclude "/run" \
         --exclude "/sys" \
         --exclude "/tmp" \
-        "root@${host}.randomroad.net:/" "/data/backup/pool_web_${host}"
+        "root@${host}.randomroad.net:/" "/data/pool_web_${host}"
 done
 
-DEST="/data/backup/borg_web"
+DEST="/backup/borg_web"
 echo "Creating borg backup..."
-borg create -s --progress "${DEST}::$(date '+%Y%m%d-%H%M')" /data/backup/pool_web_*
+borg create -s --progress "${DEST}::$(date '+%Y%m%d-%H%M')" /data/pool_web_*
 

bin/backup_ythel.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-DEST="/data/backup/borg_ythel"
+DEST="/backup/borg_ythel"
 SOURCES="/home /etc /var"
 
 doas borg create -s --progress ${DEST}::$(date '+%Y%m%d-%H%M') ${SOURCES}

source_fish/20_guix.fish

@@ -0,0 +1,22 @@
+if test -d "$HOME/.guix-profile"
+    set -x GUIX_PROFILE "$HOME/.guix-profile"
+    set -x GUIX_EXTRA_PROFILES "$HOME/.guix-extra-profiles"
+    source "$GUIX_PROFILE/etc/profile"
+end
+
+
+function aprofile
+
+    echo "Activating profile $1..."
+
+    set profile "$GUIX_EXTRA_PROFILES/$1/$1"
+
+    if test -f "$profile/etc/profile"
+        set GUIX_PROFILE "$profile"
+        source "$GUIX_PROFILE/etc/profile"
+    else
+        echo "Profile $1 does not exist"
+    end
+
+end
+

source_fish/50_anaconda.fish

@@ -3,10 +3,6 @@
 
 if test -d "$HOME/anaconda3/bin"
 
-    set green '\033[0;32m'
-    set NC '\033[0m' # No Color
-    #echo -e "$green [dotfiles] anaconda available to activate - aconda$NC"
-
     function aconda
 	    set -x PATH "$HOME/anaconda3/bin" $PATH
     end

source_fish/50_pyenv.fish

@@ -2,10 +2,6 @@
 
 if test -d "$HOME/.pyenv"
 
-    green='\033[0;32m'
-    NC='\033[0m' # No Color
-    echo -e "$green[dotfiles] pyenv available to activate - pyenv$NC"
-
     function pyenv
 
         set -x PATH "$HOME/.pyenv/bin" $PATH

source_fish/50_rbenv.fish

@@ -2,10 +2,6 @@
 
 if test -d "$HOME/.rbenv"
 
-    green='\033[0;32m'
-    NC='\033[0m' # No Color
-    echo -e "$green[dotfiles] rbenv available to activate - arbenv$NC"
-
     function arbenv
         set -x PATH "$HOME/.rbenv/bin" $PATH
         if which rbenv > /dev/null