use nvim env flake

This commit is contained in:
traxys 2022-02-06 14:05:32 +01:00
parent 98369e88c2
commit b420e59674
2 changed files with 4 additions and 34 deletions

View file

@ -12,20 +12,8 @@
url = "github:mozilla/nixpkgs-mozilla";
flake = false;
};
rnix-lsp = {
url = "github:nix-community/rnix-lsp";
inputs.nixpkgs.follows = "nixpkgs";
};
stylua = {
url = "github:johnnymorganz/stylua";
flake = false;
};
naersk = {
url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs";
};
nvim-traxys = {
url = "github:traxys/nvim-flake";
hm-nvim-traxys = {
url = "github:traxys/home-manager-nvim-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
zsh-traxys = {
@ -40,7 +28,7 @@
modules = [
({ pkgs, ... }: {
nixpkgs.overlays = [
inputs.nvim-traxys.overlay."${system}"
inputs.hm-nvim-traxys.overlay."${system}"
(import inputs.nixpkgs-mozilla)
];
})
@ -53,13 +41,9 @@
imports = [
./home.nix
inputs.zsh-traxys.home-managerModule."${system}"
inputs.hm-nvim-traxys.home-managerModule."${system}"
];
};
home-manager.extraSpecialArgs = {
rnix-lsp = inputs.rnix-lsp;
stylua = inputs.stylua;
naersk-lib = inputs.naersk.lib."${system}";
};
# Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix
}

View file

@ -1,8 +1,6 @@
{ config
, pkgs
, lib
, stylua
, naersk-lib
, ...
}:
@ -24,28 +22,17 @@ in
home.homeDirectory = localinfo.homeDir;
home.sessionVariables = {
EDITOR = "nvim";
RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache";
};
home.packages = with pkgs; [
bitwarden-cli
rustup
neovimTraxys
rust-analyzer
clang-tools
nodePackages.vscode-json-languageserver
nodePackages.bash-language-server
nixpkgs-fmt
rnix-lsp
exa
python3
topgrade
wl-clipboard
(naersk-lib.buildPackage {
pname = "stylua";
root = stylua;
})
cargo-edit
rsync
fd
@ -55,7 +42,6 @@ in
sqlx-cli
direnv
codespell
shellcheck
ripgrep
file
jq