lots of new stuff

_sources/generated.json

@@ -1,9 +1,9 @@
 {
-    "linux-wallpaperengine-latest": {
+    "bang-bang": {
         "cargoLocks": null,
-        "date": "2024-05-11",
+        "date": "2023-07-23",
         "extract": null,
-        "name": "linux-wallpaperengine-latest",
+        "name": "bang-bang",
         "passthru": null,
         "pinned": false,
         "src": {
@@ -11,12 +11,112 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "owner": "Almamu",
+            "owner": "oh-my-fish",
-            "repo": "linux-wallpaperengine",
+            "repo": "plugin-bang-bang",
-            "rev": "13cc080410444ea72cceebdd5ea0ae7c23dd2270",
+            "rev": "ec991b80ba7d4dda7a962167b036efc5c2d79419",
-            "sha256": "sha256-XdFU5BKZPyGpV0PYmmM12efMFimt3eJAsG+dzyycIzo=",
+            "sha256": "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=",
             "type": "github"
         },
-        "version": "13cc080410444ea72cceebdd5ea0ae7c23dd2270"
+        "version": "ec991b80ba7d4dda7a962167b036efc5c2d79419"
+    },
+    "git-abbr": {
+        "cargoLocks": null,
+        "date": "2023-06-19",
+        "extract": null,
+        "name": "git-abbr",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "pupbrained",
+            "repo": "fish-git-abbr",
+            "rev": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e",
+            "sha256": "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=",
+            "type": "github"
+        },
+        "version": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e"
+    },
+    "gityaw": {
+        "cargoLocks": null,
+        "date": "2019-01-07",
+        "extract": null,
+        "name": "gityaw",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "oh-my-fish",
+            "repo": "plugin-gityaw",
+            "rev": "59196560e0f4520db63fb8cab645510377bb8b13",
+            "sha256": "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=",
+            "type": "github"
+        },
+        "version": "59196560e0f4520db63fb8cab645510377bb8b13"
+    },
+    "license": {
+        "cargoLocks": null,
+        "date": "2018-10-22",
+        "extract": null,
+        "name": "license",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "oh-my-fish",
+            "repo": "plugin-license",
+            "rev": "0155b16f102957ec0c734a90979245dc1073f979",
+            "sha256": "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=",
+            "type": "github"
+        },
+        "version": "0155b16f102957ec0c734a90979245dc1073f979"
+    },
+    "replay-fish": {
+        "cargoLocks": null,
+        "date": "2024-07-01",
+        "extract": null,
+        "name": "replay-fish",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "jorgebucaran",
+            "repo": "replay.fish",
+            "rev": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c",
+            "sha256": "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=",
+            "type": "github"
+        },
+        "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c"
+    },
+    "wttr": {
+        "cargoLocks": null,
+        "date": "2016-05-23",
+        "extract": null,
+        "name": "wttr",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "oh-my-fish",
+            "repo": "plugin-wttr",
+            "rev": "7500e382e6b29a463edc57598217ce0cfaf8c90c",
+            "sha256": "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=",
+            "type": "github"
+        },
+        "version": "7500e382e6b29a463edc57598217ce0cfaf8c90c"
     }
 }

_sources/generated.nix

