From 4fb0be475b64a20a1e5df7d28d8ac337dcf71000 Mon Sep 17 00:00:00 2001
From: Aria Nolan <aria@chytrid.org>
Date: Fri, 29 Mar 2024 17:45:55 -0400
Subject: [PATCH] flake and other stuff

---
 flake.lock                     | 48 +++++++++++++++++-----------------
 users/tacocat/home.nix         |  3 +--
 users/tacocat/programs/git.nix |  3 ++-
 users/tacocat/wayland/foot.nix |  2 +-
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index b6186ba..abcb796 100644
--- a/flake.lock
+++ b/flake.lock
@@ -218,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711554349,
-        "narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=",
+        "lastModified": 1711625603,
+        "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "179f6acaf7c068c7870542cdae72afec9427a5b0",
+        "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
         "type": "github"
       },
       "original": {
@@ -239,11 +239,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711133180,
-        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
+        "lastModified": 1711604890,
+        "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
+        "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710717205,
-        "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
+        "lastModified": 1711591334,
+        "narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
+        "rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711551697,
-        "narHash": "sha256-ZtsenZ4QtQICXtt24W87Bg8qYY2Ixx9bfHGLDyhVISY=",
+        "lastModified": 1711724506,
+        "narHash": "sha256-c+Rieg88Wmr1eh0TxkD9u82VOEe71VBFLmwyKYmhHWI=",
         "owner": "doronbehar",
         "repo": "nix-matlab",
-        "rev": "f0ad3b2e2e3b099a4361bc21baeb47c3eaf50788",
+        "rev": "38da0ef06fa5edee1ced5fb3c22f86ef1ecb4146",
         "type": "gitlab"
       },
       "original": {
@@ -328,11 +328,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1711333969,
-        "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
+        "lastModified": 1711523803,
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
         "type": "github"
       },
       "original": {
@@ -355,11 +355,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1711572924,
-        "narHash": "sha256-JLDnh9TJXJ8iLRd3dNtS48pqU6LraWUntK8Z7M0W184=",
+        "lastModified": 1711630555,
+        "narHash": "sha256-jslStwDlRwVZLwcFkExWegOGYv/Dn9q7yoocUX7AsIg=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "5fb9f0bb86edf08043ebf1cc3d16388469390c0a",
+        "rev": "acb917fbf2bc9ce9c556516d8a1f257709b3cf1e",
         "type": "github"
       },
       "original": {
@@ -370,11 +370,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1711581287,
-        "narHash": "sha256-168mSQ0RvuLDa8CeVfjZpfT6GE/Yh309jD4UnvpaGUY=",
+        "lastModified": 1711743910,
+        "narHash": "sha256-XEBT1xEfTalw1OUKEHMN+LyIyZZrtu4WvzcLu34eFy0=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "439132433acf7a45c24ed30bf0578a6da4a8808e",
+        "rev": "7e6f9ce704b7362eb5b0f8a8e72b25b750170289",
         "type": "github"
       },
       "original": {
@@ -398,11 +398,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711409088,
-        "narHash": "sha256-+rTCra8TY4vuSNTtQ0tcex1syCRPoKyb8vyHmoxkga4=",
+        "lastModified": 1711519547,
+        "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "db656fc3e34907000df26e8bc5cc3c94fb27f353",
+        "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a",
         "type": "github"
       },
       "original": {
diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index 9f46867..8b2050e 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -61,10 +61,9 @@
       fira-code
       mononoki
       inter
-      (nerdfonts.override {fonts = ["FiraCode"];})
+      (nerdfonts.override {fonts = ["FiraCode" "Mononoki"];})
       pandoc
       pdftk
-      git
       lua
       python3
       pamixer
diff --git a/users/tacocat/programs/git.nix b/users/tacocat/programs/git.nix
index ed0823d..e027d79 100644
--- a/users/tacocat/programs/git.nix
+++ b/users/tacocat/programs/git.nix
@@ -1,6 +1,7 @@
-{
+{pkgs, ...}: {
   programs.git = {
     enable = true;
+    package = pkgs.gitAndTools.gitFull;
     userEmail = "aria@chytrid.org";
     userName = "Aria Nolan";
     extraConfig = {
diff --git a/users/tacocat/wayland/foot.nix b/users/tacocat/wayland/foot.nix
index 67e8f5b..2d72997 100644
--- a/users/tacocat/wayland/foot.nix
+++ b/users/tacocat/wayland/foot.nix
@@ -4,7 +4,7 @@
     settings = {
       main = {
         shell = "/usr/bin/env fish";
-        font = "Mononoki:size=14,FiraCode Nerd Font:size=14";
+        font = "Mononoki Nerd Font:size=14";
       };
       colors = {
         background = "232136";