From 6da84eebe86f1a7fc10e4dd724f6e92e336b14e2 Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Fri, 20 Dec 2024 23:50:14 +0100
Subject: [PATCH] update

---
 flake.lock                       | 101 ++++---------------------------
 flake.nix                        |   3 -
 home-manager/common-packages.nix |   2 +-
 home-manager/laptop.nix          |   3 +-
 nixos/configuration.nix          |   2 +-
 5 files changed, 15 insertions(+), 96 deletions(-)

diff --git a/flake.lock b/flake.lock
index adb930b..ca61981 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,24 +21,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -46,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733484277,
-        "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
+        "lastModified": 1734622215,
+        "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
+        "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
         "type": "github"
       },
       "original": {
@@ -59,28 +41,6 @@
         "type": "github"
       }
     },
-    "jujutsu": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1733537181,
-        "narHash": "sha256-xGok4RSoVbno7UekyYRnCw9pj3CxQpCCBORWqrP8MZk=",
-        "owner": "martinvonz",
-        "repo": "jj",
-        "rev": "da3c75b3cb09d1ae98a3e07c54b6a0f06ff70ed4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "martinvonz",
-        "repo": "jj",
-        "type": "github"
-      }
-    },
     "minegrub-theme": {
       "inputs": {
         "nixpkgs": [
@@ -104,11 +64,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733392399,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -136,11 +96,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1733392399,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -157,11 +117,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1733604405,
-        "narHash": "sha256-OaKk3KzO9E1P+kkO18axtXnBbgRUrAMHVKIjDMYcgl0=",
+        "lastModified": 1734733981,
+        "narHash": "sha256-hVF82L5TkfM6j9JlGZAWcajY9/NCPE+dWSfHmLXZpOo=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e85a3e10d7626d651beb9c35f8f9fb573b20b924",
+        "rev": "7fcecf724bae5ec4b70d94722563238dac97ec74",
         "type": "github"
       },
       "original": {
@@ -173,49 +133,12 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "jujutsu": "jujutsu",
         "minegrub-theme": "minegrub-theme",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "jujutsu",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732242723,
-        "narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index b6ea6a7..2fb0f19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,9 +20,6 @@
     # for firefox-nightly
     # firefox.url = "github:nix-community/flake-firefox-nightly";
     # firefox.inputs.nixpkgs.follows = "nixpkgs";
-
-    jujutsu.url = "github:martinvonz/jj";
-    jujutsu.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = { nixpkgs, home-manager, nur, ... }@inputs: {
diff --git a/home-manager/common-packages.nix b/home-manager/common-packages.nix
index e267959..aac29b7 100644
--- a/home-manager/common-packages.nix
+++ b/home-manager/common-packages.nix
@@ -10,7 +10,7 @@ with pkgs; [
   cargo-expand
   cargo-mommy
   cargo-nextest
-  inputs.jujutsu.packages.${pkgs.system}.jujutsu
+  jujutsu
   dig
   fzf
   gcc
diff --git a/home-manager/laptop.nix b/home-manager/laptop.nix
index edd1295..6353934 100644
--- a/home-manager/laptop.nix
+++ b/home-manager/laptop.nix
@@ -10,8 +10,7 @@
       #     patches = [ ./change-hello-to-hi.patch ];
       #   });
       # })
-      inputs.nur.overlay
-      inputs.jujutsu.overlay
+      inputs.nur.overlays.default
     ];
     # Configure your nixpkgs instance
     config = {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 04a7351..5933f59 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -24,7 +24,7 @@ in
     overlays = [
       # If you want to use overlays exported from other flakes:
       # neovim-nightly-overlay.overlays.default
-      inputs.nur.overlay
+      inputs.nur.overlays.default
       # final: prev: {
       #  curl = prev.curl.override {
       #    # vquic is sad right now.