From 00044eb5670c8dab03a25c3250fdb36d9147a19d Mon Sep 17 00:00:00 2001 From: Will Ruggiano Date: Thu, 11 Jul 2024 15:25:02 -0700 Subject: [PATCH] feat!: summer cleaning --- flake.lock | 220 ++++++++++++++++---------------------------- flake.nix | 8 +- modules/default.nix | 8 +- pkgs/luafun.nix | 8 +- plugins/spec.nix | 9 +- 5 files changed, 98 insertions(+), 155 deletions(-) diff --git a/flake.lock b/flake.lock index dfc8dc3..3f83afd 100644 --- a/flake.lock +++ b/flake.lock @@ -163,7 +163,7 @@ }, "dream2nix_2": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "purescript-overlay": "purescript-overlay", "pyproject-nix": "pyproject-nix" }, @@ -264,11 +264,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -405,21 +405,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -437,7 +422,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -455,7 +440,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": "systems_4" }, @@ -473,7 +458,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { "systems": "systems_5" }, @@ -491,7 +476,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { "systems": "systems_6" }, @@ -509,7 +494,7 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { "systems": "systems_7" }, @@ -575,6 +560,32 @@ "type": "github" } }, + "git-hooks_3": { + "inputs": { + "flake-compat": "flake-compat_6", + "gitignore": "gitignore_3", + "nixpkgs": [ + "neovim-nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nix" + ] + }, + "locked": { + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -622,16 +633,16 @@ "inputs": { "nixpkgs": [ "neovim-nix", - "pre-commit-nix", + "git-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -717,22 +728,6 @@ "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" } }, - "lazy-nvim": { - "flake": false, - "locked": { - "lastModified": 1678889456, - "narHash": "sha256-R+sfPOuWfwbrNXUiKQcb8MHYqK+o5Pw8gkEaYaidqp0=", - "owner": "folke", - "repo": "lazy.nvim", - "rev": "6b55862d2d264f0b48e0b9e42cc2d14f136bed55", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "lazy.nvim", - "type": "github" - } - }, "mk-naked-shell": { "flake": false, "locked": { @@ -754,7 +749,7 @@ "crane": "crane", "dream2nix": "dream2nix", "mk-naked-shell": "mk-naked-shell", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "parts": "parts", "rust-overlay": "rust-overlay_2", "treefmt": "treefmt" @@ -801,16 +796,15 @@ "flake-parts": [ "flake-parts" ], - "lazy-nvim": "lazy-nvim", - "nixpkgs": "nixpkgs_5", - "pre-commit-nix": "pre-commit-nix" + "git-hooks": "git-hooks_3", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1710401770, - "narHash": "sha256-VSQOXBNhtStokN2SPuZYml7qfqUUem1GD4WysRF+ITI=", + "lastModified": 1720736405, + "narHash": "sha256-DTHUOKqTxeGcLAtnZZA3cOWbpGNfg2LzE1JMjOv4sn8=", "owner": "willruggiano", "repo": "neovim.nix", - "rev": "724908713f909821e4eb4229b14175662a294c7e", + "rev": "23083273ec3909d5d1bb99d2dc41c748c79d8caa", "type": "github" }, "original": { @@ -837,8 +831,8 @@ }, "nil": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_7", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { @@ -1061,22 +1055,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -1093,22 +1071,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1696419054, - "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1689261696, "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", @@ -1124,7 +1086,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -1140,7 +1102,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1702272962, "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", @@ -1156,7 +1118,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1718208800, "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", @@ -1237,22 +1199,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1671271357, - "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1716977081, "narHash": "sha256-pFe5jLeIPlKEln5n2h998d7cpzXFdbrBMRe3suz4K1o=", @@ -1268,7 +1214,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1720368505, "narHash": "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ=", @@ -1284,7 +1230,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1696193975, "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", @@ -1300,6 +1246,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1696419054, + "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "parts": { "inputs": { "nixpkgs-lib": [ @@ -1348,34 +1310,12 @@ } }, "pre-commit-nix": { - "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_2", - "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_6", - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1675169698, - "narHash": "sha256-C1wFiyJ+4SRvIsFkdMIN1Fa+58APmyTGKWpX9EKOehM=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "ce4efeec34c6eb35ba07b8fceaae87d6b46c1c5f", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-nix_2": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "gitignore": "gitignore_4", - "nixpkgs": "nixpkgs_11", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs": "nixpkgs_10", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1696516544, @@ -1440,7 +1380,7 @@ "neovim-nix": "neovim-nix", "nil": "nil", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "sg-nvim": "sg-nvim", "vscode-js-debug": "vscode-js-debug", "zls": "zls" @@ -1489,8 +1429,8 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1696558324, @@ -1510,8 +1450,8 @@ "inputs": { "flake-parts": "flake-parts_4", "nci": "nci", - "nixpkgs": "nixpkgs_10", - "pre-commit-nix": "pre-commit-nix_2", + "nixpkgs": "nixpkgs_9", + "pre-commit-nix": "pre-commit-nix", "rust-overlay": "rust-overlay_3" }, "locked": { @@ -1681,7 +1621,7 @@ "vscode-js-debug": { "inputs": { "dream2nix": "dream2nix_2", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "vscode-js-debug", "dream2nix", @@ -1705,7 +1645,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": [ "zls", "nixpkgs" @@ -1727,10 +1667,10 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "gitignore": "gitignore_5", "langref": "langref", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index a8e43fd..d966d3b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,14 @@ { inputs = { - devenv.url = "github:cachix/devenv"; + devenv = { + url = "github:cachix/devenv"; + inputs.pre-commit-hooks.follows = "git-hooks"; + }; git-hooks.url = "github:cachix/git-hooks.nix"; neovim-nix = { url = "github:willruggiano/neovim.nix"; inputs.flake-parts.follows = "flake-parts"; + # inputs.git-hooks.follows = ""; FIXME: SO :( }; neovim.url = "github:nix-community/neovim-nightly-overlay"; nil.url = "github:oxalica/nil"; @@ -13,8 +17,6 @@ sg-nvim.url = "github:sourcegraph/sg.nvim"; vscode-js-debug.url = "github:willruggiano/vscode-js-debug.nix"; zls.url = "github:zigtools/zls"; - - devenv.inputs.pre-commit-hooks.follows = "git-hooks"; }; nixConfig = { diff --git a/modules/default.nix b/modules/default.nix index aaa736f..b798a6c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,4 +1,4 @@ -{inputs, ...}: { +{ imports = [ ./colorscheme ]; @@ -7,12 +7,9 @@ config, lib, pkgs, - neovim-lib, inputs', ... - }: let - inherit (inputs'.neovim-nix.packages) utils; - in { + }: { neovim = { # Environment variables to bake into the neovim environment. # If an environment variable is already defined, the existing definition will take precedence. @@ -57,7 +54,6 @@ }; plugins = import ../plugins/spec.nix { inherit config inputs' pkgs; - neovim-utils = utils; }; }; }; diff --git a/pkgs/luafun.nix b/pkgs/luafun.nix index 6495b2d..91b43ec 100644 --- a/pkgs/luafun.nix +++ b/pkgs/luafun.nix @@ -1,7 +1,5 @@ { buildLuarocksPackage, - fetchFromGitHub, - fetchurl, lua, }: let sources = import ../nix/sources.nix; @@ -13,5 +11,11 @@ in src = sources.luafun; knownRockspec = "${sources.luafun}/fun-scm-1.rockspec"; + nativeBuildInputs = [lua.pkgs.luarocksMoveDataFolder]; propagatedBuildInputs = [lua]; + + extraConfig = '' + -- to create a flat hierarchy + lua_modules_path = "lua" + ''; } diff --git a/plugins/spec.nix b/plugins/spec.nix index 25af1bf..0e04abb 100644 --- a/plugins/spec.nix +++ b/plugins/spec.nix @@ -1,7 +1,6 @@ { config, inputs', - neovim-utils, pkgs, ... }: let @@ -200,7 +199,7 @@ in rec { }; fun = { - package = neovim-utils.toLuarocksPlugin config.packages.luafun; + package = config.packages.luafun; }; fzy-lua-native = let @@ -360,7 +359,9 @@ in rec { }; lyaml = { - package = neovim-utils.toLuarocksPlugin luajitPackages.lyaml; + package = pkgs.neovimUtils.buildNeovimPlugin { + inherit (luajitPackages.lyaml) pname; + }; }; markdown = { @@ -521,7 +522,7 @@ in rec { paths = with pkgs; [dasht elinks]; }; telescope-fzf-native = { - package = neovim-utils.mkPlugin { + package = pkgs.vimUtils.buildVimPlugin { name = "telescope-fzf-native"; src = sources."telescope-fzf-native.nvim"; buildPhase = "";