Skip to content

Commit

Permalink
pi: cleanup neovim conf
Browse files Browse the repository at this point in the history
  • Loading branch information
adomixaszvers committed Jan 20, 2025
1 parent 7cd09cb commit e590b64
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 11 deletions.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
};
kaknix = pkgs.callPackage ./kaknix.nix { };
maimpick = pkgs.callPackage ./maimpick.nix { };
neovim = nixCatsBuilder "nvim";
neovim-nix = nixCatsBuilder "neovim-nix";
neovim = nixCatsBuilder "nixCats";
neovim-nix = nixCatsBuilder "nvim";
restart-eww = pkgs.callPackage ./restart-eww.nix { };
rofi-powermenu = pkgs.callPackage ./rofi-powermenu.nix { };
sxhkd = pkgs.sxhkd.overrideAttrs (old: {
Expand Down
9 changes: 6 additions & 3 deletions profiles/cli/neovim/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ inputs, ... }:
{ inputs, lib, ... }:
{
imports = [ inputs.nixCats.homeModule ];
nixCats =
Expand All @@ -7,8 +7,11 @@
in
{
enable = true;
luaPath = ./luapath;
packageNames = [ "nvim" ];
luaPath = builtins.path {
name = "my-neovim-config";
path = ./luapath;
};
packageNames = lib.mkDefault [ "nixCats" ];
categoryDefinitions.replace = categoryDefinitions;
packageDefinitions.replace = packageDefinitions;
};
Expand Down
5 changes: 3 additions & 2 deletions profiles/cli/neovim/nixCats.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,11 @@
packageDefinitions = {
# the name here is the name of the package
# and also the default command name for it.
nvim = _: {
nixCats = _: {
# these also recieve our pkgs variable
# see :help nixCats.flake.outputs.packageDefinitions
settings = {
aliases = [ "nvim" ];
# explained below in the `regularCats` package's definition
# OR see :help nixCats.flake.outputs.settings for all of the settings available
wrapRc = true;
Expand All @@ -106,7 +107,7 @@
treesitter-small = false;
};
};
neovim-nix = _: {
nvim = _: {
# these also recieve our pkgs variable
# see :help nixCats.flake.outputs.packageDefinitions
settings = {
Expand Down
5 changes: 4 additions & 1 deletion profiles/cli/neovim/nixCatsBuilder.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
}:
let
inherit (import ./nixCats.nix) categoryDefinitions packageDefinitions;
luaPath = ./luapath;
luaPath = builtins.path {
name = "my-neovim-config";
path = ./luapath;
};
inherit (nixCats) utils;
nixCatsBuilder = utils.baseBuilder luaPath {
inherit nixpkgs system;
Expand Down
1 change: 1 addition & 0 deletions profiles/pi.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
imports = [ ./cli ];
services.gpg-agent.enable = false;
nixCats.packageNames = [ "nvim" ];
xdg = {
enable = true;
};
Expand Down

0 comments on commit e590b64

Please sign in to comment.