diff --git a/flake.lock b/flake.lock index bb30637..40f8d38 100644 --- a/flake.lock +++ b/flake.lock @@ -33,9 +33,7 @@ }, "clan-core": { "inputs": { - "disko": [ - "nether" - ], + "disko": "disko_2", "flake-parts": [ "nether", "flake-parts" @@ -47,26 +45,45 @@ "nether", "nixpkgs" ], - "sops-nix": [ - "nether" - ], + "sops-nix": "sops-nix", "treefmt-nix": [ "nether", "treefmt-nix" ] }, "locked": { - "lastModified": 1720610328, - "narHash": "sha256-Qa7ogWHhX9YbnOpsrNtrCd6YAUpt8lIukGtAwrO/RTc=", - "rev": "b066c3633a3f68535ef50ed590aac8f564c2fb52", + "lastModified": 1720716544, + "narHash": "sha256-SoWNPWkxRaEvTs1w//AKIdFzU2N8WikpWgL69rW0aMI=", + "rev": "0bbab9484122735a5a42412be641a1af60da2039", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/b066c3633a3f68535ef50ed590aac8f564c2fb52.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/0bbab9484122735a5a42412be641a1af60da2039.tar.gz" }, "original": { "type": "tarball", "url": "https://git.clan.lol/clan/clan-core/archive/main.tar.gz" } }, + "data-mesher": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nether", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1720823272, + "narHash": "sha256-t7ilCKq1uSvHgKHllwce0J8Ex6ISWy+lSXH8/RWWbG0=", + "rev": "a0237af5a35f57ac2c6b7b5d7bae9fe1becec7e2", + "type": "tarball", + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/a0237af5a35f57ac2c6b7b5d7bae9fe1becec7e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.clan.lol/clan/data-mesher/archive/main.tar.gz" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -74,11 +91,33 @@ ] }, "locked": { - "lastModified": 1720661479, - "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", + "lastModified": 1721007199, + "narHash": "sha256-Gof4Lj1rgTrX59bNu5b/uS/3X/marUGM7LYw31NoXEA=", "owner": "nix-community", "repo": "disko", - "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", + "rev": "bad376945de7033c7adc424c02054ea3736cf7c4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, + "disko_2": { + "inputs": { + "nixpkgs": [ + "nether", + "clan-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720056646, + "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=", + "owner": "nix-community", + "repo": "disko", + "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e", "type": "github" }, "original": { @@ -96,11 +135,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1720756997, - "narHash": "sha256-nu0kRXP1dq0KYgt0ISVOWQFauyqB6soL10q3m7G6QpA=", + "lastModified": 1721016201, + "narHash": "sha256-Jk54PIyWbdYLsi5tTQ3SFG4RWOqA5ui6+I9hjthM63o=", "owner": "rycee", "repo": "nur-expressions", - "rev": "6b0aa08643c6b403e387da201eaf4bc0e04db93a", + "rev": "41341e2fdeb70555c92ec7a4d3cd13a8498897fd", "type": "gitlab" }, "original": { @@ -146,6 +185,7 @@ "inputs": { "nixpkgs-lib": [ "nether", + "data-mesher", "nixpkgs" ] }, @@ -164,6 +204,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nether", + "nixpkgs" + ] + }, + "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-parts_3": { "inputs": { "nixpkgs-lib": [ "nixos-anywhere", @@ -184,7 +245,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "prismlauncher", @@ -317,18 +378,19 @@ "nether": { "inputs": { "clan-core": "clan-core", - "flake-parts": "flake-parts", + "data-mesher": "data-mesher", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1720644224, - "narHash": "sha256-kHkEvkQZ9jmUPObNLiTJ5YTHUXkwYJuzUyXzxeDAx2I=", + "lastModified": 1720823561, + "narHash": "sha256-zIJfEkutf5O0UNsm8UlW1jzQnOrCwUjJRyV2WNXsmgQ=", "owner": "Lassulus", "repo": "nether", - "rev": "80e31c3b270a52249c2d4250c52a6c7bd60a76bf", + "rev": "f164aa54c39f86d54b4a14c1b70874e165fcf8ea", "type": "github" }, "original": { @@ -379,20 +441,20 @@ "disko": [ "disko" ], - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixos-images": "nixos-images", "nixos-stable": "nixos-stable", "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1719852663, - "narHash": "sha256-83rF68wdvOc9iyHSIxlgk/PMoFXilIYabOxC+meamyo=", + "lastModified": 1720926282, + "narHash": "sha256-JOF4DNpKHzK7noVkh9tP+Rg9yZUyOBrEKPbdqKom5KI=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "f99d120b3788a286989db4e592a698f5d310d2f6", + "rev": "daf19effbafba2cfeac4c41e17dccdd07ca86cb3", "type": "github" }, "original": { @@ -409,11 +471,11 @@ ] }, "locked": { - "lastModified": 1720055043, - "narHash": "sha256-SKizewU4UeYrkZWPUjur8EoxscGoNb0pGcrNL4YzAIg=", + "lastModified": 1720859326, + "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "168b220231a70e47cc1f0919048fa5914415fb18", + "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", "type": "github" }, "original": { @@ -480,15 +542,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720899431, - "narHash": "sha256-ZTlK5QFCWnpWe8x/xMu8HDSC5YzXkx9znte0QeQ4rWA=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61f52fd2153d0d402dcc0d8d4708c9887fa9c9b7", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -525,11 +588,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -541,7 +604,7 @@ "prismlauncher": { "inputs": { "flake-compat": "flake-compat", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "libnbtplusplus": "libnbtplusplus", "nixpkgs": [ "nixpkgs" @@ -549,11 +612,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1720518922, - "narHash": "sha256-+p6Gse2fnAla5O8y5VJq/bDYrKG53Cm+X8PMDbs5V/M=", + "lastModified": 1720942301, + "narHash": "sha256-kimBqwoGJoj98czGAWSTApyqGfK/pUqzJyc73rMmMaA=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "5f345cedea44ec0037e684436d1bcd94e1ae5b95", + "rev": "84263cd94c7ed1e260eab0ed25ca91607039bb7e", "type": "github" }, "original": { @@ -577,7 +640,7 @@ "nixpkgs": "nixpkgs", "prismlauncher": "prismlauncher", "snm": "snm", - "sops-nix": "sops-nix", + "sops-nix": "sops-nix_2", "srvos": "srvos", "tela-icon-theme": "tela-icon-theme" } @@ -606,6 +669,32 @@ } }, "sops-nix": { + "inputs": { + "nixpkgs": [ + "nether", + "clan-core", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nether", + "clan-core" + ] + }, + "locked": { + "lastModified": 1720321395, + "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, + "sops-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -615,11 +704,11 @@ ] }, "locked": { - "lastModified": 1720479166, - "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", + "lastModified": 1720926522, + "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67035a355b1d52d2d238501f8cc1a18706979760", + "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", "type": "github" }, "original": { @@ -635,11 +724,11 @@ ] }, "locked": { - "lastModified": 1720691926, - "narHash": "sha256-VE9ZfWRbyBjps5GV8KXiF8XodAykmwRpcJtPiVWCu8M=", + "lastModified": 1721032527, + "narHash": "sha256-4hpsvyoWYRdZ4u6xDQ8uK5BhKDqHwqNQBi1R7y3n5aI=", "owner": "nix-community", "repo": "srvos", - "rev": "e3e8ff545ef14f13c69a0f743078637fde952018", + "rev": "36905a236dc466b8eff20df84314d23c95da3f6c", "type": "github" }, "original": { @@ -668,15 +757,16 @@ "inputs": { "nixpkgs": [ "nether", + "data-mesher", "nixpkgs" ] }, "locked": { - "lastModified": 1720507012, - "narHash": "sha256-QIeZ43t9IVB4dLsFaWh2f4C7JSRfK7p+Y1U9dULsLXU=", + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8b63fe8cf7892c59b3df27cbcab4d5644035d72f", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", "type": "github" }, "original": { @@ -686,6 +776,27 @@ } }, "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nether", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixos-anywhere", diff --git a/flake.nix b/flake.nix index e6291f8..ee1bf7a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # Outputs nixos-generators = {