diff --git a/flake.lock b/flake.lock index b00d4d4..2ca12ac 100644 --- a/flake.lock +++ b/flake.lock @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1683813037, - "narHash": "sha256-UMEXfYLVcI4p0JUHQD07UWglqj7XUw6xhdJqqNRu4KY=", + "lastModified": 1687204608, + "narHash": "sha256-rZ0e0iAIQM7vlsMd2/pcGfymZzNBRawObFgqIpxE94c=", "owner": "nix-community", "repo": "home-manager", - "rev": "d97e8f8861a7ad3cb2f72adf5b2cd14ab302c593", + "rev": "f06a43dca05fb7f1aa44742bf861d9c827b45122", "type": "github" }, "original": { @@ -177,11 +177,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { diff --git a/home/vim.nix b/home/vim.nix index 1c7eff1..60a7e50 100644 --- a/home/vim.nix +++ b/home/vim.nix @@ -59,7 +59,7 @@ in #extraConfig = builtins.readFile ./vimrc; extraLuaConfig = builtins.readFile ./init.lua; coc = { - enable = false; + enable = true; }; }; } diff --git a/overlays/default.nix b/overlays/default.nix index 0dc7bbf..3c3852d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -55,6 +55,8 @@ in rec { pythonPackagesExtensions = (prev.pythonPackagesExtensions or []) ++ [ (python-final: python-prev: { django-rapyd-modernauth = python-final.callPackage ./django-rapyd-modernauth.nix {}; + xonsh-apipenv = cp ./xonsh-apipenv.nix {}; + xonsh-direnv = cp ./xonsh-direnv.nix {}; }) ]; @@ -78,8 +80,6 @@ in rec { inherit molecule; }; pyyaml-include = cp ./pyyaml-include.nix {}; - xonsh-apipenv = cp ./xonsh-apipenv.nix {}; - xonsh-direnv = cp ./xonsh-direnv.nix {}; }; #fcitx-engines = if ! prev.stdenv.isDarwin then prev.fcitx5 else prev.fcitx-engines; @@ -95,9 +95,9 @@ in rec { xonsh = prev.xonsh.overridePythonAttrs (old: rec{ python3 = final.gregpy; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - my-py-addons.xonsh-apipenv - my-py-addons.xonsh-direnv + propagatedBuildInputs = with final.gregpy.pkgs; old.propagatedBuildInputs ++ [ + xonsh-apipenv + xonsh-direnv ]; });