diff --git a/flake.lock b/flake.lock index 856f77c..f9e30c5 100644 --- a/flake.lock +++ b/flake.lock @@ -53,27 +53,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nix-direnv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -198,28 +177,6 @@ "type": "github" } }, - "nix-direnv": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1768704530, - "narHash": "sha256-BASsdRYo8t/himZisgWW524t86pxuC0H3/Dv8sqR8sM=", - "owner": "nix-community", - "repo": "nix-direnv", - "rev": "29bb68202897f6e8653d28f64c5525c2c502f19c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-direnv", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1769302137, @@ -302,7 +259,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -351,12 +308,11 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", - "nix-direnv": "nix-direnv", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", "nur": "nur", - "treefmt-nix": "treefmt-nix_2", + "treefmt-nix": "treefmt-nix", "utils": "utils" } }, @@ -397,27 +353,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nix-direnv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768158989, - "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 567a2c6..7fd80f4 100644 --- a/flake.nix +++ b/flake.nix @@ -29,11 +29,6 @@ flake = false; url = "git+ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"; }; - nix-direnv = { - url = "github:nix-community/nix-direnv"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; outputs = diff --git a/home/common.nix b/home/common.nix index 1bce7b0..0df7d8f 100644 --- a/home/common.nix +++ b/home/common.nix @@ -19,11 +19,7 @@ programs.bat.enable = true; programs.direnv = { enable = true; - nix-direnv = { - enable = true; - # use a more recent nix-direnv to get the _nix_refresh_gcroots integration - package = inputs.nix-direnv.packages."${pkgs.stdenv.hostPlatform.system}".nix-direnv; - }; + nix-direnv.enable = true; enableZshIntegration = true; }; diff --git a/home/overlays.nix b/home/overlays.nix index 74db291..6d1cbf1 100644 --- a/home/overlays.nix +++ b/home/overlays.nix @@ -1,31 +1,33 @@ [ - (self: super: { - myVim = super.neovim.override { - configure = { - packages.myVimPackage = with self.pkgs.vimPlugins; { - # loaded on start - start = [ - ale - base16-vim - LanguageClient-neovim - ctrlp - direnv-vim - fugitive - haskell-vim - jedi-vim - nerdtree - nerdtree-git-plugin - supertab - vim-dirdiff - vim-pandoc - vim-pandoc-syntax - vim-nix - vim-jinja - which-key-nvim - ]; + (self: super: rec { + myVim = + with super; + neovim.override { + configure = { + packages.myVimPackage = with pkgs.vimPlugins; { + # loaded on start + start = [ + ale + base16-vim + LanguageClient-neovim + ctrlp + direnv-vim + fugitive + haskell-vim + jedi-vim + nerdtree + nerdtree-git-plugin + supertab + vim-dirdiff + vim-pandoc + vim-pandoc-syntax + vim-nix + vim-jinja + which-key-nvim + ]; + }; + customRC = builtins.readFile ./vimrc; }; - customRC = builtins.readFile ./vimrc; }; - }; }) ]