From 8c5ed1696442fa5e15fa3800e606b4301b94e4d1 Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Sun, 7 May 2023 13:10:24 +0200
Subject: [PATCH] Autoformat + modified Options shown using "lsblkf"

---
 home-manager/fish.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index 520d51b..b501eae 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -3,7 +3,8 @@
 {
   programs.fish = {
     enable = true;
-    interactiveShellInit = (builtins.readFile ./config/fish/conf.d/interactive.fish);
+    interactiveShellInit =
+      (builtins.readFile ./config/fish/conf.d/interactive.fish);
     shellAliases = {
       # open emacs in terminal
       emacs = "emacs --no-window-system";
@@ -15,7 +16,8 @@
       # colored ls output
       ls = "ls --color=auto";
       # kill all wine processes
-      killwine = "ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineserver' | perl -pe 's;^.*/proc/(\d+)/exe.*$;$1;g;' | xargs -n 1 kill";
+      killwine =
+        "ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineserver' | perl -pe 's;^.*/proc/(d+)/exe.*$;$1;g;' | xargs -n 1 kill";
       # colored grep output
       grep = "grep --color=auto";
       # yt-dlp aliases
@@ -24,16 +26,19 @@
       # best video
       ytv-best = "yt-dlp -f bestvideo+bestaudio ";
       # download video including metadata from youtube
-      ytv-metadata = "yt-dlp -f bestvideo+bestaudio --add-metadata --parse-metadata \"%(title)s:%(meta_title)s\" --parse-metadata \"%(uploader)s:%(meta_artist)s\" --write-info-json --write-thumbnail --embed-thumbnail --embed-subs --sub-langs \"en.*\" --merge-output-format mkv ";
+      ytv-metadata = ''
+        yt-dlp -f bestvideo+bestaudio --add-metadata --parse-metadata "%(title)s:%(meta_title)s" --parse-metadata "%(uploader)s:%(meta_artist)s" --write-info-json --write-thumbnail --embed-thumbnail --embed-subs --sub-langs "en.*" --merge-output-format mkv '';
       # activate venv called "venv" in the local directory
       activate = "source venv/bin/activate.fish";
       # lsblk including file system type
-      lsblkf = "lsblk -o NAME,FSTYPE,LABEL,MOUNTPOINT,SIZE,MODEL,UUID";
+      lsblkf =
+        "lsblk -o NAME,LABEL,RM,SIZE,RO,TYPE,FSTYPE,MOUNTPOINTS,MODEL,UUID";
       # color ip command
       ip = "ip -c";
     };
     functions = {
-      fish_prompt = (builtins.readFile ./config/fish/functions/fish_prompt.fish);
+      fish_prompt =
+        (builtins.readFile ./config/fish/functions/fish_prompt.fish);
     };
   };
 }