From fed2814216dd1011b8ac6ea8833dd01c9b93cc06 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Mon, 2 May 2022 02:00:58 -0400
Subject: [PATCH] Update some things

---
 applications/emacs.nix |  2 +-
 flake.lock             | 42 +++++++++++++++++++++---------------------
 home.nix               | 15 +++++++++++++++
 modules/games.nix      |  2 +-
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/applications/emacs.nix b/applications/emacs.nix
index 82d3d35..9a72374 100644
--- a/applications/emacs.nix
+++ b/applications/emacs.nix
@@ -1,6 +1,6 @@
 { config, pkgs, unstable, doomEmacs, ... }:
 let
-  emacsPackage = (unstable.emacsPackagesFor unstable.emacsPgtkGcc).emacsWithPackages (epkgs: with epkgs; [
+  emacsPackage = (unstable.emacsPackagesFor unstable.emacsPgtkNativeComp).emacsWithPackages (epkgs: with epkgs; [
     vterm
     pdf-tools
   ]);
diff --git a/flake.lock b/flake.lock
index bfd3a50..1e2c472 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,11 +56,11 @@
     },
     "emacs": {
       "locked": {
-        "lastModified": 1651320164,
-        "narHash": "sha256-I8HdecXidIOQCsJRTOgMui2gIx34VTD4M/sXnQgKhcE=",
+        "lastModified": 1651465270,
+        "narHash": "sha256-x6xJ++tBB7l02lok3mBTYykefjamF9BgK/9BbeQlxoQ=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8ac1c89acb7fd39c8094d0cb81cb3323bc3eb3dc",
+        "rev": "015c8c2cfd4f62d7f317e777ebaef0df39e7a748",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1651300005,
-        "narHash": "sha256-Qj5mR4Db0pvuC69tCfuikS97W4B2TZRoMrhxILZGY40=",
+        "lastModified": 1651386404,
+        "narHash": "sha256-hc07/4laqkyxPxb+VH23rtXHMET/LLkS8r9zk6LBgYE=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "c043ece6b0a48c384bcdaf7b80851b97d50b13d4",
+        "rev": "baa2fefecd746a0a02d43eb11c930d3c0dee6753",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1651262513,
-        "narHash": "sha256-5iW1fevaAD0Rbtbgb4I++7fyaND3oarGs3mAjyadE0Y=",
+        "lastModified": 1651415224,
+        "narHash": "sha256-O/EzwxUMa1OawWEwhS10Xki7RX3+hSgaJJziHeI4d7c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f8b51be7149a0735e87b232d21ae4f852619eac7",
+        "rev": "26858fc0dbed71fa0609490fc2f2643e0d175328",
         "type": "github"
       },
       "original": {
@@ -357,11 +357,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1651114127,
-        "narHash": "sha256-/lLC0wkMZkAdA5e1W76SnJzbhfOGDvync3VRHJMtAKk=",
+        "lastModified": 1651369430,
+        "narHash": "sha256-d86uUm0s11exU9zLo2K1AwtJQJDKubFpoF0Iw767uT4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6766fb6503ae1ebebc2a9704c162b2aef351f921",
+        "rev": "b283b64580d1872333a99af2b4cef91bb84580cf",
         "type": "github"
       },
       "original": {
@@ -371,11 +371,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1651093906,
-        "narHash": "sha256-kHXSbv+Hc73eV0/JVJ5YsJGr08bA4vJ3/XZew5PgZg0=",
+        "lastModified": 1651310835,
+        "narHash": "sha256-MLk/zsLlbPhwFucxL64Fr+oIrvQC2/76Ap2F7ekbPNI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "feea25c58657fa81d16e0e51f80e1a02ef4cbd49",
+        "rev": "fd3e33d696b81e76b30160dfad2efb7ac1f19879",
         "type": "github"
       },
       "original": {
@@ -507,11 +507,11 @@
         "quazip": "quazip"
       },
       "locked": {
-        "lastModified": 1651326850,
-        "narHash": "sha256-JOf/x2M6u5D805OHvzA5mq/eW2nNHly7oXGIh+iziqI=",
+        "lastModified": 1651387717,
+        "narHash": "sha256-+360jnBb0hl7slB0UpZwWp9lJR3M4Kz68X/mmQEcZkA=",
         "owner": "PolyMC",
         "repo": "PolyMC",
-        "rev": "1d95f1009011b9c0c8ff4b5f1c4ae816385880a6",
+        "rev": "8110040f869aa784065f184feaa339d73e11757e",
         "type": "github"
       },
       "original": {
@@ -585,11 +585,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1651234072,
-        "narHash": "sha256-i0G0brnVCe82OtWlfLWeMfhDLmtuqN4nOH5HKXLwp8E=",
+        "lastModified": 1651342521,
+        "narHash": "sha256-ZuxeJRrtwITL7Ab4GGXWEnbff1tJdUq+VYkqlBMNh3k=",
         "owner": "rust-analyzer",
         "repo": "rust-analyzer",
-        "rev": "c6995a372f48afb40e2657defb448312281be8ad",
+        "rev": "ce9cc7de3203d721452bc500891cc49a22224052",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index 20bc5fb..558bdea 100644
--- a/home.nix
+++ b/home.nix
@@ -15,6 +15,17 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
+    # Disable git "safe directories" for root
+    # This is _highly_ cautioned against, but the feature breaks my workflow
+    users.root = {
+      programs.git = {
+        extraConfig = {
+          safe = {
+            directory = "*";
+          };
+        };
+      };
+    };
     users.nathan = {
       programs.home-manager.enable = true;
       ## Shell
@@ -150,6 +161,10 @@
           credential = {
             helper = "cache";
           };
+          # Disable annoying safe directory nonsense
+          safe = {
+            directory = "*";
+          };
         };
       };
       # SSH configuration
diff --git a/modules/games.nix b/modules/games.nix
index e7d83c4..583c664 100644
--- a/modules/games.nix
+++ b/modules/games.nix
@@ -7,7 +7,7 @@
     in
     with unstable; [
       # Dwarf fortress
-      (dwarf-fortress-packages.dwarf-fortress-full.override {
+      (pkgs.dwarf-fortress-packages.dwarf-fortress-full.override {
         enableFPS = true;
       })
       # PolyMC minecraft stuff