2 files changed, 26 insertions, 15 deletions
diff --git a/modules/terminal/hjem/programs/fish.nix b/modules/terminal/hjem/programs/fish.nix
index 2fdc184..34f8496 100644
--- a/modules/terminal/hjem/programs/fish.nix
+++ b/modules/terminal/hjem/programs/fish.nix
@@ -8,19 +8,19 @@
 in
   lib.mkIf cfg.enable {
     files = {
-      ".config/fish/conf.d/xdg.fish".text =
-        # fish
-        ''
-          set -gx XDG_DATA_HOME "$HOME/.local/share"
-          set -gx XDG_CONFIG_HOME "$HOME/.config"
-          set -gx XDG_STATE_HOME "$HOME/.local/state"
-          set -gx XDG_CACHE_HOME "$HOME/.cache"
+      ".config/fish/conf.d/xdg.fish".text = ''
+        set -gx XDG_DATA_HOME "$HOME/.local/share"
+        set -gx XDG_CONFIG_HOME "$HOME/.config"
+        set -gx XDG_STATE_HOME "$HOME/.local/state"
+        set -gx XDG_CACHE_HOME "$HOME/.cache"
 
-          alias wget "wget --hsts-file=/dev/null"
-          set -gx GOPATH "$XDG_DATA_HOME/go"
-          set -gx GRADLE_USER_HOME "$XDG_DATA_HOME/gradle"
-          set -gx CARGO_HOME "$XDG_DATA_HOME/cargo"
-        '';
+        alias wget "wget --hsts-file=/dev/null"
+        set -gx GOPATH "$XDG_DATA_HOME/go"
+        set -gx GRADLE_USER_HOME "$XDG_DATA_HOME/gradle"
+        set -gx CARGO_HOME "$XDG_DATA_HOME/cargo"
+        set -gx ANDROID_USER_HOME "$XDG_DATA_HOME/android"
+        set -gx WINE_PREFIX "$XDG_DATA_HOME/wine"
+      '';
 
       ".config/fish/config.fish".text = ''
         set fish_greeting
@@ -30,7 +30,6 @@ in
         end
 
         direnv hook fish | source
-        pay-respects fish --alias | source
       '';
     };
 
@@ -45,6 +44,5 @@ in
       btop
       jq
       direnv
-      pay-respects
     ];
   }
diff --git a/modules/terminal/hjem/programs/helix.nix b/modules/terminal/hjem/programs/helix.nix
index 80279c4..ae8ad03 100644
--- a/modules/terminal/hjem/programs/helix.nix
+++ b/modules/terminal/hjem/programs/helix.nix
@@ -8,7 +8,20 @@
 
   languages = {
     language-server = {
-      rust-analyzer.command = "${pkgs.rust-analyzer}/bin/rust-analyzer";
+      rust-analyzer.command = let
+        env = pkgs.stdenv.mkDerivation {
+          name = "rust-analyzer-env";
+          src = ./.;
+
+          nativeBuildInputs = [pkgs.makeWrapper];
+          buildInputs = [pkgs.rust-analyzer];
+          installPhase = ''
+            mkdir -p $out/bin
+            makeWrapper ${pkgs.rust-analyzer}/bin/rust-analyzer $out/bin/rust-analyzer \
+              --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [rustc cargo])}
+          '';
+        };
+      in "${env}/bin/rust-analyzer";
 
       nil = {
         command = "${pkgs.nil}/bin/nil";