summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.envrc11
l---------.pre-commit-config.yaml2
-rw-r--r--devenv.lock239
-rw-r--r--devenv.nix9
-rw-r--r--devenv.yaml5
-rw-r--r--flake.lock245
-rw-r--r--flake.nix8
7 files changed, 261 insertions, 258 deletions
diff --git a/.envrc b/.envrc
deleted file mode 100644
index d70512d..0000000
--- a/.envrc
+++ /dev/null
@@ -1,11 +0,0 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
- source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
-fi
-
-watch_file devenv.nix
-watch_file devenv.lock
-watch_file devenv.yaml
-if ! use flake . --impure
-then
- echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
-fi
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3a72848..4f746a8 120000
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1 +1 @@
-/nix/store/h8kmqxxwvjdzbbwb1lr7xcn6j6y43aig-pre-commit-config.json \ No newline at end of file
+/nix/store/vi1h136z1dpqmigb877rv264n906n0ws-pre-commit-config.json \ No newline at end of file
diff --git a/devenv.lock b/devenv.lock
new file mode 100644
index 0000000..4c4330d
--- /dev/null
+++ b/devenv.lock
@@ -0,0 +1,239 @@
+{
+ "nodes": {
+ "devenv": {
+ "locked": {
+ "dir": "src/modules",
+ "lastModified": 1739444039,
+ "owner": "cachix",
+ "repo": "devenv",
+ "rev": "1235cd13f47df6ad19c8a183c6eabc1facb7c399",
+ "type": "github"
+ },
+ "original": {
+ "dir": "src/modules",
+ "owner": "cachix",
+ "repo": "devenv",
+ "type": "github"
+ }
+ },
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1733328505,
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib"
+ },
+ "locked": {
+ "lastModified": 1738453229,
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+ "type": "github"
+ },
+ "original": {
+ "id": "flake-parts",
+ "type": "indirect"
+ }
+ },
+ "flake-parts_2": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "my-nixpkgs",
+ "nur",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1738453229,
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "git-hooks": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "gitignore": "gitignore",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1737465171,
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "gitignore": {
+ "inputs": {
+ "nixpkgs": [
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "my-nixpkgs": {
+ "inputs": {
+ "flake-parts": "flake-parts",
+ "nixpkgs": "nixpkgs",
+ "nur": "nur"
+ },
+ "locked": {
+ "lastModified": 1739561505,
+ "owner": "qaristote",
+ "repo": "my-nixpkgs",
+ "rev": "e4fdb9e23fa4d0ac7a7394c281d5402bcff83cc7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "qaristote",
+ "repo": "my-nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1739482815,
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "ba0939c506a03c60a765cd7f7c43794816540eec",
+ "type": "github"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "type": "indirect"
+ }
+ },
+ "nixpkgs-lib": {
+ "locked": {
+ "lastModified": 1739730695,
+ "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1739580444,
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "8bb37161a0488b89830168b81c48aed11569cb93",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1739482815,
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "ba0939c506a03c60a765cd7f7c43794816540eec",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nur": {
+ "inputs": {
+ "flake-parts": "flake-parts_2",
+ "nixpkgs": "nixpkgs_2",
+ "treefmt-nix": "treefmt-nix"
+ },
+ "locked": {
+ "lastModified": 1739736100,
+ "owner": "nix-community",
+ "repo": "NUR",
+ "rev": "879c126305e7f2a38a7038737b9e3de7edf498c0",
+ "type": "github"
+ },
+ "original": {
+ "id": "nur",
+ "type": "indirect"
+ }
+ },
+ "root": {
+ "inputs": {
+ "devenv": "devenv",
+ "git-hooks": "git-hooks",
+ "my-nixpkgs": "my-nixpkgs",
+ "nixpkgs": "nixpkgs_3",
+ "pre-commit-hooks": [
+ "git-hooks"
+ ]
+ }
+ },
+ "treefmt-nix": {
+ "inputs": {
+ "nixpkgs": [
+ "my-nixpkgs",
+ "nur",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1738953846,
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "type": "github"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/devenv.nix b/devenv.nix
new file mode 100644
index 0000000..601d798
--- /dev/null
+++ b/devenv.nix
@@ -0,0 +1,9 @@
+{
+ inputs,
+ pkgs,
+ ...
+}: {
+ imports = [inputs.my-nixpkgs.devenvModules.personal];
+ languages.nix.enable = true;
+ packages = [pkgs.miniserve];
+}
diff --git a/devenv.yaml b/devenv.yaml
new file mode 100644
index 0000000..38233b1
--- /dev/null
+++ b/devenv.yaml
@@ -0,0 +1,5 @@
+inputs:
+ nixpkgs:
+ url: github:NixOS/nixpkgs/nixpkgs-unstable
+ my-nixpkgs:
+ url: github:qaristote/my-nixpkgs
diff --git a/flake.lock b/flake.lock
index af22c89..abfba60 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,33 +1,5 @@
{
"nodes": {
- "cachix": {
- "inputs": {
- "devenv": [
- "devenv"
- ],
- "flake-compat": [
- "devenv"
- ],
- "git-hooks": [
- "devenv"
- ],
- "nixpkgs": "nixpkgs_5"
- },
- "locked": {
- "lastModified": 1737621947,
- "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=",
- "owner": "cachix",
- "repo": "cachix",
- "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "ref": "latest",
- "repo": "cachix",
- "type": "github"
- }
- },
"data": {
"inputs": {
"devenv": "devenv",
@@ -91,28 +63,6 @@
"type": "github"
}
},
- "devenv_3": {
- "inputs": {
- "cachix": "cachix",
- "flake-compat": "flake-compat_3",
- "git-hooks": "git-hooks",
- "nix": "nix_3",
- "nixpkgs": "nixpkgs_7"
- },
- "locked": {
- "lastModified": 1739444039,
- "narHash": "sha256-J7PLowc4pCdEkXEWtm72bC6gNNlT7sgNAq5YMZmvvkg=",
- "owner": "cachix",
- "repo": "devenv",
- "rev": "1235cd13f47df6ad19c8a183c6eabc1facb7c399",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "devenv",
- "type": "github"
- }
- },
"flake-compat": {
"flake": false,
"locked": {
@@ -145,22 +95,6 @@
"type": "github"
}
},
- "flake-compat_3": {
- "flake": false,
- "locked": {
- "lastModified": 1733328505,
- "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@@ -197,28 +131,6 @@
},
"flake-parts_3": {
"inputs": {
- "nixpkgs-lib": [
- "devenv",
- "nix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1712014858,
- "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-parts_4": {
- "inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
@@ -234,7 +146,7 @@
"type": "indirect"
}
},
- "flake-parts_5": {
+ "flake-parts_4": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_4"
},
@@ -304,31 +216,6 @@
"type": "indirect"
}
},
- "git-hooks": {
- "inputs": {
- "flake-compat": [
- "devenv"
- ],
- "gitignore": "gitignore_3",
- "nixpkgs": [
- "devenv",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1737465171,
- "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "type": "github"
- }
- },
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -376,44 +263,6 @@
"type": "github"
}
},
- "gitignore_3": {
- "inputs": {
- "nixpkgs": [
- "devenv",
- "git-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709087332,
- "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
- "libgit2": {
- "flake": false,
- "locked": {
- "lastModified": 1697646580,
- "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
- "owner": "libgit2",
- "repo": "libgit2",
- "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
- "type": "github"
- },
- "original": {
- "owner": "libgit2",
- "repo": "libgit2",
- "type": "github"
- }
- },
"lowdown-src": {
"flake": false,
"locked": {
@@ -469,8 +318,8 @@
},
"my-nixpkgs_2": {
"inputs": {
- "flake-parts": "flake-parts_5",
- "nixpkgs": "nixpkgs_8",
+ "flake-parts": "flake-parts_4",
+ "nixpkgs": "nixpkgs_5",
"nur": "nur_2"
},
"locked": {
@@ -538,39 +387,6 @@
"type": "github"
}
},
- "nix_3": {
- "inputs": {
- "flake-compat": [
- "devenv"
- ],
- "flake-parts": "flake-parts_3",
- "libgit2": "libgit2",
- "nixpkgs": "nixpkgs_6",
- "nixpkgs-23-11": [
- "devenv"
- ],
- "nixpkgs-regression": [
- "devenv"
- ],
- "pre-commit-hooks": [
- "devenv"
- ]
- },
- "locked": {
- "lastModified": 1734114420,
- "narHash": "sha256-n52PUzub5jZWc8nI/sR7UICOheU8rNA+YZ73YaHeCBg=",
- "owner": "domenkozar",
- "repo": "nix",
- "rev": "bde6a1a0d1f2af86caa4d20d23eca019f3d57eee",
- "type": "github"
- },
- "original": {
- "owner": "domenkozar",
- "ref": "devenv-2.24",
- "repo": "nix",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
"lastModified": 1678875422,
@@ -757,54 +573,6 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1733212471,
- "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_6": {
- "locked": {
- "lastModified": 1717432640,
- "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "release-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_7": {
- "locked": {
- "lastModified": 1733477122,
- "narHash": "sha256-qamMCz5mNpQmgBwc8SB5tVMlD5sbwVIToVZtSxMph9s=",
- "owner": "cachix",
- "repo": "devenv-nixpkgs",
- "rev": "7bd9e84d0452f6d2e63b6e6da29fe73fac951857",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "ref": "rolling",
- "repo": "devenv-nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_8": {
- "locked": {
"lastModified": 1723856861,
"narHash": "sha256-OTDg91+Zzs2SpU3csK4xVdSQFoG8cK1lNUwKmTqERyE=",
"owner": "NixOS",
@@ -817,7 +585,7 @@
"type": "indirect"
}
},
- "nixpkgs_9": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1725816686,
"narHash": "sha256-0Kq2MkQ/sQX1rhWJ/ySBBQlBJBUK8mPMDcuDhhdBkSU=",
@@ -924,10 +692,9 @@
"root": {
"inputs": {
"data": "data",
- "devenv": "devenv_3",
- "flake-parts": "flake-parts_4",
+ "flake-parts": "flake-parts_3",
"my-nixpkgs": "my-nixpkgs_2",
- "nixpkgs": "nixpkgs_9",
+ "nixpkgs": "nixpkgs_6",
"uncss": "uncss"
}
},
diff --git a/flake.nix b/flake.nix
index 211c0c9..8b2e6ad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
inputs = {
data.url = "github:qaristote/info";
- devenv.url = "github:cachix/devenv";
my-nixpkgs.url = "github:qaristote/my-nixpkgs";
uncss = {
url = "github:qaristote/uncss";
@@ -24,7 +23,7 @@
lib,
...
}: {
- imports = builtins.attrValues {inherit (my-nixpkgs.flakeModules) personal devenv;};
+ imports = builtins.attrValues {inherit (my-nixpkgs.flakeModules) personal;};
flake.lib = import ./lib {inherit lib;};
@@ -53,11 +52,6 @@
};
};
};
- devenv.shells.default = {
- imports = [my-nixpkgs.devenvModules.personal];
- languages.nix.enable = true;
- packages = [pkgs.miniserve];
- };
};
});
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-25 02:08:18 +0000