From 7bc8e2aa3226df20b166cbd65de25257ae21302b Mon Sep 17 00:00:00 2001 From: noe Date: Sat, 6 Jan 2024 01:41:57 -0500 Subject: [PATCH] fix --- flake.lock | 125 +++++++++++++++++++++-------------------------------- flake.nix | 6 +-- 2 files changed, 52 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index 5459e88..3f7d1dd 100644 --- a/flake.lock +++ b/flake.lock @@ -159,27 +159,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704152458, - "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -202,6 +181,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -326,27 +323,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1703950681, - "narHash": "sha256-veU5bE4eLOmi7aOzhE7LfZXcSOONRMay0BKv01WHojo=", + "lastModified": 1704018918, + "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aad9113182747452dbfc68b93c86e168811fa6c", + "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1692492726, - "narHash": "sha256-rld5qm2B4oRkDwcPD+yOSyTrZQdfCR6mzJGGkecjvTs=", + "lastModified": 1703950681, + "narHash": "sha256-veU5bE4eLOmi7aOzhE7LfZXcSOONRMay0BKv01WHojo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e63e8bbc46bc4fc22254da1edaf42fc7549c18a", + "rev": "0aad9113182747452dbfc68b93c86e168811fa6c", "type": "github" }, "original": { @@ -420,57 +417,39 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1692463654, - "narHash": "sha256-F8hZmsQINI+S6UROM4jyxAMbQLtzE44pI8Nk6NtMdao=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { - "flake-parts": "flake-parts", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs-unstable" ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1704495913, - "narHash": "sha256-5IITsUF5mTv0NspboMupJGVj3CUtbCA8+NLDubtcs6g=", + "lastModified": 1703859882, + "narHash": "sha256-wRXgap0eEuswF9xXUKDiWBh0tKuJ9vtmlJZ4iAX3K/E=", "owner": "nix-community", "repo": "nixvim", - "rev": "f16f767f465c0b247449063f773575ecdcfa8310", + "rev": "1d8e7906c9606c956c6b40d8d088c8d2110dc0c0", "type": "github" }, "original": { "owner": "nix-community", "repo": "nixvim", + "rev": "1d8e7906c9606c956c6b40d8d088c8d2110dc0c0", "type": "github" } }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixpkgs" ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1703939133, @@ -497,8 +476,7 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", - "sops-nix": "sops-nix", - "sops-nix-darwin": "sops-nix-darwin" + "sops-nix": "sops-nix" } }, "rust-analyzer-src": { @@ -564,7 +542,7 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1703991717, @@ -580,26 +558,6 @@ "type": "github" } }, - "sops-nix-darwin": { - "inputs": { - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_3" - }, - "locked": { - "lastModified": 1692658736, - "narHash": "sha256-kucyW+sryHf2buyAFFWQHQMsqkYYHSvvYqr/DvwQukY=", - "owner": "Kloenk", - "repo": "sops-nix", - "rev": "c0864759e5d3f5899195fd9debaeda48e08d47d8", - "type": "github" - }, - "original": { - "owner": "Kloenk", - "ref": "darwin", - "repo": "sops-nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -629,6 +587,21 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "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", diff --git a/flake.nix b/flake.nix index b9f0369..3f31a27 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - # Home manager + # Home manageKr home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -25,12 +25,12 @@ # Secrets sops-nix.url = "github:Mic92/sops-nix"; - sops-nix-darwin.url = "github:Kloenk/sops-nix?ref=darwin"; + #sops-nix-darwin.url = "github:Kloenk/sops-nix?ref=darwin"; # Fancy stuff #nix-colors.url = "github:misterio77/nix-colors"; nixvim = { - url = "github:nix-community/nixvim"; + url = "github:nix-community/nixvim?rev=1d8e7906c9606c956c6b40d8d088c8d2110dc0c0"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; #nur.url = "github:nix-community/nur";