From 257d53e9934481c6ca7135e56024faffcbfcdd72 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@jellyfish.co>
Date: Mon, 24 Mar 2025 09:29:46 -0400
Subject: [PATCH] switch back to Maple, plus neovide changes

---
 nix/home-manager/flake.lock        | 20 +++-----------------
 nix/home-manager/flake.nix         |  4 ++--
 nix/home-manager/home.nix          |  4 ++--
 nix/home-manager/modules/files.nix |  4 ++--
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock
index 6bc440d..af949b5 100644
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@@ -277,26 +277,12 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1742606399,
-        "narHash": "sha256-NAxwF5cjgh8o5aylhePXWNQETCWYaTpNvdO2bMfINpQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0740f6f238767d4caf9afe774d3e88105766dfc6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix
index b4fc04e..694ba4d 100644
--- a/nix/home-manager/flake.nix
+++ b/nix/home-manager/flake.nix
@@ -35,8 +35,8 @@
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs = {
-        # nixpkgs.follows = "nixpkgs";
-        home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
+        # home-manager.follows = "home-manager";
       };
     };
     nixneovimplugins = {
diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix
index 4c9b742..d837efb 100644
--- a/nix/home-manager/home.nix
+++ b/nix/home-manager/home.nix
@@ -67,8 +67,8 @@ in
       # installBatSyntax = true;
       enableZshIntegration = true;
       settings = {
-        font-family = "Berkeley Mono";
-        font-style = "Retina";
+        font-family = "Maple Mono NF";
+        font-style = "Medium";
       };
     };
 
diff --git a/nix/home-manager/modules/files.nix b/nix/home-manager/modules/files.nix
index 5944957..7f6f009 100644
--- a/nix/home-manager/modules/files.nix
+++ b/nix/home-manager/modules/files.nix
@@ -7,14 +7,14 @@ let
   inherit (pkgs.stdenv.hostPlatform) isLinux;
   repo_root = "../../..";
   nv_fonts_basic = [
-    "Berkeley Mono"
     "Maple Mono NF"
+    "Berkeley Mono"
     "Departure Mono"
     "Fantasque Sans Mono"
   ];
   nv_fonts_normal =
     nv_fonts_basic ++ (if isLinux then [ "Noto Color Emoji" ] else [ "Apple Color Emoji" ]);
-  nv_fonts_italic = [ "Dank Mono" ] ++ nv_fonts_basic;
+  nv_fonts_italic = nv_fonts_basic;
 in
 {
   home.file = {