From cfb003691795160a47dade8381e071b76fde4676 Mon Sep 17 00:00:00 2001
From: Philipp Hochkamp <git@phochkamp.de>
Date: Wed, 2 Mar 2022 01:08:16 +0100
Subject: [PATCH] fix-nvim

---
 hm-imports/nvim/config/{init.lua => nvim.lua} | 0
 hm-imports/nvim/default.nix                   | 8 ++++----
 hm-imports/zsh/zshrc                          | 2 --
 hosts/daedalus/default.nix                    | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename hm-imports/nvim/config/{init.lua => nvim.lua} (100%)

diff --git a/hm-imports/nvim/config/init.lua b/hm-imports/nvim/config/nvim.lua
similarity index 100%
rename from hm-imports/nvim/config/init.lua
rename to hm-imports/nvim/config/nvim.lua
diff --git a/hm-imports/nvim/default.nix b/hm-imports/nvim/default.nix
index fe17244f..e0eee35d 100644
--- a/hm-imports/nvim/default.nix
+++ b/hm-imports/nvim/default.nix
@@ -20,12 +20,12 @@
       {
         enable = true;
         package = pkgs.neovim-nightly;
+	extraConfig = ''
+            set runtimepath^=~/.config/nvim
+            lua dofile('~/.config/nvim/nvim.lua')
+        '';
         vimAlias = true;
         viAlias = true;
-        extraConfig = ''
-            set runtimepath^=~/.config/nvim
-            lua dofile('~/.config/nvim/init.lua')
-        '';
         plugins =
           let
             nnn-vim = pkgs.vimUtils.buildVimPlugin {
diff --git a/hm-imports/zsh/zshrc b/hm-imports/zsh/zshrc
index 88927f2e..e18b4433 100644
--- a/hm-imports/zsh/zshrc
+++ b/hm-imports/zsh/zshrc
@@ -17,8 +17,6 @@ bindkey -M viins '^[[A' history-beginning-search-backward-end \
 hash go   2>/dev/null && export PATH=$PATH:$(go env GOPATH)/bin
 hash yarn 2>/dev/null && export PATH=$PATH:$HOME/.yarn/bin
 hash direnv 2>/dev/null && eval "$(direnv hook zsh)" # needed for lorri
-export PATH=$PATH:$HOME/scripts
-export PATH=$PATH:$HOME/.config/rofi/bins
 export PATH=$PATH:$HOME/.local/bin
 export PATH=$PATH:$HOME/flutter/flutter/bin
 hash kitty 2>/dev/null && alias ssh="kitty kitten ssh"
diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix
index 4086da75..263bc729 100644
--- a/hosts/daedalus/default.nix
+++ b/hosts/daedalus/default.nix
@@ -35,7 +35,7 @@ with lib.my;
     home.sessionVariables = {
       EDITOR = "nvim";
       VISUAL = "nvim";
-      PATH = "$PATH:$HOME/development/flutter/bin:/Applications/Android Studio.app/Contents/bin/:/Applications/Docker.app/Contents/Resources/bin:/Applications/Android Studio.app/Contents/jre/Contents/Home/bin:$HOME/.nix-profile/bin:/nix/var/nix/profiles/system/sw/bin";
+      #PATH = "$PATH:$HOME/development/flutter/bin:/Applications/Android Studio.app/Contents/bin/:/Applications/Docker.app/Contents/Resources/bin:/Applications/Android Studio.app/Contents/jre/Contents/Home/bin:$HOME/.nix-profile/bin:/nix/var/nix/profiles/system/sw/bin";
       JAVA_HOME = "/Applications/Android Studio.app/Contents/jre/Contents/Home/";
     };
     home.packages = with pkgs; [