From 0e9a1212bddd6326f3cb99bbeb773064063308aa Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 18 Jul 2024 17:52:03 -0400 Subject: [PATCH] Add omnix --- flake.lock | 324 +++++++++++++++++++++++++++++++++++++------ flake.nix | 1 + home/terminal.nix | 2 +- packages/overlay.nix | 1 + 4 files changed, 284 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index c1066f0..ec64c76 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715572711, - "narHash": "sha256-CPZrSwbZBasURURCzoWHb0XCK1dYEmomT8HamOoQ1A8=", + "lastModified": 1719282578, + "narHash": "sha256-Ah9Pikv4gQY9X+dfKsAZXkGuNkYzlbBBJUcqb6GgBD8=", "owner": "srid", "repo": "actualism-app", - "rev": "62897d3bb3340d0952489195fd8f1f31b12c9c8c", + "rev": "5bcabb1e24687a6630cf5ce4ddfd3f6ed9ba9e02", "type": "github" }, "original": { @@ -32,7 +32,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_10" }, "locked": { "lastModified": 1707830867, @@ -50,11 +50,11 @@ }, "cargo-doc-live": { "locked": { - "lastModified": 1713493311, - "narHash": "sha256-fxbzPNIv0o/Y0OEo0r6iAm4Dft1pX08CKtzBl+RKgrE=", + "lastModified": 1717704203, + "narHash": "sha256-U6r0Af8/JGiV+gzQGEjLLc34sT6MZllUUrRe0NbUiAA=", "owner": "srid", "repo": "cargo-doc-live", - "rev": "b7058f7b4eb131c569a1fcebf966a1149defd7e3", + "rev": "0a32dcc5a281dc03d5b24218641a70d4ac1236e5", "type": "github" }, "original": { @@ -78,6 +78,21 @@ "type": "github" } }, + "cargo-doc-live_3": { + "locked": { + "lastModified": 1717704203, + "narHash": "sha256-U6r0Af8/JGiV+gzQGEjLLc34sT6MZllUUrRe0NbUiAA=", + "owner": "srid", + "repo": "cargo-doc-live", + "rev": "0a32dcc5a281dc03d5b24218641a70d4ac1236e5", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "cargo-doc-live", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -125,6 +140,28 @@ } }, "crane_3": { + "inputs": { + "nixpkgs": [ + "omnix", + "rust-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "owner": "ipetkov", + "repo": "crane", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { "inputs": { "nixpkgs": [ "ragenix", @@ -277,11 +314,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -347,6 +384,24 @@ "type": "github" } }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -439,7 +494,25 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_11" }, "locked": { "lastModified": 1705309234, @@ -694,11 +767,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1720798281, - "narHash": "sha256-oaGEOxMIQHaJAbwO6gChm2yR/iR2RRlO7YvzrM8/PQo=", + "lastModified": 1720813393, + "narHash": "sha256-DcntNzFSBcfvAq0CdLWz/gtWX360NI6U03M34BMWXKw=", "owner": "srid", "repo": "nixci", - "rev": "25e8fd4e548573f6f703e9aa3c7d8623d20d17bc", + "rev": "1cab3caea0236eee483e72df312af7ec6ad3c0bd", "type": "github" }, "original": { @@ -758,11 +831,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715282013, - "narHash": "sha256-GtwK9hQMbN+FxSD2eTioBOi2P47+t3oqnY4ZGJl53+k=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cc6431d5598071f0021efc6c009c79e5b5fe1617", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { @@ -774,14 +847,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1714640452, - "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-lib_2": { @@ -814,6 +887,34 @@ "type": "github" } }, + "nixpkgs-lib_4": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1706487304, @@ -909,27 +1010,27 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1708655239, - "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", + "lastModified": 1720087678, + "narHash": "sha256-uOhYJU3ldDKXYV+mFaXcPtyjq/UIMh/6SCuoVNU9rxM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", + "rev": "1afc5440469f94e7ed26e8648820971b102afdc3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "lastModified": 1708655239, + "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", "type": "github" }, "original": { @@ -966,6 +1067,30 @@ "type": "github" } }, + "omnix": { + "inputs": { + "cargo-doc-live": "cargo-doc-live_3", + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_8", + "process-compose-flake": "process-compose-flake_3", + "rust-flake": "rust-flake_3", + "systems": "systems_9", + "treefmt-nix": "treefmt-nix_4" + }, + "locked": { + "lastModified": 1721314875, + "narHash": "sha256-H84tws6cwQygtYsUtcEIhAHZr5mt6ULjcBlB8ocfxMA=", + "owner": "juspay", + "repo": "omnix", + "rev": "f63f6442de42b5bb272bdb8566fff49c97a71b9d", + "type": "github" + }, + "original": { + "owner": "juspay", + "repo": "omnix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": "flake-compat", @@ -996,11 +1121,11 @@ }, "process-compose-flake": { "locked": { - "lastModified": 1715063745, - "narHash": "sha256-kO8gcRHfuKIlsGmFoHUF4lD3CfrRBymIlG2R3OHBEjQ=", + "lastModified": 1718031437, + "narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=", "owner": "Platonic-Systems", "repo": "process-compose-flake", - "rev": "32c069e7ef436b4325ee36503cd02b2863eede53", + "rev": "9344fac44edced4c686721686a6ad904d067c546", "type": "github" }, "original": { @@ -1024,13 +1149,28 @@ "type": "github" } }, + "process-compose-flake_3": { + "locked": { + "lastModified": 1718031437, + "narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=", + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "rev": "9344fac44edced4c686721686a6ad904d067c546", + "type": "github" + }, + "original": { + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "type": "github" + } + }, "ragenix": { "inputs": { "agenix": "agenix", - "crane": "crane_3", - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_3" + "crane": "crane_4", + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_9", + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1718869541, @@ -1061,8 +1201,9 @@ "nixos-vscode-server": "nixos-vscode-server", "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", + "omnix": "omnix", "ragenix": "ragenix", - "treefmt-nix": "treefmt-nix_4" + "treefmt-nix": "treefmt-nix_5" } }, "rust-flake": { @@ -1075,11 +1216,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1715570778, - "narHash": "sha256-PlWsDmfLHmhrvf2y7rBJP9wKlgMKm4iIP/PX2BdlttI=", + "lastModified": 1718720277, + "narHash": "sha256-Ex4xYWKVt/JfspCp0UluhXQkSYuRgjOwfUds9QhaJSw=", "owner": "juspay", "repo": "rust-flake", - "rev": "19e41363312bdb34c2b3d6304b84d5d5fccee09d", + "rev": "944a06430cca1f57922ad7abd469572fb85e07b8", "type": "github" }, "original": { @@ -1112,6 +1253,29 @@ "type": "github" } }, + "rust-flake_3": { + "inputs": { + "crane": "crane_3", + "nixpkgs": [ + "omnix", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1721249094, + "narHash": "sha256-p/HO8YAsGGFQ8EnYaVMgl8AiqenA4r0cIGJ6mZACpFA=", + "owner": "juspay", + "repo": "rust-flake", + "rev": "658edce0b6bb521f1f54957ddbfab80f73066bee", + "type": "github" + }, + "original": { + "owner": "juspay", + "repo": "rust-flake", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": "flake-utils", @@ -1151,6 +1315,29 @@ } }, "rust-overlay_3": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "omnix", + "rust-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715480255, + "narHash": "sha256-gEZl8nYidQwqJhOigJ91JDjoBFoPEWVsd82AKnaE7Go=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d690205a4f01ec0930303c4204e5063958e51255", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "inputs": { "flake-utils": [ "ragenix", @@ -1190,6 +1377,36 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1318,11 +1535,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1719243788, + "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "type": "github" }, "original": { @@ -1372,7 +1589,28 @@ }, "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": [ + "omnix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_5": { + "inputs": { + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1689243103, diff --git a/flake.nix b/flake.nix index 13a89a2..a842d94 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; actualism-app.url = "github:srid/actualism-app"; + omnix.url = "github:juspay/omnix"; # Neovim nixvim.url = "github:nix-community/nixvim"; diff --git a/home/terminal.nix b/home/terminal.nix index b50d1cf..51436b6 100644 --- a/home/terminal.nix +++ b/home/terminal.nix @@ -15,7 +15,7 @@ nixci nixci-build-remote ci - nix-health + omnix nixpkgs-fmt just diff --git a/packages/overlay.nix b/packages/overlay.nix index ef8d439..fa3fdf5 100644 --- a/packages/overlay.nix +++ b/packages/overlay.nix @@ -9,4 +9,5 @@ self: super: { nixci = flake.inputs.nixci.packages.${system}.default; # nix-health = flake.inputs.nix-browser.packages.${system}.nix-health; actualism-app = flake.inputs.actualism-app.packages.${system}.default; + omnix = flake.inputs.omnix.packages.${system}.default; }