From 65ddda79a3d76b68d839050c9504608807ae95a6 Mon Sep 17 00:00:00 2001 From: Lucy Hochkamp Date: Sat, 14 Oct 2023 12:23:54 +0200 Subject: [PATCH] vscode changes --- flake.lock | 70 +++++++++++++++++------------------ hm-imports/vscode/default.nix | 18 ++++++++- 2 files changed, 52 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 69fae33d..e1bffa84 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1695384796, + "lastModified": 1696775529, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1696266752, - "narHash": "sha256-wJnMDFM21+xXdsXSs6pXMElbv4YfqmQslcPApRuaYKs=", + "lastModified": 1697073574, + "narHash": "sha256-Np603TUNj+fzQYmaNPS7pmsy52KHq4fpWP5GCpTJ38Y=", "owner": "nix-community", "repo": "disko", - "rev": "646ee25c25fffee122a66282861f5f56ad3e0fd9", + "rev": "3c41ae36ff12afbada9396c7d8282c2c74f74e06", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696267196, - "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1695684520, - "narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=", + "lastModified": 1697031886, + "narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7", + "rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3", "type": "github" }, "original": { @@ -451,11 +451,11 @@ ] }, "locked": { - "lastModified": 1696377831, - "narHash": "sha256-Rr6jsPy7YyMeUrVZe3Do8gkqjPbQL2EozC0YwnlaDCg=", + "lastModified": 1697069012, + "narHash": "sha256-eP0XhTAy5bVCmP5ZQ1LU3Nwh9CjRcx18kHSmhHd+GBE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7788550cce42f8f9e0bdfb5727bab3ae59b35bc6", + "rev": "890da9720383f47e00f8a4592cb987d6efccb3db", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1696987176, - "narHash": "sha256-JdfrQAZD4LVQSQ1UV4d6O+8582aJxcenTTR2QW1mwUw=", + "lastModified": 1697073746, + "narHash": "sha256-069D60IbxFqAAFDlFZuOHtJcvY4AhlEO2VhIQx/BuZM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "be62771c733f226651149c8a07c40c7c52c5ff5a", + "rev": "ca11c9ddf80bcdffbb57e722888cda1832e9f4d7", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1696161939, - "narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=", + "lastModified": 1697100850, + "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532", + "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1696374741, - "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", + "lastModified": 1696983906, + "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", + "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1696419054, - "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", + "lastModified": 1697126892, + "narHash": "sha256-eDol60wAeK6xpIx64ECz8o1JsUiVi7cADOibSWERfe0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", + "rev": "bedb124937eda7cc3fd66ceebd14464f42111c46", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1696879762, + "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", "type": "github" }, "original": { @@ -639,11 +639,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1696323343, - "narHash": "sha256-u7WLUrh5eb+6SBYwtkaGL2ryHpLcHzmLml+a+VqKJWE=", + "lastModified": 1696983906, + "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b79cc4bcd9c09b5aa68ea1957c25e437dc6bc58", + "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "type": "github" }, "original": { @@ -672,11 +672,11 @@ "noice-nvim": { "flake": false, "locked": { - "lastModified": 1696342056, - "narHash": "sha256-NH6wD9sCtGnvRxQGDC0kMs7SIIxgOzTVo+89PGwGoTU=", + "lastModified": 1696684027, + "narHash": "sha256-TBiUpYgYXskSkq/Camxttxop300H0s22j5yfkvvpDDY=", "owner": "folke", "repo": "noice.nvim", - "rev": "8d775bc8ac1a594a2ecdb80e092330afd916e4c3", + "rev": "fcd01710ff6918d4d3ef90c8e36f3addacba13bf", "type": "github" }, "original": { diff --git a/hm-imports/vscode/default.nix b/hm-imports/vscode/default.nix index cecaa27e..81be4f59 100644 --- a/hm-imports/vscode/default.nix +++ b/hm-imports/vscode/default.nix @@ -10,6 +10,7 @@ in home.packages = with pkgs; [ nixd nixpkgs-fmt + (unstable.quarto.overrideAttrs (curr: { meta.platforms = [ pkgs.system ]; })) ]; programs.vscode = { enable = true; @@ -24,9 +25,10 @@ in # Language Support ## markdown/latex marketplace.james-yu.latex-workshop # latex, also provides pdf preview - shd101wyy.markdown-preview-enhanced # pandoc preview yzhang.markdown-all-in-one # markdown marketplace.davidanson.vscode-markdownlint + marketplace.quarto.quarto + #marketplace.gpoore.codebraid-preview ## others jnoortheen.nix-ide # nix @@ -121,6 +123,12 @@ in quiet = true; } ]; + ## git + "git.verboseCommit" = true; + "git.allowForcePush" = true; + "git.confirmSync" = false; + "git.confirmForcePush" = true; # is default but it feels safer to also specify it here + "git.useForcePushWithLease" = true; # is default but it feels safer to also specify it here ## Nix "nix.serverPath" = "nixd"; "nix.enableLanguageServer" = true; @@ -141,6 +149,14 @@ in "editor.tabCompletion" = "onlySnippets"; "editor.wordBasedSuggestions" = false; }; + ## md preview + #"codebraid.preview.pandoc.build" = { + # "*.md" = { + # "reader" = "markdown"; # use pandoc markdown and not commonmark + # "preview" = { "html" = { defaults = {}; options = []; }; }; + # }; + #}; + }; }; };