Finish adding files from new moyo, misc updates

2 files changed, 10 insertions, 8 deletions

diff --git a/nix_archive/nix/programs/firefox.nix b/nix_archive/nix/programs/firefox.nix
index d278bd4..c485e49 100644
--- a/nix_archive/nix/programs/firefox.nix
+++ b/nix_archive/nix/programs/firefox.nix
@@ -19,8 +19,8 @@ in {
       source = (pkgs.fetchFromGitHub {
         owner = "rafaelmardojai";
         repo = "firefox-gnome-theme";
-        rev = "0909cfe4a2af8d358ad13b20246a350e14c2473d";
-        hash = "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=";
+        rev = "afd438034bf91089cfeb9e6b5cb987bdf5442d0f";
+        hash = "sha256-0E3TqvXAy81qeM/jZXWWOTZ14Hs1RT7o78UyZM+Jbr4=";
       });
     };
     home.file."customChrome.css" = {
diff --git a/nix_archive/nix/user.nix b/nix_archive/nix/user.nix
index 817d36e..3c78a18 100644
--- a/nix_archive/nix/user.nix
+++ b/nix_archive/nix/user.nix
@@ -169,16 +169,18 @@ in {
     };
     programs.git = {
       enable = true;
-      userEmail = "andrew@akon.city";
-      userName = "Andrew Opalach";
+      settings = {
+        user = {
+          email = "andrew@akon.city";
+          name = "Andrew Opalach";
+        };
+        format.signOff = true;
+        init.defaultBranch = "master";
+      };
       signing = {
         key = "99659CB58598BDDB"; # The last digits of the key.
         signByDefault = true;
       };
-      extraConfig = {
-        format.signOff = true;
-        init.defaultBranch = "master";
-      };
     };
     home.file.".config/gdb/gdbinit".source = ../../files/gdbinit;
     home.file.".config/colors.json".text = ''