From 7698d33f254cc120c9e2f7da656949bdd1e25f91 Mon Sep 17 00:00:00 2001
From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com>
Date: Sun, 19 Oct 2025 22:50:42 +0100
Subject: [PATCH] Bump nixpkgs (#127)

---
 flake.lock                 | 56 ++++++++++++--------------------------
 home-manager/home.nix      | 23 ++++++++++------
 home-manager/nvim/lean.lua |  6 +++-
 3 files changed, 36 insertions(+), 49 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6806899..c146975 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,15 +3,14 @@
     "apple-silicon": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "treefmt-nix": "treefmt-nix"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1756110286,
-        "narHash": "sha256-NE0HwcQCQTgM+HuYqmiemPf/5e+3fjwowceAyJj+ikU=",
+        "lastModified": 1759818599,
+        "narHash": "sha256-4Go3gVl3E+geWMcFQ+06qlkO/lJlSvS9dyhYiXLWYq0=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "b99bf9bf7445416fe55da09034fc4a6cd733805c",
+        "rev": "24ab28e47b586f741910b3a2f0428f3523a0fff3",
         "type": "github"
       },
       "original": {
@@ -27,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757015938,
-        "narHash": "sha256-1qBXNK/QxEjCqIoA2DxWn5gqM8rVxt+OxKodXu1GLTY=",
+        "lastModified": 1760721282,
+        "narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "eaacfa1101b84225491d2ceae9549366d74dc214",
+        "rev": "c3211fcd0c56c11ff110d346d4487b18f7365168",
         "type": "github"
       },
       "original": {
@@ -81,11 +80,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757075491,
-        "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=",
+        "lastModified": 1760887455,
+        "narHash": "sha256-/xU8iYZjolWbMUNBQF6af5zgGs73Qw21WMgz1tLs3Yw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf",
+        "rev": "aeabc1ac63e6ebb8ba4714c4abdfe0556f2de765",
         "type": "github"
       },
       "original": {
@@ -108,11 +107,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1755615617,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
-        "owner": "nixos",
+        "lastModified": 1759756860,
+        "narHash": "sha256-7QLUQZein1TbpouPOAsTka8vQLujHRmmTqze2IkdrqY=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "d3baaf296366efdea6737124f05b65d1cf25fa7c",
         "type": "github"
       },
       "original": {
@@ -124,11 +123,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1756911493,
-        "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=",
+        "lastModified": 1760872779,
+        "narHash": "sha256-c5C907Raf9eY8f1NUXYeju9aUDlm227s/V0OptEbypA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6a788f552b7b7af703b1a29802a7233c0067908",
+        "rev": "63bdb5d90fa2fa11c42f9716ad1e23565613b07c",
         "type": "github"
       },
       "original": {
@@ -177,27 +176,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "apple-silicon",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754847726,
-        "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
     "whisper": {
       "inputs": {
         "flake-utils": "flake-utils",
diff --git a/home-manager/home.nix b/home-manager/home.nix
index a877042..399acf5 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -47,17 +47,22 @@
     enable = true;
   };
 
+  programs.difftastic = {
+    enable = true;
+    git.enable = true;
+  };
   programs.git = {
     package = nixpkgs.gitAndTools.gitFull;
     enable = true;
-    userName = "Smaug123";
-    userEmail = "3138005+Smaug123@users.noreply.github.com";
-    aliases = {
-      co = "checkout";
-      st = "status";
-    };
-    difftastic.enable = true;
-    extraConfig = {
+    settings = {
+      alias = {
+        co = "checkout";
+        st = "status";
+      };
+      user = {
+        email = "3138005+Smaug123@users.noreply.github.com";
+        name = "Smaug123";
+      };
       commit.gpgsign = true;
       gpg.program = "${nixpkgs.gnupg}/bin/gpg";
       user.signingkey =
@@ -279,7 +284,7 @@
       nixpkgs.jq
       nixpkgs.difftastic
       nixpkgs.syncthing
-      nixpkgs.nodePackages_latest.dockerfile-language-server-nodejs
+      nixpkgs.dockerfile-language-server
       nixpkgs.nodePackages_latest.vscode-langservers-extracted
       nixpkgs.hadolint
       nixpkgs.yaml-language-server
diff --git a/home-manager/nvim/lean.lua b/home-manager/nvim/lean.lua
index b74c961..0650338 100644
--- a/home-manager/nvim/lean.lua
+++ b/home-manager/nvim/lean.lua
@@ -1,4 +1,8 @@
-require("lspconfig")["leanls"].setup({})
+vim.lsp.config.leanls = {
+	cmd = { "lean-language-server", "--stdio" },
+	root_markers = { "lean-toolchain", "lakefile.lean" },
+}
+vim.lsp.enable("leanls")
 
 require("lean").setup({})