From bef7659f3249218fa636338e1eccc7d6d3cc6fe7 Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sat, 14 Oct 2023 09:11:41 +0200 Subject: [PATCH] feat: add nil nix lsp to devshell --- .envrc | 1 + flake.nix | 10 ++++++++++ modules/editors/emacs/doom.d/config.el | 2 ++ 3 files changed, 13 insertions(+) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000000000000000000000000000000000000..3550a30f2de389e537ee40ca5e64a77dc185c79b --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/flake.nix b/flake.nix index 24176a265d34f5553389ede83f77d18ac8f79221..9de7c7a56681b3144f470c2bfbb86e5c4c3edc63 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,10 @@ let # Variables that can be used in the config files. user = "ruther"; location = "$HOME/.setup"; + + pkgs = import nixpkgs { + system = "x86_64-linux"; + }; in # Use above variables in ... { nixosConfigurations = ( # NixOS configurations @@ -53,5 +57,11 @@ inherit inputs nixpkgs nixpkgs-stable home-manager nixgl user location; } ); + + devShells.x86_64-linux.default = pkgs.mkShell { + packages = [ + pkgs.nil + ]; + }; }; } diff --git a/modules/editors/emacs/doom.d/config.el b/modules/editors/emacs/doom.d/config.el index 94699abb5e00d3a3d5d0e11a5f352c8400f0bc2c..7c4526091fdb7202c884eeae46698ec731c4ddfd 100644 --- a/modules/editors/emacs/doom.d/config.el +++ b/modules/editors/emacs/doom.d/config.el @@ -80,6 +80,8 @@ (setq doom-localleader-key ",") +(add-hook 'nix-mode-hook #'lsp) + (map! :leader "c d" 'lsp-ui-doc-show "c m" #'+make/run)