update lockfile :D

home/cli/git.nix

@@ -7,9 +7,13 @@
     git-credential-oauth
   ];
 
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+  };
+
   programs.git = {
     enable = true;
-    delta.enable = true;
     lfs.enable = true;
 
     ignores = ["*~" ".direnv"];
@@ -19,14 +23,15 @@
       signByDefault = true;
     };
 
-    extraConfig = {
+    settings = {
       gpg.format = "ssh";
       push.autoSetupRemote = true;
       pull.rebase = true;
       rebase.autostash = true;
+      user = {
+        name = "xunuwu";
+        email = "xunuwu@gmail.com";
+      };
     };
-
-    userEmail = "xunuwu@gmail.com";
-    userName = "xunuwu";
   };
 }

home/cli/jujutsu.nix

@@ -3,8 +3,8 @@
     enable = true;
     settings = {
       user = {
-        email = config.programs.git.userEmail;
-        name = config.programs.git.userName;
+        email = config.programs.git.settings.user.email;
+        name = config.programs.git.settings.user.name;
       };
       signing = {
         behavior = "own";

home/develop/langs/haskell.nix

@@ -4,6 +4,6 @@
     haskell-language-server
     cabal-install
     hlint
-    haskellPackages.retrie
+    # haskellPackages.retrie
   ];
 }

home/programs/beets.nix

@@ -4,7 +4,7 @@
 in {
   programs.beets = {
     enable = true;
-    package = pkgs.beets-unstable;
+    package = pkgs.beets;
     settings = {
       directory = "${musicDir}/beets";
       library = "${beetsDir}/beets.db";

home/programs/firefox/default.nix

@@ -30,6 +30,7 @@
       ];
     };
     profiles.xun = {
+      # extensions.force = true;
       extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
         ublock-origin
         # (lib.mkIf (config.xun.desktop.colorscheme == "dark") darkreader)

home/themes/dark/default.nix

@@ -12,11 +12,12 @@
     };
 
     targets = {
+      firefox.enable = true;
+      # firefox.colorTheme.enable = true;
       firefox.profileNames = ["xun"];
       gtk.enable = true;
       qt.enable = true;
       foot.enable = true;
-      firefox.enable = true;
       swaync.enable = true;
     };
   };