diff options
| author | quentin@aristote.fr <quentin@aristote.fr> | 2023-12-04 22:24:18 +0100 |
|---|---|---|
| committer | quentin@aristote.fr <quentin@aristote.fr> | 2023-12-04 22:24:18 +0100 |
| commit | 9755557a9d0aadc46f92e5344657447212e0d2a5 (patch) | |
| tree | b9d3831513f0aaa613d8f1bcc85914e8064a13d4 | |
| parent | 4b7f758f4c31da107167486e39f7e4b5b7904e1e (diff) | |
home: add devenv package
| -rw-r--r-- | flake.lock | 286 | ||||
| -rw-r--r-- | flake.nix | 12 | ||||
| -rw-r--r-- | nixos/nix.nix | 1 |
3 files changed, 258 insertions, 41 deletions
@@ -134,7 +134,7 @@ "inputs": { "flake-compat": "flake-compat", "nix": "nix", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -151,6 +151,27 @@ "type": "github" } }, + "devenv_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "nix": "nix_2", + "nixpkgs": "nixpkgs_3", + "pre-commit-hooks": "pre-commit-hooks_2" + }, + "locked": { + "lastModified": 1701187605, + "narHash": "sha256-NctguPdUeDVLXFsv6vI1RlEiHLsXkeW3pgZe/mwn1BU=", + "owner": "cachix", + "repo": "devenv", + "rev": "a7c4dd8f4eb1f98a6b8f04bf08364954e1e73e4f", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -183,6 +204,22 @@ "type": "github" } }, + "flake-compat_3": { + "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" @@ -218,6 +255,24 @@ "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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -237,6 +292,28 @@ "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", @@ -259,14 +336,14 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1701609479, - "narHash": "sha256-mcEnMz7XB3K57ZX16VXoEkswljSNGXdMuUu5+g8a8R8=", + "lastModified": 1701676655, + "narHash": "sha256-wP8i7hO2aLNJhYoTK3kqoymaCLgt4QcwWcO8d/A1CjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "e504e8d01f950776c3a3160ba38c5957a1b89e66", + "rev": "948703f3e71f1332a0cb535ebaf5cb14946e3724", "type": "github" }, "original": { @@ -311,23 +388,40 @@ "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", + "devenv": "devenv_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur" }, "locked": { - "lastModified": 1701632126, - "narHash": "sha256-Yagqtxqp87H8cwxrVa/kzbzOm9cfS53r835tNWxjbuA=", + "lastModified": 1701724821, + "narHash": "sha256-xA4Q705TADxRqGJ6tXe3UWXyudxNA4BGUDHcjfizmZc=", "owner": "qaristote", "repo": "my-nixpkgs", - "rev": "5cacac7d3612b90523b66fe6ab4e99513e184467", + "rev": "c62c1c07b9acaebc4d51d8464d35fd0c3b0dfc20", "type": "github" }, "original": { "owner": "qaristote", + "ref": "devenv", "repo": "my-nixpkgs", "type": "github" } @@ -336,7 +430,6 @@ "inputs": { "lowdown-src": "lowdown-src", "nixpkgs": [ - "my-nixpkgs", "devenv", "nixpkgs" ], @@ -357,13 +450,38 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "lowdown-src": "lowdown-src_2", + "nixpkgs": [ + "my-nixpkgs", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "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" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1701598471, - "narHash": "sha256-kHdJ2qc4qKeMTzUIHEcP41ah/dBIhCgvWgrjllt2G78=", + "lastModified": 1701656485, + "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a89745edd5f657e2e5be5ed1bea86725ca78d92e", + "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", "type": "github" }, "original": { @@ -373,16 +491,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "lastModified": 1678875422, + "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -421,6 +539,22 @@ "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, @@ -437,43 +571,61 @@ "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": 1701432845, - "narHash": "sha256-06sd2rQ+DPMSueh+hW4MiXbpMSdhQHJOi/sw0vuwqvs=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "77da99a144cd341408308e0a37622f5edcc6c5ba", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1701432845, - "narHash": "sha256-06sd2rQ+DPMSueh+hW4MiXbpMSdhQHJOi/sw0vuwqvs=", + "lastModified": 1701626906, + "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "77da99a144cd341408308e0a37622f5edcc6c5ba", + "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1701432845, - "narHash": "sha256-06sd2rQ+DPMSueh+hW4MiXbpMSdhQHJOi/sw0vuwqvs=", + "lastModified": 1701589523, + "narHash": "sha256-7LK019+Y9khM18WjIt4ISK2yd1P5z+CXJq0ts+E13UA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "77da99a144cd341408308e0a37622f5edcc6c5ba", + "rev": "ec04772e7516b6d58d98b491e68b329b7558b14d", "type": "github" }, "original": { @@ -483,6 +635,20 @@ }, "nixpkgs_5": { "locked": { + "lastModified": 1701626906, + "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_6": { + "locked": { "lastModified": 1700856099, "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "owner": "NixOS", @@ -499,11 +665,11 @@ }, "nur": { "locked": { - "lastModified": 1701629129, - "narHash": "sha256-6ALYFMybTV+NbIeRsmr0vw2ansDRxyrDZ6zzr7eF7AY=", + "lastModified": 1701636328, + "narHash": "sha256-tUG15xG0nx5aG1Ezw3Y3OOdVqb0NFiXDu7Dnla+T6Vs=", "owner": "nix-community", "repo": "NUR", - "rev": "f554dbd2dcd9d58516150d617f80f35ba6c52e25", + "rev": "d52153ca963cb8072332dc18c3665626fec86647", "type": "github" }, "original": { @@ -514,14 +680,12 @@ "pre-commit-hooks": { "inputs": { "flake-compat": [ - "my-nixpkgs", "devenv", "flake-compat" ], "flake-utils": "flake-utils", "gitignore": "gitignore", "nixpkgs": [ - "my-nixpkgs", "devenv", "nixpkgs" ], @@ -541,12 +705,43 @@ "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" + }, + "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" + } + }, "root": { "inputs": { + "devenv": "devenv", "home-manager": "home-manager", "my-nixpkgs": "my-nixpkgs", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "stylix": "stylix" } }, @@ -560,9 +755,9 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1701532764, @@ -592,6 +787,21 @@ "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", @@ -1,28 +1,34 @@ { inputs = { - my-nixpkgs.url = "github:qaristote/my-nixpkgs"; + my-nixpkgs.url = "github:qaristote/my-nixpkgs/devenv"; stylix.url = "github:danth/stylix"; + devenv.url = "github:cachix/devenv"; }; - outputs = { self, nixpkgs, my-nixpkgs, nixos-hardware, home-manager, stylix }: + outputs = + { self, nixpkgs, my-nixpkgs, nixos-hardware, home-manager, stylix, devenv }: let system = "x86_64-linux"; overlays-module = { ... }: { nixpkgs.overlays = [ my-nixpkgs.overlays.personal ]; }; homeModules = [ my-nixpkgs.homeModules.personal ./home ]; + homeSpecialArgs = { inherit devenv; }; nixosModules = [ overlays-module my-nixpkgs.nixosModules.personal ./nixos ]; in { nixosConfigurations.latitude-7490 = nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { inherit nixos-hardware home-manager homeModules stylix; }; + specialArgs = { + inherit nixos-hardware home-manager homeModules homeSpecialArgs stylix; + }; modules = nixosModules; }; homeConfigurations.qaristote = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages."${system}"; modules = homeModules; + extraSpecialArgs = homeSpecialArgs; }; }; } diff --git a/nixos/nix.nix b/nixos/nix.nix index 350510d..bf251a3 100644 --- a/nixos/nix.nix +++ b/nixos/nix.nix @@ -14,5 +14,6 @@ "latitude-7490/nixos-hardware" "latitude-7490/nixpkgs" "latitude-7490/stylix" + "latitude-7490/devenv" ]; } |
