seang96/nixos-config
1
0
Fork 0
mirror of https://github.com/buckley310/nixos-config.git synced 2024-12-21 19:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch lvim to new PR

Browse source
This commit is contained in:
Sean Buckley 2023-10-15 17:13:47 -04:00
parent 2750975737
commit 5df3516aa8
2 changed files with 10 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/vim/default.nix
View file

@ -2,13 +2,6 @@
{ {
environment.variables.EDITOR = "vim"; environment.variables.EDITOR = "vim";
environment.etc."lvim.lua".source = ./init.lua;
environment.etc."my-settings.sh".text = ''
mkdir -p ~/.config/lvim
echo 'vim.cmd("luafile /etc/lvim.lua")' >~/.config/lvim/config.lua
'';
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
lunarvim lunarvim
nodePackages.prettier nodePackages.prettier
@ -16,13 +9,5 @@
(writeShellScriptBin "black" '' (writeShellScriptBin "black" ''
exec ${pkgs.python3.pkgs.black}/bin/black "$@" exec ${pkgs.python3.pkgs.black}/bin/black "$@"
'') '')
(writeShellScriptBin "vi" ''
exec lvim "$@"
'')
(writeShellScriptBin "vim" ''
exec lvim "$@"
'')
]; ];
} }

22
pkgs/lunarvim.nix
View file

@ -1,28 +1,18 @@
# #
# https://github.com/NixOS/nixpkgs/pull/257063 # https://github.com/NixOS/nixpkgs/pull/261103
# #
{ pkgs }: { pkgs }:
(
( (
pkgs.callPackage pkgs.callPackage
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/266e0f99a483d8e699f32b050c55981fd950de70/pkgs/by-name/lu/lunarvim/package.nix"; url = "https://raw.githubusercontent.com/NixOS/nixpkgs/99dadc5f534b7ba85582c8ee492599585069d20e/pkgs/by-name/lu/lunarvim/package.nix";
sha256 = "fa44f06a517c686d181f35ee255d4e0c00c6f52473cf1a3b9586c4e511efb7d7"; sha256 = "211d9cf8d5d352d220785ba90c7800d588c34e6e1c4a3dcbf02013d1fa49977c";
}) })
{ } { }
).overrideAttrs (_: {
patches = [
(
pkgs.fetchurl {
url = "https://github.com/LunarVim/LunarVim/commit/d187cbd03fbc8bd1b59250869e0e325518bf8798.patch";
sha256 = "00677d3d5a4882d7ee5709e0494a5d8f7c58cea8bdcf467ce59222f9cc493366";
}
)
];
})
).override (_: { ).override (_: {
python3.withPackages = _: pkgs.emptyDirectory; viAlias = true;
vimAlias = true;
globalConfig = builtins.readFile ../modules/vim/init.lua;
}) })