From 4551974b12526fb9314bfca5332d1b8214c9d4f3 Mon Sep 17 00:00:00 2001
From: anemofilia <anemofilia@disroot.org>
Date: Sun, 6 Aug 2023 15:27:14 -0300
Subject: [PATCH] fix: move abbreviations to file:fish-abbreviations

---
 files/fish/config.fish       |  2 +-
 modules/radix/files/fish.scm | 12 ++++++++----
 radio.scm                    | 24 +-----------------------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/files/fish/config.fish b/files/fish/config.fish
index 14dedd6..125a90f 120000
--- a/files/fish/config.fish
+++ b/files/fish/config.fish
@@ -1 +1 @@
-/gnu/store/j38f52xh3npi5kk33k9j6nwkki5p8ds8-fish-config.fish
\ No newline at end of file
+/gnu/store/6w8x3w0kr8gkp9kcsbyvjzdvigclay40-fish-config.fish
\ No newline at end of file
diff --git a/modules/radix/files/fish.scm b/modules/radix/files/fish.scm
index 6cb615d..de4c114 100644
--- a/modules/radix/files/fish.scm
+++ b/modules/radix/files/fish.scm
@@ -1,11 +1,12 @@
 (define-module (radix files fish)
   #:use-module (gnu)
-  #:export (variables
+  #:export (abbreviations
             functions-greeting
-            functions-prompt))
+            functions-prompt
+            variables))
 
-(define variables
-  (local-file "../../../files/fish/fish_variables"))
+(define abbreviations
+  (local-file "../../../files/fish/fish_abbreviations"))
 
 (define functions-greeting
   (local-file "../../../files/fish/functions/fish_greeting.fish"))
@@ -13,3 +14,6 @@
 (define functions-prompt
   (local-file "../../../files/fish/functions/fish_prompt.fish"))
 
+(define variables
+  (local-file "../../../files/fish/fish_variables"))
+
diff --git a/radio.scm b/radio.scm
index 10437cd..cf433fa 100644
--- a/radio.scm
+++ b/radio.scm
@@ -202,29 +202,7 @@
         #|Shell services|#
         (service home-fish-service-type
                  (home-fish-configuration
-                  (abbreviations
-                   `(#|Download music and videos with based formats|#
-                     ("m" . "yt-dlp --prefer-free-formats --extract-audio")
-                     ("v" . "yt-dlp --prefer-free-formats")
-
-                     #|Guix related abbreviations|#
-                     ("!config --position anywhere" .
-                      "guix system reconfigure /etc/config.scm")
-                     ("!home --position anywhere" .
-                      "guix home reconfigure $HOME/projects/guile/radix/radio.scm")
-                     (":config --position anywhere" .
-                      "$EDITOR /etc/config.scm")
-                     (":home --position anywhere"   .
-                    "$EDITOR $HOME/projects/guile/radix/radio.scm")
-                     ("@radix --position anywhere"  .
-                     "$HOME/projects/guile/radix")
-                     ("@system --position anywhere" .
-                      "$HOME/projects/guile/radix/modules/radix/services")
-                     ("@home --position anywhere"   .
-                    "$HOME/projects/guile/radix/modules/radix/home/services")
-                     ("@files --position anywhere"  .
-                     "$HOME/projects/guile/radix/files")))
-
+                  (config (list file:fish-abbreviations))
                   (aliases
                    `(#|Common aliases|#
                      ("df"   . "df -h")