summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Flynn <[email protected]>2025-03-30 22:08:43 -0400
committerSeth Flynn <[email protected]>2025-03-30 22:09:08 -0400
commitfb01fd764b73372bdf91b9fb1ae2d02e469f0216 (patch)
treea6c6e6b045bcbc0f97020ac92f92a6b29fceeefa
parent36821d4e7df5bde74441ba7bc7fc7c870e9b2824 (diff)
chore: nix-filter -> lib.filesetHEADmain
-rw-r--r--flake.lock16
-rw-r--r--flake.nix18
2 files changed, 7 insertions, 27 deletions
diff --git a/flake.lock b/flake.lock
index b553d08..8244838 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,20 +1,5 @@
{
"nodes": {
- "nix-filter": {
- "locked": {
- "lastModified": 1731533336,
- "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
- "owner": "numtide",
- "repo": "nix-filter",
- "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "nix-filter",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
"lastModified": 1743076231,
@@ -33,7 +18,6 @@
},
"root": {
"inputs": {
- "nix-filter": "nix-filter",
"nixpkgs": "nixpkgs"
}
}
diff --git a/flake.nix b/flake.nix
index 5dc4108..a6625d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,14 +3,12 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
- nix-filter.url = "github:numtide/nix-filter";
};
outputs =
{
self,
nixpkgs,
- nix-filter,
}:
let
inherit (nixpkgs) lib;
@@ -27,16 +25,14 @@
date =
let
- # YYYYMMDD
- date = builtins.substring 0 8 self.lastModifiedDate;
# YYYY
- year = builtins.substring 0 4 date;
+ year = lib.substring 0 4 self.lastModifiedDate;
# MM
- month = builtins.substring 4 2 date;
+ month = lib.substring 4 2 self.lastModifiedDate;
# DD
- day = builtins.substring 6 2 date;
+ day = lib.substring 6 2 self.lastModifiedDate;
in
- builtins.concatStringsSep "-" [
+ lib.concatStringsSep "-" [
year
month
day
@@ -104,9 +100,9 @@
pname = "getchoo-neovim-config";
inherit version;
- src = nix-filter.lib.filter {
- root = self;
- include = [
+ src = lib.fileset.toSource {
+ root = ./.;
+ fileset = lib.fileset.unions [
./lua
./ftdetect
./ftplugin