diff --git a/home/lilith/default.nix b/home/lilith/default.nix index f7efd19d..0d30e22f 100644 --- a/home/lilith/default.nix +++ b/home/lilith/default.nix @@ -1,4 +1,4 @@ -{ sops-nix, stylix, ...}: { +{sops-nix, ...}: { imports = [ sops-nix.homeManagerModules.sops diff --git a/home/lilith/helix.nix b/home/lilith/helix.nix index de5bd6d2..906f94ce 100644 --- a/home/lilith/helix.nix +++ b/home/lilith/helix.nix @@ -1,5 +1,6 @@ { pkgs, + lib, ... }: { programs.helix = { @@ -31,6 +32,10 @@ ]; separator = "|"; }; + inline-diagnostics = { + cursor-line = "hint"; + other-lines = "warning"; + }; lsp = { display-messages = true; display-inlay-hints = true; @@ -48,5 +53,51 @@ }; }; }; + + languages = { + language-server = { + rust-analyzer = { + config = { + checkOnSave.command = "clippy"; + cargo.features = "all"; + cargo.unsetTest = []; + }; + }; + pyright = { + command = "${pkgs.pyright}/bin/pyright-langserver"; + args = ["--stdio"]; + config = {}; + }; + nil.command = "${pkgs.nil}/bin/nil"; + bash-language-server = { + command = "${pkgs.bash-language-server}/bin/bash-language-server"; + args = ["start"]; + }; + }; + + language = [ + { + name = "python"; + auto-format = true; + language-servers = [{name = "pyright";}]; + formatter = { + command = "/bin/sh"; + args = [ + "-c" + "${pkgs.isort}/bin/isort - | ${pkgs.black}/bin/black -q -l 120 -C -" + ]; + }; + } + { + name = "nix"; + auto-format = true; + language-servers = [{name = "nil";}]; + formatter = { + command = lib.getExe pkgs.nixfmt-rfc-style; + args = ["-s"]; + }; + } + ]; + }; }; } diff --git a/home/lilith/persist.nix b/home/lilith/persist.nix index 9eff5e3d..81808ef2 100644 --- a/home/lilith/persist.nix +++ b/home/lilith/persist.nix @@ -1,20 +1,23 @@ -{lib, config, ... }: { +{ + lib, + config, + ... +}: { data = { directories = [ ".config/syncthing" ".config/sops" ".config/keepassxc" - ".config/obsidian" ".config/vesktop" ".gnupg" ".ssh" ".thunderbird" ".mozilla" + ".zen" "nixos" "sync" - "obsidian" "code" ".keepass" ".local/share/PrismLauncher" @@ -28,11 +31,9 @@ cache = { directories = [ ".cache/nix" - ".cache/spotify" ".cache/keepassxc" ".cargo" ".local/state/wireplumber" - "tmp" ]; files = []; }; diff --git a/system/default.nix b/system/default.nix index d843dc98..cde4912e 100644 --- a/system/default.nix +++ b/system/default.nix @@ -3,5 +3,4 @@ ./core ./optional ]; - # system.stateVersion = "24.11"; }