@@ -1,15 +1,75 @@
 # This file was generated by nvfetcher, please do not modify it manually.
 {fetchFromGitHub}: {
-  linux-wallpaperengine-latest = {
+  bang-bang = {
-    pname = "linux-wallpaperengine-latest";
+    pname = "bang-bang";
-    version = "13cc080410444ea72cceebdd5ea0ae7c23dd2270";
+    version = "ec991b80ba7d4dda7a962167b036efc5c2d79419";
     src = fetchFromGitHub {
-      owner = "Almamu";
+      owner = "oh-my-fish";
-      repo = "linux-wallpaperengine";
+      repo = "plugin-bang-bang";
-      rev = "13cc080410444ea72cceebdd5ea0ae7c23dd2270";
+      rev = "ec991b80ba7d4dda7a962167b036efc5c2d79419";
       fetchSubmodules = false;
-      sha256 = "sha256-XdFU5BKZPyGpV0PYmmM12efMFimt3eJAsG+dzyycIzo=";
+      sha256 = "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=";
     };
-    date = "2024-05-11";
+    date = "2023-07-23";
+  };
+  git-abbr = {
+    pname = "git-abbr";
+    version = "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e";
+    src = fetchFromGitHub {
+      owner = "pupbrained";
+      repo = "fish-git-abbr";
+      rev = "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e";
+      fetchSubmodules = false;
+      sha256 = "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=";
+    };
+    date = "2023-06-19";
+  };
+  gityaw = {
+    pname = "gityaw";
+    version = "59196560e0f4520db63fb8cab645510377bb8b13";
+    src = fetchFromGitHub {
+      owner = "oh-my-fish";
+      repo = "plugin-gityaw";
+      rev = "59196560e0f4520db63fb8cab645510377bb8b13";
+      fetchSubmodules = false;
+      sha256 = "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=";
+    };
+    date = "2019-01-07";
+  };
+  license = {
+    pname = "license";
+    version = "0155b16f102957ec0c734a90979245dc1073f979";
+    src = fetchFromGitHub {
+      owner = "oh-my-fish";
+      repo = "plugin-license";
+      rev = "0155b16f102957ec0c734a90979245dc1073f979";
+      fetchSubmodules = false;
+      sha256 = "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=";
+    };
+    date = "2018-10-22";
+  };
+  replay-fish = {
+    pname = "replay-fish";
+    version = "d2ecacd3fe7126e822ce8918389f3ad93b14c86c";
+    src = fetchFromGitHub {
+      owner = "jorgebucaran";
+      repo = "replay.fish";
+      rev = "d2ecacd3fe7126e822ce8918389f3ad93b14c86c";
+      fetchSubmodules = false;
+      sha256 = "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=";
+    };
+    date = "2024-07-01";
+  };
+  wttr = {
+    pname = "wttr";
+    version = "7500e382e6b29a463edc57598217ce0cfaf8c90c";
+    src = fetchFromGitHub {
+      owner = "oh-my-fish";
+      repo = "plugin-wttr";
+      rev = "7500e382e6b29a463edc57598217ce0cfaf8c90c";
+      fetchSubmodules = false;
+      sha256 = "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=";
+    };
+    date = "2016-05-23";
   };
 }

modules/home/shell/fish.nix

@@ -2,6 +2,15 @@
 with pkgs; {
   programs = {
     fish = let
+      mkFishPlugin = sources: {
+        inherit (sources) src;
+        name = sources.pname;
+      };
+
+      sources = import ../../../_sources/generated.nix {inherit (pkgs) fetchFromGitHub;};
+
+      extraPlugins = lib.attrsets.mapAttrsToList (_: value: mkFishPlugin value) sources;
+
       mkFishPlugins = names:
         map (name: {
           inherit name;
@@ -12,62 +21,7 @@ with pkgs; {
       enable = true;
 
       plugins =
-        [
+        extraPlugins
-          {
-            name = "git-abbr";
-            src = fetchFromGitHub {
-              owner = "pupbrained";
-              repo = "fish-git-abbr";
-              rev = "faa3d2581b800c45960e8cd5087ff09acb936b85";
-              hash = "sha256-8gxqYGN9XIlX1cZovX6r5zo8C8hOrsYIVN39oVGbWv0=";
-            };
-          }
-          {
-            name = "replay.fish";
-            src = fetchFromGitHub {
-              owner = "jorgebucaran";
-              repo = "replay.fish";
-              rev = "bd8e5b89ec78313538e747f0292fcaf631e87bd2";
-              hash = "sha256-bM6+oAd/HXaVgpJMut8bwqO54Le33hwO9qet9paK1kY=";
-            };
-          }
-          {
-            name = "license";
-            src = fetchFromGitHub {
-              owner = "oh-my-fish";
-              repo = "plugin-license";
-              rev = "0155b16f102957ec0c734a90979245dc1073f979";
-              hash = "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=";
-            };
-          }
-          {
-            name = "wttr";
-            src = fetchFromGitHub {
-              owner = "oh-my-fish";
-              repo = "plugin-wttr";
-              rev = "7500e382e6b29a463edc57598217ce0cfaf8c90c";
-              hash = "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=";
-            };
-          }
-          {
-            name = "gityaw";
-            src = fetchFromGitHub {
-              owner = "oh-my-fish";
-              repo = "plugin-gityaw";
-              rev = "59196560e0f4520db63fb8cab645510377bb8b13";
-              hash = "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=";
-            };
-          }
-          {
-            name = "bang-bang";
-            src = fetchFromGitHub {
-              owner = "oh-my-fish";
-              repo = "plugin-bang-bang";
-              rev = "ec991b80ba7d4dda7a962167b036efc5c2d79419";
-              hash = "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=";
-            };
-          }
-        ]
         ++ (mkFishPlugins ["autopair" "bass" "colored-man-pages" "done" "fifc" "forgit" "grc"]);
 
       shellAliases = {
@@ -77,13 +31,6 @@ with pkgs; {
         cp = "${xcp}/bin/xcp";
       };
 
-      shellAbbrs = {
-        gcm = {
-          setCursor = true;
-          expansion = "git commit -m '%'";
-        };
-      };
-
       interactiveShellInit = ''
         function fish_greeting
           macchina

modules/home/shell/macchina.nix

@@ -25,7 +25,11 @@ with pkgs; {
 
     themes = {
       Mezora = {
-        custom_ascii = {
+        custom_ascii =
+          # I prefer to use the default icon on macOS
+          if stdenv.isDarwin
+          then {}
+          else {
             path = writeText "nix_logo" ''
                         ▗▄▄▄       ▗▄▄▄▄    ▄▄▄▖
                         ▜███▙       ▜███▙  ▟███▛

nvfetcher.toml

@@ -1,3 +1,23 @@
-[linux-wallpaperengine-latest]
+[git-abbr]
-src.git = "https://github.com/Almamu/linux-wallpaperengine"
+src.git = "https://github.com/pupbrained/fish-git-abbr"
-fetch.github = "Almamu/linux-wallpaperengine"
+fetch.github = "pupbrained/fish-git-abbr"
+
+[replay-fish]
+src.git = "https://github.com/jorgebucaran/replay.fish"
+fetch.github = "jorgebucaran/replay.fish"
+
+[license]
+src.git = "https://github.com/oh-my-fish/plugin-license"
+fetch.github = "oh-my-fish/plugin-license"
+
+[wttr]
+src.git = "https://github.com/oh-my-fish/plugin-wttr"
+fetch.github = "oh-my-fish/plugin-wttr"
+
+[gityaw]
+src.git = "https://github.com/oh-my-fish/plugin-gityaw"
+fetch.github = "oh-my-fish/plugin-gityaw"
+
+[bang-bang]
+src.git = "https://github.com/oh-my-fish/plugin-bang-bang"
+fetch.github = "oh-my-fish/plugin-bang-bang"