diff --git a/flake.lock b/flake.lock index cd3296b..2e1f017 100644 --- a/flake.lock +++ b/flake.lock @@ -24,9 +24,9 @@ "co-log-effectful": { "inputs": { "devshell": "devshell", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix" }, @@ -44,36 +44,6 @@ "type": "github" } }, - "crane": { - "locked": { - "lastModified": 1736566337, - "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", - "owner": "ipetkov", - "repo": "crane", - "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { - "locked": { - "lastModified": 1736566337, - "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", - "owner": "ipetkov", - "repo": "crane", - "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -96,38 +66,6 @@ "type": "github" } }, - "devour-flake": { - "flake": false, - "locked": { - "lastModified": 1726283167, - "narHash": "sha256-Cvc84VzvvdmehafnaIPfdPylNWJcDmv79QQh/MH/4Qk=", - "owner": "srid", - "repo": "devour-flake", - "rev": "9b96d31a55be119df8496ec5b7369823deec8a1c", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "devour-flake", - "type": "github" - } - }, - "devour-flake_2": { - "flake": false, - "locked": { - "lastModified": 1726283167, - "narHash": "sha256-Cvc84VzvvdmehafnaIPfdPylNWJcDmv79QQh/MH/4Qk=", - "owner": "srid", - "repo": "devour-flake", - "rev": "9b96d31a55be119df8496ec5b7369823deec8a1c", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "devour-flake", - "type": "github" - } - }, "devshell": { "inputs": { "nixpkgs": [ @@ -209,36 +147,6 @@ "type": "github" } }, - "false": { - "locked": { - "lastModified": 1657739266, - "narHash": "sha256-vLy8GQr0noEcoA+jX24FgUVBA/poV36zDWAUChN3hIY=", - "owner": "boolean-option", - "repo": "false", - "rev": "d06b4794a134686c70a1325df88a6e6768c6b212", - "type": "github" - }, - "original": { - "owner": "boolean-option", - "repo": "false", - "type": "github" - } - }, - "false_2": { - "locked": { - "lastModified": 1657739266, - "narHash": "sha256-vLy8GQr0noEcoA+jX24FgUVBA/poV36zDWAUChN3hIY=", - "owner": "boolean-option", - "repo": "false", - "rev": "d06b4794a134686c70a1325df88a6e6768c6b212", - "type": "github" - }, - "original": { - "owner": "boolean-option", - "repo": "false", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -295,27 +203,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "omnix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -333,7 +220,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "vira", @@ -355,7 +242,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "vira", @@ -376,28 +263,6 @@ "type": "github" } }, - "flake-parts_7": { - "inputs": { - "nixpkgs-lib": [ - "vira", - "omnix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_3" @@ -484,22 +349,6 @@ } }, "git-hooks_2": { - "flake": false, - "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" - } - }, - "git-hooks_3": { "flake": false, "locked": { "lastModified": 1748731770, @@ -516,22 +365,6 @@ "type": "github" } }, - "git-hooks_4": { - "flake": false, - "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" - } - }, "github-nix-ci": { "locked": { "lastModified": 1728494632, @@ -674,40 +507,6 @@ "type": "github" } }, - "inspect": { - "flake": false, - "locked": { - "lastModified": 1726418650, - "narHash": "sha256-Aabwu7gHQbKDU8mrbG2le6oqpbBl9oTbFvWEBFgXw/4=", - "owner": "juspay", - "repo": "inspect", - "rev": "279cfa5c434e5bbebb4c07fa6af2deeb84e03bb0", - "type": "github" - }, - "original": { - "owner": "juspay", - "ref": "inventory-for-systems", - "repo": "inspect", - "type": "github" - } - }, - "inspect_2": { - "flake": false, - "locked": { - "lastModified": 1726418650, - "narHash": "sha256-Aabwu7gHQbKDU8mrbG2le6oqpbBl9oTbFvWEBFgXw/4=", - "owner": "juspay", - "repo": "inspect", - "rev": "279cfa5c434e5bbebb4c07fa6af2deeb84e03bb0", - "type": "github" - }, - "original": { - "owner": "juspay", - "ref": "inventory-for-systems", - "repo": "inspect", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -799,126 +598,6 @@ "type": "github" } }, - "nix-systems-aarch64-darwin": { - "locked": { - "lastModified": 1680978170, - "narHash": "sha256-PHVNQ7y0EQYzujQRYoRdb96K0m1KSeAjSrbz2b75S6Q=", - "owner": "nix-systems", - "repo": "aarch64-darwin", - "rev": "75e6c6912484d28ebba5769b794ffa4aff653ba2", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "aarch64-darwin", - "type": "github" - } - }, - "nix-systems-aarch64-darwin_2": { - "locked": { - "lastModified": 1680978170, - "narHash": "sha256-PHVNQ7y0EQYzujQRYoRdb96K0m1KSeAjSrbz2b75S6Q=", - "owner": "nix-systems", - "repo": "aarch64-darwin", - "rev": "75e6c6912484d28ebba5769b794ffa4aff653ba2", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "aarch64-darwin", - "type": "github" - } - }, - "nix-systems-aarch64-linux": { - "locked": { - "lastModified": 1680978097, - "narHash": "sha256-1Zp7TRYLXj4P5FLhQ8jBChrgAmQxR3iTypmWf9EFTnc=", - "owner": "nix-systems", - "repo": "aarch64-linux", - "rev": "aa1ce1b64c822dff925d63d3e771113f71ada1bb", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "aarch64-linux", - "type": "github" - } - }, - "nix-systems-aarch64-linux_2": { - "locked": { - "lastModified": 1680978097, - "narHash": "sha256-1Zp7TRYLXj4P5FLhQ8jBChrgAmQxR3iTypmWf9EFTnc=", - "owner": "nix-systems", - "repo": "aarch64-linux", - "rev": "aa1ce1b64c822dff925d63d3e771113f71ada1bb", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "aarch64-linux", - "type": "github" - } - }, - "nix-systems-x86_64-darwin": { - "locked": { - "lastModified": 1680978224, - "narHash": "sha256-+xT9B1ZbhMg/zpJqd00S06UCZb/A2URW9bqqrZ/JTOg=", - "owner": "nix-systems", - "repo": "x86_64-darwin", - "rev": "db0463cce4cd60fb791f33a83d29a1ed53edab9b", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-darwin", - "type": "github" - } - }, - "nix-systems-x86_64-darwin_2": { - "locked": { - "lastModified": 1680978224, - "narHash": "sha256-+xT9B1ZbhMg/zpJqd00S06UCZb/A2URW9bqqrZ/JTOg=", - "owner": "nix-systems", - "repo": "x86_64-darwin", - "rev": "db0463cce4cd60fb791f33a83d29a1ed53edab9b", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-darwin", - "type": "github" - } - }, - "nix-systems-x86_64-linux": { - "locked": { - "lastModified": 1680978846, - "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", - "owner": "nix-systems", - "repo": "x86_64-linux", - "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-linux", - "type": "github" - } - }, - "nix-systems-x86_64-linux_2": { - "locked": { - "lastModified": 1680978846, - "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", - "owner": "nix-systems", - "repo": "x86_64-linux", - "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-linux", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1743167577, @@ -1086,22 +765,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1755577059, "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=", @@ -1117,7 +780,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1738264807, "narHash": "sha256-6x6WLFwoLdR3w3FYtCnLye2Xe32SqsL7Zf0jpa5wJMM=", @@ -1133,7 +796,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1756696532, "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", @@ -1149,22 +812,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -1231,68 +878,6 @@ "type": "github" } }, - "omnix": { - "inputs": { - "devour-flake": "devour-flake", - "false": "false", - "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks_2", - "inspect": "inspect", - "nix-systems-aarch64-darwin": "nix-systems-aarch64-darwin", - "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", - "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin", - "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", - "nixpkgs": "nixpkgs_5", - "rust-flake": "rust-flake", - "systems": "systems_7", - "true": "true" - }, - "locked": { - "lastModified": 1757121151, - "narHash": "sha256-fKoDPv2RE7f5b+lfCjlqV4m6/ZpzSLC4fz8JJb04Wlg=", - "owner": "juspay", - "repo": "omnix", - "rev": "4888691509025f055e04599d4a55d674029c3d08", - "type": "github" - }, - "original": { - "owner": "juspay", - "ref": "ci-no-args", - "repo": "omnix", - "type": "github" - } - }, - "omnix_2": { - "inputs": { - "devour-flake": "devour-flake_2", - "false": "false_2", - "flake-parts": "flake-parts_7", - "git-hooks": "git-hooks_4", - "inspect": "inspect_2", - "nix-systems-aarch64-darwin": "nix-systems-aarch64-darwin_2", - "nix-systems-aarch64-linux": "nix-systems-aarch64-linux_2", - "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin_2", - "nix-systems-x86_64-linux": "nix-systems-x86_64-linux_2", - "nixpkgs": "nixpkgs_9", - "rust-flake": "rust-flake_2", - "systems": "systems_8", - "true": "true_2" - }, - "locked": { - "lastModified": 1757121151, - "narHash": "sha256-fKoDPv2RE7f5b+lfCjlqV4m6/ZpzSLC4fz8JJb04Wlg=", - "owner": "juspay", - "repo": "omnix", - "rev": "4888691509025f055e04599d4a55d674029c3d08", - "type": "github" - }, - "original": { - "owner": "juspay", - "ref": "pull/484/head", - "repo": "omnix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": "flake-compat", @@ -1350,59 +935,11 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nuenv": "nuenv", - "omnix": "omnix", "try": "try", "vertex": "vertex", "vira": "vira" } }, - "rust-flake": { - "inputs": { - "crane": "crane", - "nixpkgs": [ - "omnix", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1741121204, - "narHash": "sha256-oMJsdsRzvO6l5oHqzXjhSe7D8ld06yAXwRPPrX/n/KI=", - "owner": "juspay", - "repo": "rust-flake", - "rev": "ea753dade9e283809d11c63082840657eb766e97", - "type": "github" - }, - "original": { - "owner": "juspay", - "repo": "rust-flake", - "type": "github" - } - }, - "rust-flake_2": { - "inputs": { - "crane": "crane_2", - "nixpkgs": [ - "vira", - "omnix", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1741121204, - "narHash": "sha256-oMJsdsRzvO6l5oHqzXjhSe7D8ld06yAXwRPPrX/n/KI=", - "owner": "juspay", - "repo": "rust-flake", - "rev": "ea753dade9e283809d11c63082840657eb766e97", - "type": "github" - }, - "original": { - "owner": "juspay", - "repo": "rust-flake", - "type": "github" - } - }, "rust-overlay": { "inputs": { "flake-utils": "flake-utils_3", @@ -1425,51 +962,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "omnix", - "rust-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736700680, - "narHash": "sha256-9gmWIb8xsycWHEYpd2SiVIAZnUULX6Y+IMMZBcDUCQU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5d1865c0da63b4c949f383d982b6b43519946e8f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "nixpkgs": [ - "vira", - "omnix", - "rust-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736700680, - "narHash": "sha256-9gmWIb8xsycWHEYpd2SiVIAZnUULX6Y+IMMZBcDUCQU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5d1865c0da63b4c949f383d982b6b43519946e8f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "servant-event-stream": { "flake": false, "locked": { @@ -1576,36 +1068,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tabler-icons-hs": { "flake": false, "locked": { @@ -1644,40 +1106,10 @@ "type": "github" } }, - "true": { - "locked": { - "lastModified": 1657739253, - "narHash": "sha256-L9eyTL7njtPBUYmZRYFKCzQFDgua9U9oE7UwCzjZfl8=", - "owner": "boolean-option", - "repo": "true", - "rev": "6ecb49143ca31b140a5273f1575746ba93c3f698", - "type": "github" - }, - "original": { - "owner": "boolean-option", - "repo": "true", - "type": "github" - } - }, - "true_2": { - "locked": { - "lastModified": 1657739253, - "narHash": "sha256-L9eyTL7njtPBUYmZRYFKCzQFDgua9U9oE7UwCzjZfl8=", - "owner": "boolean-option", - "repo": "true", - "rev": "6ecb49143ca31b140a5273f1575746ba93c3f698", - "type": "github" - }, - "original": { - "owner": "boolean-option", - "repo": "true", - "type": "github" - } - }, "try": { "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_6" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1756813707, @@ -1719,30 +1151,28 @@ "vira": { "inputs": { "co-log-effectful": "co-log-effectful", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "fourmolu-nix": "fourmolu-nix", - "git-hooks": "git-hooks_3", + "git-hooks": "git-hooks_2", "haskell-flake": "haskell-flake_2", "htmx": "htmx", "htmx-extensions": "htmx-extensions", "nixos-unified": "nixos-unified_2", - "nixpkgs": "nixpkgs_8", - "omnix": "omnix_2", + "nixpkgs": "nixpkgs_7", "process-compose-flake": "process-compose-flake", "servant-event-stream": "servant-event-stream", "tabler-icons-hs": "tabler-icons-hs" }, "locked": { - "lastModified": 1757121168, - "narHash": "sha256-r1BxaiZ+AuFmdagdJU5xisq0J0tNuFKUfpcS1hHDuZc=", + "lastModified": 1757192130, + "narHash": "sha256-bIW3bceLbFq9XhIbixg47hPQHYjq0JfWxNXmJ4viOEU=", "owner": "juspay", "repo": "vira", - "rev": "0b3bce6ebbe1eb7ae5b37358a584ef14961f4329", + "rev": "cc2a402fc4dc0e5f1e439e03d23a9aba349b1a63", "type": "github" }, "original": { "owner": "juspay", - "ref": "om", "repo": "vira", "type": "github" } diff --git a/flake.nix b/flake.nix index 8b47e11..72d7ea6 100644 --- a/flake.nix +++ b/flake.nix @@ -23,14 +23,13 @@ nixos-vscode-server.url = "github:nix-community/nixos-vscode-server"; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - omnix.url = "github:juspay/omnix/ci-no-args"; vertex.url = "github:juspay/vertex"; vertex.inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; }; try.url = "github:tobi/try"; - vira.url = "github:juspay/vira/om"; + vira.url = "github:juspay/vira"; # Neovim nixvim.url = "github:nix-community/nixvim"; diff --git a/modules/nixos/linux/vira.nix b/modules/nixos/linux/vira.nix index ea7fbd0..38bc089 100644 --- a/modules/nixos/linux/vira.nix +++ b/modules/nixos/linux/vira.nix @@ -16,6 +16,13 @@ in https = false; # Cuz, nginx reverse proxy basePath = "/vira/"; # Cuz, nginx reverse proxy package = inputs.vira.packages.${pkgs.system}.default; + + initialState = { + repositories = { + devour-flake = "https://github.com/srid/devour-flake.git"; + mealmacro = "https://github.com/srid/mealmacro.git"; + }; + }; }; # Configure nginx reverse proxy for vira with SSL diff --git a/overlays/default.nix b/overlays/default.nix index f2e6158..2b9cfc1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -34,5 +34,5 @@ in packageOverlays // { # External overlays nuenv = (inputs.nuenv.overlays.nuenv self super).nuenv; - omnix = inputs.omnix.packages.${self.system}.default; + # omnix = inputs.omnix.packages.${self.system}.default; }