From 9657ffa66d9f6b7737d6d785b196a3d50e812f12 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Tue, 24 Jun 2025 07:43:42 -0400 Subject: [PATCH] working on refactor --- flake.lock | 57 ++++++++++++++++++++++++++++++++++++++++++------------ flake.nix | 2 +- 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index a4e8c79..ace5b99 100644 --- a/flake.lock +++ b/flake.lock @@ -139,20 +139,36 @@ "type": "github" } }, + "nix-secrets": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1750709516, + "narHash": "sha256-pxoJ93pf7OOx8UGkdYcthU8GhzjoXxrv7rIfAq+WkMU=", + "ref": "refs/heads/master", + "rev": "bc33879fdaa8031c823254d77b19301104ae2c11", + "revCount": 65, + "type": "git", + "url": "ssh://git@github.com/TheWanderingCrow/nix-secrets" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/TheWanderingCrow/nix-secrets" + } + }, "nixpkgs": { "locked": { - "lastModified": 1749237914, - "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", - "owner": "nixos", + "lastModified": 1750605355, + "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", + "rev": "3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-darwin": { @@ -219,6 +235,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1749237914, + "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1742288794, "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", @@ -234,7 +266,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1741865919, "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", @@ -291,7 +323,7 @@ "flake-utils": "flake-utils", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nmd": "nmd", "systems": "systems_2" }, @@ -311,7 +343,7 @@ }, "nvix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nvf": "nvf" }, "locked": { @@ -333,7 +365,8 @@ "disko": "disko", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", + "nix-secrets": "nix-secrets", + "nixpkgs": "nixpkgs_2", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", diff --git a/flake.nix b/flake.nix index 64f13d0..b0cfa02 100644 --- a/flake.nix +++ b/flake.nix @@ -112,7 +112,7 @@ }; # CrOS inputs - #nix-secrets.url = "github:TheWanderingCrow/nix-secrets"; + nix-secrets.url = "git+ssh://git@github.com/TheWanderingCrow/nix-secrets"; nvix.url = "github:TheWanderingCrow/nvix"; }; }