dwinkl/nvimConfig
1
0
Fork 0
mirror of https://github.com/dwinkler1/nvimConfig.git synced 2026-02-19 14:30:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

small refactor

Browse source
This commit is contained in:
Daniel Winkler 2026-01-30 16:05:54 +11:00
commit 3bad68566b
3 changed files with 30 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

17
flake.lock generated
View file

@ -52,22 +52,6 @@
"type": "github" "type": "github"
} }
}, },
"plugins-cmp-r": {
"flake": false,
"locked": {
"lastModified": 1764700377,
"narHash": "sha256-xb7VFWM/BKAkN7fg62y8n618t2qkQjdYbPwhBhLJwtk=",
"owner": "R-nvim",
"repo": "cmp-r",
"rev": "70bfe8f4c062acc10266e24825439c009a0b1b89",
"type": "github"
},
"original": {
"owner": "R-nvim",
"repo": "cmp-r",
"type": "github"
}
},
"plugins-r": { "plugins-r": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -101,7 +85,6 @@
"fran": "fran", "fran": "fran",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references", "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
"plugins-cmp-r": "plugins-cmp-r",
"plugins-r": "plugins-r", "plugins-r": "plugins-r",
"rixpkgs": "rixpkgs", "rixpkgs": "rixpkgs",
"wrappers": "wrappers" "wrappers": "wrappers"

42
flake.nix
View file

@ -50,24 +50,30 @@
r = true; r = true;
}; };
settings.lang_packages = { settings = {
python = with pkgs.python3Packages; [ lang_packages = {
duckdb python = with pkgs.python3Packages; [
polars duckdb
]; polars
];
r = with pkgs.rpkgs.rPackages; [ r = with pkgs.rpkgs.rPackages; [
arrow arrow
broom broom
data_table data_table
duckdb duckdb
janitor janitor
styler styler
tidyverse tidyverse
]; ];
julia = ["DataFramesMeta" "QuackIO"]; julia = ["DataFramesMeta" "QuackIO"];
};
colorscheme = "cyberdream";
background = "dark";
wrapRc = true;
}; };
binName = "vv";
}; };
systems = [ systems = [
@ -144,7 +150,7 @@
nvimPkg = wrapperSettings pkgs; nvimPkg = wrapperSettings pkgs;
in { in {
default = pkgs.mkShell { default = pkgs.mkShell {
name = "n"; name = "vShell";
packages = [nvimPkg]; packages = [nvimPkg];
nativeBuildInputs = with pkgs; [] ++ (pkgs.lib.optionals self.wrappers.default.cats.optional [devenv]); nativeBuildInputs = with pkgs; [] ++ (pkgs.lib.optionals self.wrappers.default.cats.optional [devenv]);
inputsFrom = []; inputsFrom = [];
@ -186,12 +192,12 @@
); );
nixosModules.default = wrappers.lib.mkInstallModule { nixosModules.default = wrappers.lib.mkInstallModule {
name = "n"; name = "vModule";
value = module; value = module;
}; };
homeModules.default = wrappers.lib.mkInstallModule { homeModules.default = wrappers.lib.mkInstallModule {
name = "n"; name = "vModule";
value = module; value = module;
loc = ["home" "packages"]; loc = ["home" "packages"];
}; };

8
modules/module/settings/core.nix
View file

@ -8,18 +8,18 @@
config.settings.config_directory = ../../..; config.settings.config_directory = ../../..;
# Default colorscheme and background # Default colorscheme and background
config.settings.colorscheme = "kanagawa"; config.settings.colorscheme = lib.mkDefault "kanagawa";
config.settings.background = "dark"; config.settings.background = lib.mkDefault "dark";
# Enable RC wrapping (allows neovim to find the config) # Enable RC wrapping (allows neovim to find the config)
config.settings.wrapRc = true; config.settings.wrapRc = lib.mkDefault true;
# Lua packages available to neovim (for :lua require()) # Lua packages available to neovim (for :lua require())
config.settings.nvim_lua_env = lp: config.settings.nvim_lua_env = lp:
lib.optionals (config.cats.general or false) [ lp.tiktoken_core ]; lib.optionals (config.cats.general or false) [ lp.tiktoken_core ];
# Binary name for the wrapper # Binary name for the wrapper
config.binName = "n"; config.binName = lib.mkDefault "n";
# Prevent neovim from loading system-wide config # Prevent neovim from loading system-wide config
config.settings.block_normal_config = true; config.settings.block_normal_config = true;