From 09ad3d10e7147bee8a0c98321ee8c786c3f02ef3 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@jellyfish.co>
Date: Wed, 6 Mar 2024 10:17:27 -0500
Subject: [PATCH] some stuff

---
 nix/home-manager/flake.lock                   | 42 +++++++++----------
 nix/home-manager/home.nix                     |  2 +-
 nix/home-manager/modules/packages/git.nix     |  4 ++
 .../modules/packages/neovim/core.lua          |  8 +++-
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock
index 1fc7102..a735a6e 100644
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@@ -60,11 +60,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -121,11 +121,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708806879,
-        "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
+        "lastModified": 1709730597,
+        "narHash": "sha256-7pt87etuIH8CDHAwP+U4yq9EmzDaKYfCgYnE9wpEdhk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
+        "rev": "692726d2ad5727cf14c563d0f1d2c015c021d7a5",
         "type": "github"
       },
       "original": {
@@ -219,11 +219,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708830466,
-        "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
+        "lastModified": 1709708644,
+        "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
+        "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b",
         "type": "github"
       },
       "original": {
@@ -248,11 +248,11 @@
         "nmt": "nmt"
       },
       "locked": {
-        "lastModified": 1708966912,
-        "narHash": "sha256-Ee92D/hOgJX2mGHxYEB50zu6OoqVFN4chTxxpAYj57c=",
+        "lastModified": 1709513017,
+        "narHash": "sha256-Ch86BJ023rvYI4bHAeLKkY6ctQIXMJ+NOVKYo3+SEjQ=",
         "owner": "nixneovim",
         "repo": "nixneovim",
-        "rev": "81f257a375aa66d0ae8cd2ac1c3215b42b20786e",
+        "rev": "80485170869551e50a405e61bb3b37bf17319c98",
         "type": "github"
       },
       "original": {
@@ -274,11 +274,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1708870615,
-        "narHash": "sha256-9GeZzoT8kxJY3OkpeOo/eJ4bqwaQTGggv3fR/5UdIkY=",
+        "lastModified": 1709240484,
+        "narHash": "sha256-e7Azz4vD3ogyDbpfEbMunYjPOytBxvcwKblwkIu+Q+M=",
         "owner": "nixneovim",
         "repo": "nixneovimplugins",
-        "rev": "eb98507f0309ddb74d81367838e742d47e9e456f",
+        "rev": "27a92496c702a58705b02193462811b00793ed3c",
         "type": "github"
       },
       "original": {
@@ -336,11 +336,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1708976249,
-        "narHash": "sha256-bA0rrmxj5K1W/EWgzpk1NUvEIyAk1hqsmxcRCmmXFuw=",
+        "lastModified": 1709732499,
+        "narHash": "sha256-XDLPneHDcU3w67mLKZtrRzPDZ0mEhtyL8ueldo9ua0o=",
         "owner": "nixOS",
         "repo": "nixpkgs",
-        "rev": "d8e0944e6d2ce0f326040e654c07a410e2617d47",
+        "rev": "f68e18609fce7c8fd0719d8d4b7e5711d14d79ea",
         "type": "github"
       },
       "original": {
@@ -369,11 +369,11 @@
     "nmt": {
       "flake": false,
       "locked": {
-        "lastModified": 1694274695,
-        "narHash": "sha256-PufoLMSuBYkga8hTqYf/cIQzSuy2lfFj+cdKcp2nLEI=",
+        "lastModified": 1709382952,
+        "narHash": "sha256-n/BvuWVcQxaXCU30feNRqWWqabhIIO2+tRFnhLIhjiQ=",
         "owner": "jooooscha",
         "repo": "nmt",
-        "rev": "29595267923b4a6ce766ff0d85afaa930842b88d",
+        "rev": "86a09994d1007c39a1f4d386e3caea9b4681d9d6",
         "type": "github"
       },
       "original": {
diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix
index 80f9185..67b7f6e 100644
--- a/nix/home-manager/home.nix
+++ b/nix/home-manager/home.nix
@@ -96,7 +96,7 @@ in {
     enable = true;
     git = true;
     icons = true;
-    enableAliases = true;
+    enableAliases = false; # this makes ls etc super ugly, so specifically disabling
   };
 
   programs.gh = {
diff --git a/nix/home-manager/modules/packages/git.nix b/nix/home-manager/modules/packages/git.nix
index d553ff8..6f3cb5c 100644
--- a/nix/home-manager/modules/packages/git.nix
+++ b/nix/home-manager/modules/packages/git.nix
@@ -83,6 +83,10 @@
       rerere = {
         enabled = true;
       };
+
+      submodule = {
+        recurse = true;
+      };
     };
 
     includes = [
diff --git a/nix/home-manager/modules/packages/neovim/core.lua b/nix/home-manager/modules/packages/neovim/core.lua
index 99f23e4..0da016c 100644
--- a/nix/home-manager/modules/packages/neovim/core.lua
+++ b/nix/home-manager/modules/packages/neovim/core.lua
@@ -1,6 +1,12 @@
 vim.o.expandtab = true
 vim.o.foldlevel = 2
-vim.o.guifont = "Iosevka Custom,Apple Color Emoji,Noto Color Emoji:h14"
+local guifont = { "Iosevka Custom" }
+if vim.loop.os_uname().sysname == "Darwin" then
+	table.insert(guifont, "Apple Color Emoji")
+else
+	table.insert(guifont, "Noto Color Emoji")
+end
+vim.o.guifont = table.concat(guifont, ",") .. ":14"
 vim.o.hidden = true
 vim.o.ignorecase = true
 vim.o.inccommand = "split"