Skip to content

Commit

Permalink
home: replace vim with nixvim config
Browse files Browse the repository at this point in the history
  • Loading branch information
adfaure committed Jul 15, 2024
1 parent 5fe7b48 commit aed11b7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 29 deletions.
4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim-config.url = "github:adfaure/nixvim-config";
emacs-overlay.url = "github:nix-community/emacs-overlay";
catppuccin.url = "github:catppuccin/nix/a48e70a31616cb63e4794fd3465bff1835cc4246";
};
Expand All @@ -27,6 +28,7 @@
home-manager,
emacs-overlay,
catppuccin,
nixvim-config,
}: let
system = "x86_64-linux";
pkgs = import nixpkgs {
Expand Down Expand Up @@ -67,7 +69,7 @@
};
};
extraSpecialArgs = {
inherit my-dotfiles home-module unstable;
inherit my-dotfiles home-module unstable nixvim-config system;
};
in {
# Include programs that need X or wayland
Expand Down
2 changes: 1 addition & 1 deletion homes/base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
programs.home-manager.enable = true;
adfaure.home-modules.vim-tmux-nav-conf.enable = true;
adfaure.home-modules.eza-alias.enable = true;
my-programs.emacs.enable = true;
my-programs.emacs.enable = false;

# Small git config (should I make a dedicated module?)
programs.git = {
Expand Down
32 changes: 5 additions & 27 deletions homes/modules/vim/default.nix
Original file line number Diff line number Diff line change
@@ -1,37 +1,15 @@
{
config,
system,
lib,
pkgs,
my-dotfiles,
nixvim-config,
unstable,
...
}: let
my_vim_plugins = pkgs.callPackage ./my_vim_plugins.nix {inherit unstable;};
in {
}: {
home.packages =
[
# (pkgs.callPackage ./my_vim.nix { inherit my-dotfiles; })
pkgs.ctags
pkgs.ack
]
++ my_vim_plugins.dependencies;

programs.neovim = {
enable = true;
catppuccin.enable = true;
catppuccin.flavour = "latte";
# viAlias = true;
# vimAlias = true;
# withPython3 = true;
# https://github.com/nix-community/home-manager/issues/1712

extraConfig = builtins.readFile ./vimrc;

extraLuaConfig = builtins.readFile ./init.lua;
plugins = my_vim_plugins.plugins;
# extraPackages = with pkgs;
# [ (python3.withPackages (ps: with ps; [ black flake8 jedi ])) rnix-lsp ]
# ++ my_vim_plugins.dependencies;
# extraPython3Packages = (ps: with ps; [ jedi ]);
};
nixvim-config.packages.${system}.default
];
}

0 comments on commit aed11b7

Please sign in to comment.