pegasust
/
dotfiles
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

specify neovim's extra packages

mason-deno-fix
pegasust 2022-12-01 02:17:06 +00:00
parent 645866fbdc
commit 77ba3ccce9
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
home-nix/flake.nix
View File

@ -28,7 +28,10 @@
system = "x86_64-linux";
overlays = [ nixgl.overlay rust-overlay.overlays.default ];
# pkgs = nixpkgs.legacyPackages.${system}.appendOverlays overlays;
pkgs = import nixpkgs { inherit system overlays; };
pkgs = import nixpkgs {
inherit system overlays;
config = {allowUnfree = true;};
};
lib = (import ../lib-nix { inherit pkgs from-yaml; lib = pkgs.lib; });
in
{
@ -102,7 +105,7 @@
homeDirectory = "/home/hwtr";
packages = [
pkgs.nixgl.nixGLIntel
# pkgs.postman
pkgs.postman
];
shellAliases = {
nixGL = "nixGLIntel";

45
home-nix/home.nix
View File

@ -8,8 +8,6 @@ let nvim_pkgs = [
# Yes, I desperately want neovim to work out-of-the-box without flake.nix for now
# I want at least python LSP to work everywhere because it's basically
# an alternative to bash script when I move to OpenColo
pkgs.ncdu
pkgs.neovim
pkgs.gccStdenv
pkgs.gcc
pkgs.tree-sitter
@ -19,13 +17,14 @@ let nvim_pkgs = [
pkgs.ripgrep
pkgs.zk
pkgs.fd
pkgs.stdenv.cc.cc.lib
# Python3 as alternative to bash scripts :^)
(pkgs.python310Full.withPackages (pypkgs: [
# python-lsp-server's dependencies is absolutely astronomous
# pypkgs.python-lsp-server # python-lsp. Now we'll have to tell mason to look for this
pypkgs.pynvim # nvim provider
# pypkgs.ujson # pylsp seems to rely on this. satisfy it lol
]))
# (pkgs.python310Full.withPackages (pypkgs: [
# # python-lsp-server's dependencies is absolutely astronomous
# # pypkgs.python-lsp-server # python-lsp. Now we'll have to tell mason to look for this
# pypkgs.pynvim # nvim provider
# # pypkgs.ujson # pylsp seems to rely on this. satisfy it lol
# ]))
]; in
{
home = {
@ -34,6 +33,7 @@ let nvim_pkgs = [
stateVersion = myHome.stateVersion or "22.05";
};
home.packages = pkgs.lib.unique ([
pkgs.ncdu
pkgs.htop
pkgs.ripgrep
pkgs.unzip
@ -52,7 +52,7 @@ let nvim_pkgs = [
pkgs.lynx # Web browser at your local terminal
# pkgs.tailscale # VPC;; This should be installed in system-nix
# pkgs.python310 # dev packages should be in jk
pkgs.python310 # dev packages should be in jk
# pkgs.python310.numpy
# pkgs.python310Packages.tensorflow
# pkgs.python310Packages.scikit-learn
@ -96,17 +96,22 @@ let nvim_pkgs = [
};
programs.home-manager.enable = true;
programs.fzf.enable = true;
# programs.neovim = {
# enable = true;
# viAlias = true;
# vimAlias = true;
# withPython3 = true;
# withNodeJs = true;
# # I use vim-plug, so I probably don't require packaging
# # extraConfig actually writes to init-home-manager.vim (not lua)
# # https://github.com/nix-community/home-manager/pull/3287
# # extraConfig = builtins.readFile ../neovim/init.lua;
# };
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
withPython3 = true;
withNodeJs = true;
extraPackages = nvim_pkgs;
extraPython3Packages = (pypkgs: [
pypkgs.python-lsp-server
pypkgs.ujson
]);
# I use vim-plug, so I probably don't require packaging
# extraConfig actually writes to init-home-manager.vim (not lua)
# https://github.com/nix-community/home-manager/pull/3287
# extraConfig = builtins.readFile ../neovim/init.lua;
};
programs.bash = {
enable = true;
enableCompletion = true;