From 1583241c31c070410f753bf5e34ff604af42afb4 Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Wed, 23 Oct 2024 10:17:17 +0200 Subject: [PATCH] Config chagnes --- flake.lock | 12 +++++------ hosts/laptop/home.nix | 6 ++++-- modules/home/cli/common/helix.nix | 36 ++++++++++++++----------------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index b922e6d..b5a7648 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -88,11 +88,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index cec66cd..57d5764 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, lib, ... }: { imports = [ @@ -45,12 +45,14 @@ home.packages = with pkgs; [ # Desktop Applications kdenlive - unstable.prismlauncher + prismlauncher unstable.joplin-desktop unstable.prusa-slicer signal-desktop unstable.vesktop + unstable.goofcord unstable.blender + unstable.legcord loupe unstable.rnote diff --git a/modules/home/cli/common/helix.nix b/modules/home/cli/common/helix.nix index 759a87e..9f21965 100644 --- a/modules/home/cli/common/helix.nix +++ b/modules/home/cli/common/helix.nix @@ -3,21 +3,23 @@ { home.packages = with pkgs; [ unstable.marksman + unstable.markdown-oxide unstable.svls unstable.nil unstable.nixpkgs-fmt - unstable.vale-ls - unstable.vale + dprint ]; - home.file.".config/vale/.vale.ini".text = '' - StylesPath = ~/.local/share/vale/styles - - MinAlertLevel = suggestion - Packages = Readability - - [*] - BasedOnStyles = Vale + home.file.".config/.dprint.json".text ='' + { + "markdown": { + "lineWidth":120, + }, + "excludes": [], + "plugins": [ + "https://plugins.dprint.dev/markdown-0.16.1.wasm" + ] + } ''; programs.helix = { @@ -43,20 +45,11 @@ command = "svls"; }; - # Vale - language-server.vale = { - command = "vale-ls"; - }; - language = [ { name = "verilog"; language-servers = [ "svls" ]; } - { - name = "nix"; - language-servers = [ "svls" ]; - } { name = "html"; language-servers = [ "vscode-html-language-server" "tailwindcss-ls" ]; @@ -67,7 +60,10 @@ } { name = "markdown"; - language-servers = [ "vale" ]; + auto-format = true; + language-servers = [ "markdown-oxide" ]; + formatter.command = "dprint"; + formatter.args = ["fmt" "--stdin" "md" "--config" "/home/xeovalyte/.config/.dprint.json"]; } ]; };