From 1921ea7357e124ed191ad3e811c880e1ea6fc607 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 5 Dec 2023 15:54:07 +0100 Subject: [PATCH] add direnv and set up haskell ls for xmonad work --- .envrc | 1 + .gitignore | 1 + flake.nix | 11 ++++++++++- modules/shell/helix.nix | 1 - 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index b2be92b..4812d58 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ result +.direnv/ diff --git a/flake.nix b/flake.nix index dd6b612..c06d9f3 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,16 @@ nixos-hardware, mac-brcm-fw, ... - } @ inputs: { + } @ inputs: let + pkgs = nixpkgs.legacyPackages."x86_64-linux"; + in { + devShells."x86_64-linux".default = pkgs.mkShell { + buildInputs = [ + (pkgs.haskellPackages.ghcWithPackages + (pkgs: with pkgs; [xmonad xmonad-contrib])) + pkgs.haskell-language-server + ]; + }; nixosConfigurations = { monosodium-glutamate-g = nixpkgs.lib.nixosSystem { specialArgs = { diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 2929e9b..7520743 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -4,7 +4,6 @@ sessionVariables.EDITOR = "hx"; packages = [ pkgs.nil - pkgs.haskell-language-server pkgs.nodePackages_latest.vscode-html-languageserver-bin pkgs.nodePackages_latest.vscode-json-languageserver-bin pkgs.nodePackages_latest.vscode-css-languageserver-bin