summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore4
l---------.pre-commit-config.yaml2
-rw-r--r--devenv.lock239
-rw-r--r--devenv.nix7
-rw-r--r--devenv.yaml5
-rw-r--r--flake.lock229
-rw-r--r--flake.nix16
7 files changed, 266 insertions, 236 deletions
diff --git a/.gitignore b/.gitignore
index 15642c4..6849dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
### devenv
.devenv/
-
+.devenv.flake.nix
+devenv.local.nix
+.pre-commit-config.yaml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d312996..4f746a8 120000
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1 +1 @@
-/nix/store/9f1qv9x0ckx5lg3khx1rp8x603yzz3ns-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..63a9c13
--- /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": 1739728798,
+ "owner": "nix-community",
+ "repo": "NUR",
+ "rev": "cda60b577af4611c6ddcc5039c7ac73d0ed27cf6",
+ "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..5606223
--- /dev/null
+++ b/devenv.nix
@@ -0,0 +1,7 @@
+{inputs, ...}: {
+ imports = [inputs.my-nixpkgs.devenvModules.personal];
+ languages.nix = {
+ enable = true;
+ packaging.enable = true;
+ };
+}
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 2f0eabd..e9a77ef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,27 +8,6 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
- "lastModified": 1695635472,
- "narHash": "sha256-+0lqQZmbzdglPh8JoMAZzP1XXanhBg9BcbjVXnwEC5E=",
- "owner": "cachix",
- "repo": "devenv",
- "rev": "42a26aa1b2265cf505df056e040e2b1ef8073b76",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "devenv",
- "type": "github"
- }
- },
- "devenv_2": {
- "inputs": {
- "flake-compat": "flake-compat_2",
- "nix": "nix_2",
- "nixpkgs": "nixpkgs_2",
- "pre-commit-hooks": "pre-commit-hooks_2"
- },
- "locked": {
"lastModified": 1694422554,
"narHash": "sha256-s5NTPzT66yIMmau+ZGP7q9z4NjgceDETL4xZ6HJ/TBg=",
"owner": "cachix",
@@ -58,22 +37,6 @@
"type": "github"
}
},
- "flake-compat_2": {
- "flake": false,
- "locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@@ -126,49 +89,9 @@
"type": "github"
}
},
- "flake-utils_2": {
- "inputs": {
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"gitignore": {
"inputs": {
"nixpkgs": [
- "devenv",
- "pre-commit-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1660459072,
- "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
- "gitignore_2": {
- "inputs": {
- "nixpkgs": [
"my-nixpkgs",
"devenv",
"pre-commit-hooks",
@@ -205,27 +128,11 @@
"type": "github"
}
},
- "lowdown-src_2": {
- "flake": false,
- "locked": {
- "lastModified": 1633514407,
- "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
- "owner": "kristapsdz",
- "repo": "lowdown",
- "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
- "type": "github"
- },
- "original": {
- "owner": "kristapsdz",
- "repo": "lowdown",
- "type": "github"
- }
- },
"my-nixpkgs": {
"inputs": {
- "devenv": "devenv_2",
+ "devenv": "devenv",
"flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_2",
"nur": "nur"
},
"locked": {
@@ -246,35 +153,11 @@
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": [
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-regression": "nixpkgs-regression"
- },
- "locked": {
- "lastModified": 1676545802,
- "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
- "owner": "domenkozar",
- "repo": "nix",
- "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
- "type": "github"
- },
- "original": {
- "owner": "domenkozar",
- "ref": "relaxed-flakes",
- "repo": "nix",
- "type": "github"
- }
- },
- "nix_2": {
- "inputs": {
- "lowdown-src": "lowdown-src_2",
- "nixpkgs": [
"my-nixpkgs",
"devenv",
"nixpkgs"
],
- "nixpkgs-regression": "nixpkgs-regression_2"
+ "nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1676545802,
@@ -293,11 +176,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1678875422,
- "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
+ "lastModified": 1695978539,
+ "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
+ "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8",
"type": "github"
},
"original": {
@@ -359,22 +242,6 @@
"type": "github"
}
},
- "nixpkgs-regression_2": {
- "locked": {
- "lastModified": 1643052045,
- "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- }
- },
"nixpkgs-stable": {
"locked": {
"lastModified": 1685801374,
@@ -391,40 +258,8 @@
"type": "github"
}
},
- "nixpkgs-stable_2": {
- "locked": {
- "lastModified": 1685801374,
- "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-23.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_2": {
"locked": {
- "lastModified": 1695978539,
- "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
"lastModified": 1694948089,
"narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=",
"owner": "NixOS",
@@ -437,7 +272,7 @@
"type": "indirect"
}
},
- "nixpkgs_4": {
+ "nixpkgs_3": {
"locked": {
"lastModified": 1695978539,
"narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=",
@@ -468,46 +303,18 @@
"pre-commit-hooks": {
"inputs": {
"flake-compat": [
+ "my-nixpkgs",
"devenv",
"flake-compat"
],
"flake-utils": "flake-utils",
"gitignore": "gitignore",
"nixpkgs": [
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
- },
- "locked": {
- "lastModified": 1688056373,
- "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
- "pre-commit-hooks_2": {
- "inputs": {
- "flake-compat": [
- "my-nixpkgs",
- "devenv",
- "flake-compat"
- ],
- "flake-utils": "flake-utils_2",
- "gitignore": "gitignore_2",
- "nixpkgs": [
"my-nixpkgs",
"devenv",
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1688056373,
@@ -525,10 +332,9 @@
},
"root": {
"inputs": {
- "devenv": "devenv",
"flake-parts": "flake-parts",
"my-nixpkgs": "my-nixpkgs",
- "nixpkgs": "nixpkgs_4"
+ "nixpkgs": "nixpkgs_3"
}
},
"systems": {
@@ -545,21 +351,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_2": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 2a38ab0..8731e95 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,31 +2,17 @@
description = "Quentin Aristote's personal information.";
inputs = {
- devenv.url = "github:cachix/devenv";
my-nixpkgs.url = "github:qaristote/my-nixpkgs";
nixpkgs = {};
};
- nixConfig = {
- extra-trusted-public-keys = "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=";
- extra-trusted-substituters = "https://devenv.cachix.org";
- };
-
outputs = {
flake-parts,
my-nixpkgs,
...
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} {
- imports = builtins.attrValues {inherit (my-nixpkgs.flakeModules) personal devenv;};
+ imports = builtins.attrValues {inherit (my-nixpkgs.flakeModules) personal;};
flake.lib.formatWith = attrs: import ./default.nix attrs;
- perSystem = {
- devenv.shells.default = {
- languages.nix = {
- enable = true;
- packaging.enable = true;
- };
- };
- };
};
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-25 02:01:49 +0000