update & add git rebase configuration

2025-06-01 16:30:46 +02:00
parent 0d2e8c0c53
commit fcd8c7b029
2 changed files with 7 additions and 6 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745033012,
-        "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=",
+        "lastModified": 1748737919,
+        "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7",
+        "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
        "type": "github"
      },
      "original": {
@@ -22,11 +22,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744932701,
-        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "lastModified": 1748693115,
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
        "owner": "NixOs",
        "repo": "nixpkgs",
-        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
        "type": "github"
      },
      "original": {
--- a/users/shatteredmint.nix
+++ b/users/shatteredmint.nix
@@ -51,6 +51,7 @@
      userName = "ShatteredMINT";
      extraConfig = {
        init.defaultBranch = "main";
+        pull.rebase = true;
      };
    };