chore: update lockfiles

This has some extra bit of housekeeping, since `vscode-extensions` was
conflicting with `nixpkgs` build steps

flake.lock

@@ -52,11 +52,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688898859,
-        "narHash": "sha256-NjvwXnMp8oMQ86FHVhzlmgGy2dVDMGVLpZ4+YVsJgMU=",
+        "lastModified": 1689188243,
+        "narHash": "sha256-v3EDlWWLBQ+LIRWZ03jd8bnvHLyNae6iaqd03rbYhwo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "66a3047fa88eb6aa5c5a2e675de91f0431fbe561",
+        "rev": "2ad716c2786dabf8f458ae1e7d343775d3acc65c",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1687709756,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688892808,
-        "narHash": "sha256-AeWzyG37EqyHH2C1GmrV9y0ZQ4e7rAs9AUOnw8I4YUI=",
+        "lastModified": 1689134369,
+        "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b70db52ff06f30e3de7f21b6ea47e75baa0c46f6",
+        "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c",
         "type": "github"
       },
       "original": {
@@ -235,11 +235,11 @@
         "wezterm-src": "wezterm-src"
       },
       "locked": {
-        "lastModified": 1688930381,
-        "narHash": "sha256-CUPFEXJXqTnwgYW0Y1o6YWaGNl3XSVT11mRp30ygoRo=",
+        "lastModified": 1689223512,
+        "narHash": "sha256-PRcSsKjSwTF55a8MBmyWpQDvZ4yqgkkQR9p5nD3x5R0=",
         "owner": "nekowinston",
         "repo": "nur",
-        "rev": "5f80d5123eb33e369d83bcafa99ddffd6263efbc",
+        "rev": "6ca86f16df67fd89873cbbf130ab93f077c17de8",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688780106,
-        "narHash": "sha256-3cgQ3+P661mrSYlpgIpq34faxPsu38K9lNjKOqTuaEM=",
+        "lastModified": 1689213562,
+        "narHash": "sha256-DLfhfolM9XSvWcSYtW1VT9wf5TQw0CgksIvbCjmpqHw=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "512c683e2eb87c00c94fd7abf0226a93f5ddcd2f",
+        "rev": "53ee5380756e60bef84d4bf03d2cf55f49d69bb5",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688894907,
-        "narHash": "sha256-U7hEDDhzAhLp6T+DEUbfwAsL+BtqFFGn+S1pa/0XrZY=",
+        "lastModified": 1689078114,
+        "narHash": "sha256-osG8BrX5RpKJ7wH+vI6auOU+ctvNOblT4XXCgknK47c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4ddf98349c793377c76806ebfbdfb2b96dd4ef5d",
+        "rev": "b6cc7ff8fee93789bc871a267ab876c3fca042cb",
         "type": "github"
       },
       "original": {
@@ -330,11 +330,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1688646010,
-        "narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=",
+        "lastModified": 1689168768,
+        "narHash": "sha256-mCw3LPg2jJkapvJpkd1IZ8k0IJlSG2ECvz3vcOAu+Uo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5daaa32204e9c46b05cd709218b7ba733d07e80c",
+        "rev": "6fd9edc94426a3c050ad589c8f033b5ca55454c7",
         "type": "github"
       },
       "original": {
@@ -346,11 +346,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1688780457,
-        "narHash": "sha256-PIZYTRjHbTp70viwvNh4sfGEHTUlVQLLHGEhHyaxomE=",
+        "lastModified": 1689230218,
+        "narHash": "sha256-Mq03DaQyFbFILI8pccTBnfhxCtiPX2+ekTcUIvxRtzM=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "65e128955c709c8fa224f345ff887e2caaa11c08",
+        "rev": "81d9847783198d506dd0a0566eafe2be0feaa961",
         "type": "github"
       },
       "original": {
@@ -444,11 +444,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688268466,
-        "narHash": "sha256-fArazqgYyEFiNcqa136zVYXihuqzRHNOOeVICayU2Yg=",
+        "lastModified": 1689149796,
+        "narHash": "sha256-3FCUdayBHcxk6BZOxEIfa5UxbXNQzTc/VlN7ociI2Dw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5ed3c22c1fa0515e037e36956a67fe7e32c92957",
+        "rev": "88b964df6981e4844c07be8c192aa6bdca768a10",
         "type": "github"
       },
       "original": {
@@ -498,11 +498,11 @@
     "wezterm-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1688913516,
-        "narHash": "sha256-jyg+DeDLhC8Zcrv9c2qNr4ZB+tb4I3nLD3y2vacn6NQ=",
+        "lastModified": 1689096450,
+        "narHash": "sha256-dxdbCywgu2CqO3jDG3Yr+XPm01QSflg/1CiEs6zYhFs=",
         "ref": "refs/heads/main",
-        "rev": "1bfaf8522af70a40011bc9356382d8f73b78df96",
-        "revCount": 7279,
+        "rev": "523660c19222d157969cf073709436050747478b",
+        "revCount": 7304,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/wez/wezterm"

flake.nix

@@ -48,7 +48,6 @@
   in
     flake-parts.lib.mkFlake {inherit inputs;}
     {
-      systems = ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"];
       flake = mkSystems [
         {
           host = "sashimi";
@@ -66,6 +65,7 @@
           username = "w";
         }
       ];
+      imports = [inputs.pre-commit-hooks.flakeModule];
       perSystem = {
         config,
         self',
@@ -79,9 +79,9 @@
           config.allowUnfree = true;
         };
 
-        checks.pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
-          src = ./.;
-          hooks = {
+        pre-commit = {
+          check.enable = true;
+          settings.hooks = {
             alejandra.enable = true;
             commitizen.enable = true;
             editorconfig-checker.enable = true;
@@ -92,11 +92,9 @@
           };
         };
 
-        devShells.default = pkgs.mkShell {
-          name = "nixpkgs";
-          inherit (self'.checks.pre-commit-check) shellHook;
+        devShells.default = config.pre-commit.devShell.overrideAttrs (old: {
           buildInputs = with pkgs; [nvd nix-output-monitor];
-        };
+        });
 
         legacyPackages.homeConfigurations = let
           homeLib = import ./home/lib.nix {
@@ -113,6 +111,7 @@
 
         formatter = pkgs.alejandra;
       };
+      systems = ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"];
     };
 
   nixConfig = {

home/apps/vscode.nix

@@ -13,7 +13,7 @@ in {
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
-    extensions = with pkgs.vscode-extensions.vscode-marketplace; [
+    extensions = with pkgs.nix-vscode-extensions.vscode-marketplace; [
       adrianwilczynski.alpine-js-intellisense
       astro-build.astro-vscode
       bradlc.vscode-tailwindcss

machines/lib.nix

@@ -10,7 +10,7 @@
         };
       };
       sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
-      vscode-extensions = inputs.nix-vscode-extensions.extensions.${prev.system};
+      nix-vscode-extensions = inputs.nix-vscode-extensions.extensions.${prev.system};
     })
     inputs.nekowinston-nur.overlays.default
   ];