diff --git a/flake.lock b/flake.lock index af850b8..e8f1fe9 100644 --- a/flake.lock +++ b/flake.lock @@ -94,16 +94,16 @@ ] }, "locked": { - "lastModified": 1694465129, - "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1694921880, - "narHash": "sha256-yU36cs5UdzhTwsM9bUWUz43N//ELzQ1ro69C07pU/8E=", + "lastModified": 1701572887, + "narHash": "sha256-oCPwQZT0Inis4zcYhtFHUp7Rym1zglKPLDcRird35q8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "9d2bcc47110b3b6217dfebd6761ba20bc78aedf2", + "rev": "41afa8d1c061beda68502bcc67f2788f3a77042b", "type": "github" }, "original": { @@ -130,27 +130,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694937365, - "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=", + "lastModified": 1701389149, + "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02", + "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-master": { "locked": { - "lastModified": 1694974614, - "narHash": "sha256-0mXsTjf6bAtRStahFiRxT1o8SiegvI02tZoIAhczZLE=", + "lastModified": 1701623655, + "narHash": "sha256-hEdHNWZdpCyrFK1rcJtPEcDjffn+vdFAUk9dAF7XF6E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2e2c6b2f027463700b557143cb04d561d8b63f9c", + "rev": "9508909e156b6ecffd4d92ff7a1c5f8d167c15b0", "type": "github" }, "original": { @@ -178,11 +178,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nur": { "locked": { - "lastModified": 1694975080, - "narHash": "sha256-yxk3j1fV+f+BtNXgKgYgHS+hxAOBKCOGKQCZnuGJrjI=", + "lastModified": 1701623572, + "narHash": "sha256-NBxGAGL+NqUON+2g9SjPJzcBIgov0gCM8WT8mZM83Xg=", "owner": "nix-community", "repo": "NUR", - "rev": "851838871ae06d27373ca51878fef8591c1e1260", + "rev": "805f936f3ce5589d53c2a2c5eeab4019a233e10d", "type": "github" }, "original": { @@ -301,11 +301,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1695691129, - "narHash": "sha256-tUbgZOgmR/9vh4yvW3Bw6Xd+1f4DDcEI/EoqbO0SOuI=", + "lastModified": 1701566649, + "narHash": "sha256-SJfC9yIPv+79rdLV4sicF2RPAt6EwhH1zN1DRI3cRUI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bd2d4d8c383ca5236a174742ef2d8d42307de40f", + "rev": "e73cf100164d1527ae4db9ec8b2988d474acdedb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fb9e79d..d4c60a2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,12 @@ description = "Home Manager configuration of kristian"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/systems/common/vscode.nix b/systems/common/vscode.nix index 5d533e3..141dc92 100644 --- a/systems/common/vscode.nix +++ b/systems/common/vscode.nix @@ -61,6 +61,16 @@ "editor.defaultFormatter" = "ms-python.autopep8"; }; + "[javascript]" = { + "editor.formatOnSave" = true; + "editor.formatOnSaveMode" = "modificationsIfAvailable"; + }; + + "[typescript]" = { + "editor.formatOnSave" = true; + "editor.formatOnSaveMode" = "modificationsIfAvailable"; + }; + "[latex]" = { "editor.formatOnSave" = true; "editor.formatOnSaveMode" = "file"; # modificationsIfAvailable does not work @@ -106,7 +116,7 @@ "zig.zigPath" = ""; # Use the zig from the PATH "zig.zls.path" = "${pkgs.unstable.zls}/bin/zls"; - "C_Cpp.default.compilerPath" = "${pkgs.gnat11}/bin/g++"; + "C_Cpp.default.compilerPath" = "${pkgs.gnat}/bin/g++"; "C_Cpp.default.includePath" = [ "\${workspaceFolder}/**" ];