summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/home/i3wm/nord-blue/helix.nix72
-rwxr-xr-xmun.nix33
2 files changed, 69 insertions, 36 deletions
diff --git a/modules/home/i3wm/nord-blue/helix.nix b/modules/home/i3wm/nord-blue/helix.nix
index ead3002..f0eba78 100644
--- a/modules/home/i3wm/nord-blue/helix.nix
+++ b/modules/home/i3wm/nord-blue/helix.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ pkgs, ... }:
{
programs.helix = {
@@ -23,7 +23,7 @@
auto-format = true;
end-of-line-diagnostics = "hint";
inline-diagnostics = {
- cursor-line = "hint";
+ cursor-line = "hint";
};
lsp = {
display-messages = true;
@@ -82,6 +82,16 @@
args = [ "start" ];
};
+ # HTML
+ "superhtml" = {
+ command = "${pkgs.superhtml}/bin/superhtml";
+ };
+
+ # CSS
+ "vscode-css-languageserver" = {
+ command = "${pkgs.vscode-css-languageserver}/bin/vscode-css-languageserver";
+ };
+
# Rust
"rust-analyzer" = {
command = "${pkgs.rust-analyzer}/bin/rust-analyzer";
@@ -101,13 +111,24 @@
"texlab" = {
command = "${pkgs.texlab}/bin/texlab";
};
- texlab.config.texlab.build = {
- onSave = true;
- forwardSearchAfter = true;
- executable = "latexmk";
- args = [ "-pdf" "-interaction=nonstopmode" "-synctex=1" "%f" ];
- };
+ texlab.config.texlab = {
+ build = {
+ onSave = true;
+ forwardSearchAfter = true;
+ };
+ chktext = {
+ onEdit = true;
+ };
+ forwardSearch = {
+ executable = "zathura";
+ args = [
+ "--synctex-forward"
+ "%l:1:%f"
+ "%p"
+ ];
+ };
+ };
# Markdown
"marksman" = {
@@ -121,6 +142,16 @@
auto-format = true;
}
{
+ name = "html";
+ language-servers = [ "superhtml" ];
+ auto-format = true;
+ }
+ {
+ name = "css";
+ language-servers = [ "vscode-css-languageserver" ];
+ auto-format = true;
+ }
+ {
name = "rust";
language-servers = [ "rust-analyzer" ];
auto-format = true;
@@ -143,24 +174,25 @@
{
name = "markdown";
language-servers = [ "marksman" ];
- auto-format = true;
+ auto-format = true;
}
];
};
};
-
home.packages = with pkgs; [
- zathura
- ripgrep
- fd
+ zathura
+ ripgrep
+ fd
- bash-language-server # LSP for Bash
- rust-analyzer # Rust LSP
+ bash-language-server # LSP for Bash
+ superhtml # LSP for HTML
+ vscode-css-languageserver # LSP for CSS
+ rust-analyzer # Rust LSP
llvmPackages_latest.lldb # lldb-dap for Rust
- pyright # Python LSP
- nil # Nix LSP
- texlab # LaTeX LSP
- marksman # Markdown LSP
+ pyright # Python LSP
+ nil # Nix LSP
+ texlab # LaTeX LSP
+ marksman # Markdown LSP
];
-} \ No newline at end of file
+}
diff --git a/mun.nix b/mun.nix
index 6cb620c..7f57484 100755
--- a/mun.nix
+++ b/mun.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
{
imports = [
@@ -21,6 +26,7 @@
# === Applications ===
discord
+ spotify
# === Utilities ===
pay-respects
@@ -47,22 +53,18 @@
};
};
+ programs = {
+ ssh = {
+ enable = true;
-
-
-programs = {
- ssh = {
- enable = true;
-
- # Disable legacy defaults (future-proof)
- enableDefaultConfig = false;
+ # Disable legacy defaults (future-proof)
+ enableDefaultConfig = false;
- matchBlocks."*" = {
- addKeysToAgent = "yes";
- forwardAgent = false; # or true if you actually need it
+ matchBlocks."*" = {
+ addKeysToAgent = "yes";
+ forwardAgent = false; # or true if you actually need it
+ };
};
- };
-
zsh = {
enable = true;
@@ -90,6 +92,5 @@ programs = {
};
services = {
gnome-keyring.enable = true;
- };
+ };
}
-