Merge branch 'minified' of ssh://git.joshuabell.xyz:3032/ringofstorms/nvim into minified

This commit is contained in:
RingOfStorms (Joshua Bell) 2025-10-27 21:53:45 -05:00
commit 5f4f5a9997
2 changed files with 7 additions and 45 deletions

12
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761605067, "lastModified": 1761619080,
"narHash": "sha256-XlXxfbRET+JrBLnnknmlO6rEazTe/S4Nycnkls6Oe0Q=", "narHash": "sha256-PsLFmU/CORWeCjJi9ALsegwr/SMjf2gHsooTR09az4c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8929c5ea8ff351a777bc983b0b8e0a46587e6909", "rev": "fd644bba1d3a83169e4b312ce20928ba1b0abb02",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -963,11 +963,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761532837, "lastModified": 1761619008,
"narHash": "sha256-78mCSQgC/a6/0vWYrvE/g9E3gGsJLyBBGtmHe3ZOLG4=", "narHash": "sha256-vp97eNmi5GG/+jlvnBpmG6EVO2F1+nqMQFF9GT2TIQg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4f5f89f1cfd8553b1285a4a0879ea1b2b05ad286", "rev": "7bc7d2f706ebe5479d230d2c6806b5dc757ae4cd",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -141,7 +141,7 @@
# work then we make a new version name. Helps separate any files and # work then we make a new version name. Helps separate any files and
# "version" my neovim flake. Use this name for custom .config location # "version" my neovim flake. Use this name for custom .config location
# ================== # ==================
version = "hydrogen"; version = "helium";
# =================== # ===================
# Utilities # Utilities
@ -170,44 +170,6 @@
"nvim_plugin-nvim-treesitter/nvim-treesitter" = nvim-treesitter.withAllGrammars; "nvim_plugin-nvim-treesitter/nvim-treesitter" = nvim-treesitter.withAllGrammars;
}; };
# avante-nvim-lib = pkgs.rustPlatform.buildRustPackage {
# pname = "avante-nvim-lib";
# version = "0.0.0";
# src = inputs."nvim_plugin-yetone/avante.nvim";
#
# buildFeatures = [ "luajit" ];
# doCheck = false;
# cargoLock = {
# lockFile = inputs."nvim_plugin-yetone/avante.nvim" + "/Cargo.lock";
# allowBuiltinFetchGit = true;
# };
#
# nativeBuildInputs = with pkgs; [
# pkg-config
# ];
#
# buildInputs = with pkgs; [
# openssl.dev
# ];
# env = {
# OPENSSL_NO_VENDOR = "1";
# OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib";
# OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include";
# OPENSSL_DIR = "${pkgs.openssl.dev}";
# };
# postInstall = ''
# # mv $out/lib/libavante_repo_map.so $out/lib/avante_repo_map.so
# for f in $out/lib/lib*; do
# mv "$f" "$out/lib/''${f##*/lib}"
# done
# '';
# meta = {
# description = "Avante nvim libraries";
# homepage = "https://github.com/yetone/avante.nvim";
# license = pkgs.lib.licenses.asl20;
# };
# };
# This will be how we put any nix related stuff into our lua config # This will be how we put any nix related stuff into our lua config
luaNixGlobal = luaNixGlobal =
"NIX=" "NIX="