diff --git a/flake.lock b/flake.lock index 7963f91..bad1b29 100644 --- a/flake.lock +++ b/flake.lock @@ -402,6 +402,24 @@ "type": "github" } }, + "nix-vscode-extensions": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1777951761, + "narHash": "sha256-nJqunmH+ysTpKSCGEozt47JsQ8dhgtaoTrSMskCuw44=", + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "034da763804cff07a677b9159ca3a103440d8f66", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1776311487, @@ -482,6 +500,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1777207419, + "narHash": "sha256-V3bmPWAajDiC+1ClDOp55gianW2EyRJSJOyu1RUQibc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a7ecea3deccfbdbf22945a89984fcc5a169da8aa", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a7ecea3deccfbdbf22945a89984fcc5a169da8aa", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1776169885, "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", @@ -497,7 +531,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1754214453, "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", @@ -513,7 +547,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1772542754, "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", @@ -539,7 +573,8 @@ "hyprlock": "hyprlock", "niri": "niri", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_4", + "nix-vscode-extensions": "nix-vscode-extensions", + "nixpkgs": "nixpkgs_5", "systems": "systems_2", "t2fanrd": "t2fanrd", "tt-schemes": "tt-schemes", @@ -609,7 +644,7 @@ }, "t2fanrd": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1775302822, @@ -643,7 +678,7 @@ }, "vicinae": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "systems": "systems_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 54fe00e..ca1312a 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,8 @@ hyprlock.url = "github:hyprwm/hyprlock"; hyprlock.inputs.nixpkgs.follows = "nixpkgs"; + nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; + catppuccin.url = "github:catppuccin/nix"; tt-schemes.url = "github:tinted-theming/schemes"; @@ -60,6 +62,7 @@ self.overlays.default inputs.cachyos-kernel.overlays.pinned inputs.niri.overlays.niri + inputs.nix-vscode-extensions.overlays.default ] ); in { diff --git a/modules/software/editors/vscode.nix b/modules/software/editors/vscode.nix index 747b3f1..16c9800 100644 --- a/modules/software/editors/vscode.nix +++ b/modules/software/editors/vscode.nix @@ -16,7 +16,7 @@ in { enableExtensionUpdateCheck = false; enableUpdateCheck = false; - extensions = with pkgs.vscode-extensions; [ + extensions = with pkgs.vscode-marketplace; [ # general extensions oderwat.indent-rainbow usernamehw.errorlens @@ -39,6 +39,9 @@ in { sumneko.lua # wgsl wgsl-analyzer.wgsl-analyzer + # qml + theqtcompany.qt-qml + theqtcompany.qt-core ]; userSettings = with config.modules.desktop.fonts.fonts; { @@ -60,9 +63,6 @@ in { "workbench.tips.enabled" = false; "workbench.list.smoothScrolling" = true; - "nix.enableLanguageServer" = true; - "nix.serverPath" = "${lib.getExe pkgs.nil}"; - "security.workspace.trust.enabled" = false; "explorer.compactFolders" = false; @@ -75,6 +75,14 @@ in { "editor.fontWeight" = "normal"; "editor.semanticHighlighting.enabled" = true; + # language specific + # nix + "nix.enableLanguageServer" = true; + "nix.serverPath" = "${lib.getExe pkgs.nil}"; + # qml + "qt-qml.qmlls.useQmlImportPathEnvVar" = true; + "qt-qml.qmlls.customExePath" = "${pkgs.kdePackages.qtdeclarative}/bin/qmlls"; + # prevent vscode from modifying the terminal colors "terminal.integrated.minimumContrastRatio" = 1; # prevent vscode from messing up font spacing