From f4c430c2c5164f34018cab864b24b59316a28ac8 Mon Sep 17 00:00:00 2001
From: pagedmov <pagedmov@gmail.com>
Date: Fri, 18 Oct 2024 19:24:52 -0400
Subject: [PATCH] Successfully melded nixvim configuration into the sysflake
 itself rather than using it as a flake input

---
 flake.lock                            | 23 +----------------------
 flake.nix                             |  6 ------
 hosts/installer/default.nix           | 21 +++++++++++++++++----
 modules/home/environment/userpkgs.nix | 23 +++++++++++++++++++----
 4 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/flake.lock b/flake.lock
index e32f1f1..9a28c72 100644
--- a/flake.lock
+++ b/flake.lock
@@ -878,8 +878,7 @@
         "nixvim": "nixvim",
         "nur": "nur",
         "spicetify-nix": "spicetify-nix",
-        "stylix": "stylix",
-        "toilet": "toilet"
+        "stylix": "stylix"
       }
     },
     "spicetify-nix": {
@@ -1042,26 +1041,6 @@
         "type": "github"
       }
     },
-    "toilet": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729154419,
-        "narHash": "sha256-h+n5Xrd8fkHCztLd+QtJwKZ3+LCNVlKPSoEKw/DrCj0=",
-        "owner": "pagedMov",
-        "repo": "toilet-extra-fonts",
-        "rev": "057dda35fc9893feeea2aba47987e4f9641e4df2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pagedMov",
-        "repo": "toilet-extra-fonts",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 71e3f59..507e006 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,11 +28,6 @@
       url = "github:gerg-l/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    toilet = {
-      url = "github:pagedMov/toilet-extra-fonts";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
@@ -41,7 +36,6 @@
     home-manager,
     self,
     nixvim,
-    toilet,
     stylix,
     ...
   } @ inputs: let
diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix
index 95dcddd..6b633d3 100644
--- a/hosts/installer/default.nix
+++ b/hosts/installer/default.nix
@@ -1,16 +1,29 @@
 {
   lib,
-  inputs,
   pkgs,
   modulesPath,
   ...
 }: let
-  nvim = inputs.nvim.packages."x86_64-linux".default;
-  toilet = inputs.toilet.packages."x86_64-linux".default;
   install-script = pkgs.writeShellScriptBin "movcfg-install" (builtins.readFile ./movcfg-install.sh);
+	extraFigletFonts = pkgs.fetchFromGitHub {
+      owner = "xero";
+      repo = "figlet-fonts";
+      rev = "master"; 
+      sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY="; 
+	};
+	toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
+		buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
+
+		installPhase = ''
+			make install PREFIX=$out
+			mkdir -p $out/share/figlet
+			cp -r ${extraFigletFonts}/* $out/share/figlet
+		'';
+	});
 in {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
+		../../modules/sys/software/nixvim
   ];
   nixpkgs.hostPlatform = "x86_64-linux";
   system.stateVersion = "24.05";
@@ -44,7 +57,7 @@ in {
     bc
     pciutils
     usbutils
-    toilet
+    toilet-extrafonts
     install-script
     nvim
   ];
diff --git a/modules/home/environment/userpkgs.nix b/modules/home/environment/userpkgs.nix
index 58f3317..075219a 100644
--- a/modules/home/environment/userpkgs.nix
+++ b/modules/home/environment/userpkgs.nix
@@ -1,10 +1,25 @@
 {
   pkgs,
-  inputs,
   host,
   ...
-}: let
-  toilet = inputs.toilet.packages."x86_64-linux".default;
+}:
+	let 
+	extraFigletFonts = pkgs.fetchFromGitHub {
+      owner = "xero";
+      repo = "figlet-fonts";
+      rev = "master"; 
+      sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY="; 
+	};
+	toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
+		buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
+
+		installPhase = ''
+			make install PREFIX=$out
+			mkdir -p $out/share/figlet
+			cp -r ${extraFigletFonts}/* $out/share/figlet
+		'';
+	});
+	
   desktop_pkgs =
     if (host == "oganesson")
     then
@@ -39,7 +54,7 @@ in {
       libreoffice
       gtrash
       ripgrep
-      toilet
+      toilet-extrafonts
       python3
     ]
     ++ desktop_pkgs;