From 5e742c0b8bf3916d8706d1927d82e476409af711 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Thu, 27 Jul 2023 00:58:43 -0400 Subject: [PATCH] flake: introduce universe-cli --- flake.lock | 253 ++++++++++++++++++++++++++++++++++- flake.nix | 3 + modules/global/shell.nix | 2 + users/infinidoge/default.nix | 2 + 4 files changed, 259 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 6d6d377..d30ab33 100644 --- a/flake.lock +++ b/flake.lock @@ -105,6 +105,30 @@ "type": "github" } }, + "crane": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_8", + "nixpkgs": [ + "universe-cli", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1685896619, + "narHash": "sha256-6rgKAm8/GaFYOrshu+heVjUCgWTJJpzsm9YyENsYDRo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4bdf5595ae15481b4021358dc17d6c0df8eecd7f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -149,6 +173,28 @@ "type": "github" } }, + "devshell_2": { + "inputs": { + "nixpkgs": [ + "universe-cli", + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1688380630, + "narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=", + "owner": "numtide", + "repo": "devshell", + "rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "digga": { "inputs": { "darwin": [ @@ -274,6 +320,43 @@ "type": "github" } }, + "flake-compat_4": { + "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": [ + "universe-cli", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1631561581, @@ -407,6 +490,42 @@ "type": "github" } }, + "flake-utils_8": { + "inputs": { + "systems": "systems_4" + }, + "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" + } + }, + "flake-utils_9": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fork": { "locked": { "lastModified": 1689903276, @@ -714,6 +833,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": [ @@ -793,7 +928,8 @@ "private": "private", "quick-nix-registry": "quick-nix-registry", "stable": "stable", - "staging": "staging" + "staging": "staging", + "universe-cli": "universe-cli" } }, "rust-analyzer-src": { @@ -813,6 +949,52 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "universe-cli", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "universe-cli", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685759304, + "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1690252178, + "narHash": "sha256-9oEz822bvbHobfCUjJLDor2BqW3I5tycIauzDlzOALY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8d64353ca827002fb8459e44d49116c78d868eba", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stable": { "locked": { "lastModified": 1689956312, @@ -890,6 +1072,75 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "universe-cli": { + "inputs": { + "crane": "crane", + "devshell": "devshell_2", + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixos" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1690432659, + "narHash": "sha256-ZTq7tWTY0fdTctQ65ZwEFePVRzdqkqdnCvmf+dka4qs=", + "owner": "Infinidoge", + "repo": "universe-cli", + "rev": "2376afcb7e03e565f905b42446c64378bccfadae", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "universe-cli", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1659877975, diff --git a/flake.nix b/flake.nix index 9411be8..1896bfb 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,9 @@ inputs = { private.url = "git+ssh://git@github.com/Infinidoge/universe-private"; + universe-cli.url = "github:Infinidoge/universe-cli"; + universe-cli.inputs.nixpkgs.follows = "nixos"; + # --- DevOS Flake Inputs # # --- Channels --- stable.url = "github:nixos/nixpkgs/nixos-23.05"; diff --git a/modules/global/shell.nix b/modules/global/shell.nix index 49fdc34..86c87c3 100644 --- a/modules/global/shell.nix +++ b/modules/global/shell.nix @@ -9,6 +9,8 @@ in }; environment.shellAliases = { + uni = "universe-cli"; + # quick cd "..." = "cd ../.."; "...." = "cd ../../.."; diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix index a36f6bb..01b4755 100644 --- a/users/infinidoge/default.nix +++ b/users/infinidoge/default.nix @@ -47,6 +47,8 @@ in }; home.packages = with pkgs; flatten [ + inputs.universe-cli.packages.x86_64-linux.default + ncdu keepassxc