From 4243269b05e0c6fe4443c9b026191c7d2c62127c Mon Sep 17 00:00:00 2001 From: reo101 Date: Sun, 21 Jan 2024 23:46:27 +0200 Subject: [PATCH] feat(flake)!: add `jovian-nixos` Currently not used (yet) Also update `flake.lock` --- flake.lock | 303 +++++++++++++++++++++++++++++++++++------------------ flake.nix | 5 + 2 files changed, 204 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index 546f18b..7aa2bdc 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1696078264, - "narHash": "sha256-NF5G9CHaVWDD6DY0TP8z0cx30dAL1ciFYcVidVvb+NA=", + "lastModified": 1705278709, + "narHash": "sha256-CNJSc6tp12UZKAprviztJ509yAblteK4GiWwKewWEPQ=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "e529da8197f024c0069c4fde6237505e305b8d0a", + "rev": "e02a57e08224422934974f19853d4d70ed7eaaaa", "type": "github" }, "original": { @@ -50,28 +50,6 @@ "type": "github" } }, - "alejandra": { - "inputs": { - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "wired", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1652974241, - "narHash": "sha256-0AolxQtKj3Oek0WSbODDpPVO5Ih8PXHOA3qXEKPB4dQ=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "0be1462419fc73270a5dc0f84f8092603890b029", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, "base16-schemes": { "flake": false, "locked": { @@ -142,11 +120,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1703087360, - "narHash": "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M=", + "lastModified": 1704875591, + "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", "owner": "serokell", "repo": "deploy-rs", - "rev": "b709d63debafce9f5645a5ba550c9e0983b3d1f7", + "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", "type": "github" }, "original": { @@ -184,11 +162,11 @@ ] }, "locked": { - "lastModified": 1704741201, - "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=", + "lastModified": 1705540973, + "narHash": "sha256-kNt/qAEy7ueV7NKbVc8YMHWiQAAgrir02MROYNI8fV0=", "owner": "nix-community", "repo": "disko", - "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54", + "rev": "0033adc6e3f1ed076f3ed1c637ef1dfe6bef6733", "type": "github" }, "original": { @@ -317,11 +295,11 @@ ] }, "locked": { - "lastModified": 1704152458, - "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -338,11 +316,11 @@ ] }, "locked": { - "lastModified": 1704152458, - "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -372,6 +350,24 @@ "type": "indirect" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_3" @@ -462,6 +458,24 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_9" + }, + "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" + } + }, + "flake-utils_7": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -476,9 +490,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_8": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1701680307, @@ -494,22 +508,6 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -555,11 +553,11 @@ }, "hardware": { "locked": { - "lastModified": 1704632650, - "narHash": "sha256-83J/nd/NoLqo3vj0S0Ppqe8L+ijIFiGL6HNDfCCUD/Q=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c478b3d56969006e015e55aaece4931f3600c1b2", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -597,11 +595,11 @@ ] }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1705823474, + "narHash": "sha256-2C4uRe9/U3QwSPC4dYKM1/njgCQk0Mltezy4VcjAqa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "928f2528f9ee952ba0a47bbb1ece8d93ed66e784", "type": "github" }, "original": { @@ -626,6 +624,27 @@ "type": "github" } }, + "jovian-nixos": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705667791, + "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "langref": { "flake": false, "locked": { @@ -682,11 +701,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1704648325, - "narHash": "sha256-8DxfLibKTkbPc/ct9eApn+ET7dbY3Z2Du46U0KK0zL4=", + "lastModified": 1705697470, + "narHash": "sha256-Htn7xl9hjkDB+A8x0Y6/okwEUgCwKaKJFk4QNcXHN5k=", "owner": "neovim", "repo": "neovim", - "rev": "367e52cc79a786bbee4456b30f9ec5db7e28d6a5", + "rev": "d3a8e9217f39c59dd7762bd22a76b8bd03ca85ff", "type": "github" }, "original": { @@ -707,11 +726,11 @@ ] }, "locked": { - "lastModified": 1704672222, - "narHash": "sha256-GkwxrG62hqDXLAdW17bulA6ckI8JuVuwythPqOiMoHs=", + "lastModified": 1705709061, + "narHash": "sha256-Ai6ZAztEf310lxq93JWDzBKQfBlBZnGoHqAJYMV8W+M=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "688360dd650feff8fef1d5a539eede840ec07d14", + "rev": "664ff2a12e3f733dc1db467bd8b905438440f924", "type": "github" }, "original": { @@ -746,11 +765,11 @@ ] }, "locked": { - "lastModified": 1704277720, - "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", + "lastModified": 1705833550, + "narHash": "sha256-CyzbM1mw5xUG4rV5G6FIRM44EvdOgRdWR3joqswyuIU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", + "rev": "91c19ab206b4b8af72f3f34a947969964ad45908", "type": "github" }, "original": { @@ -798,6 +817,28 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "jovian-nixos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-monitored": { "inputs": { "nix-filter": "nix-filter", @@ -889,6 +930,24 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1685801374, @@ -923,11 +982,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704538339, - "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "lastModified": 1705677747, + "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "type": "github" }, "original": { @@ -969,6 +1028,22 @@ "type": "github" } }, + "nixpkgs_6": { + "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" + } + }, "nmd": { "flake": false, "locked": { @@ -1019,11 +1094,11 @@ }, "nur": { "locked": { - "lastModified": 1704743097, - "narHash": "sha256-LIvOz3JEuFE0t0PAl6G2Fx5VGu3gbsTkB9YVrqaUg2c=", + "lastModified": 1705866890, + "narHash": "sha256-P4G6ugVWFY8NUYIfSST9/jCqk635+2+STlUpKMAjfE0=", "owner": "nix-community", "repo": "NUR", - "rev": "f53bd4e7be4a0511d74f4c9b977eda365af5cce2", + "rev": "43740fb42099d9814c6d290c15722feedc2f9ce1", "type": "github" }, "original": { @@ -1095,6 +1170,7 @@ "hardware": "hardware", "home-manager": "home-manager", "impermanence": "impermanence", + "jovian-nixos": "jovian-nixos", "lib-net": "lib-net", "mac-app-util": "mac-app-util", "neovim-nightly-overlay": "neovim-nightly-overlay", @@ -1136,6 +1212,25 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1705112162, + "narHash": "sha256-IAM0+Uijh/fwlfoeDrOwau9MxcZW3zeDoUHc6Z3xfqM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9e0af26ffe52bf955ad5575888f093e41fba0104", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "spicetify-nix": { "inputs": { "flake-utils": "flake-utils_5", @@ -1170,6 +1265,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1308,35 +1418,20 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wired": { "inputs": { - "alejandra": "alejandra", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1699064982, - "narHash": "sha256-BAKfy2O0Df1JdNWn2rPsrjbIyOdGjJZeGxXZkvMZzvU=", + "lastModified": 1705487953, + "narHash": "sha256-6oh1H7/74v57m3AtK8jQLvN9LtKqyeT862krjJasOJs=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "9f2e1420e122030953734f795eaf8cf000002abd", + "rev": "fe0f02af93b09e5fe689c948a557e466b99d9a58", "type": "github" }, "original": { @@ -1348,17 +1443,17 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1704673465, - "narHash": "sha256-zyyXoMvXs2/OeaafyEtw0DbrJSPwx890+qX+EZQzGM4=", + "lastModified": 1705838875, + "narHash": "sha256-ROzgF6NGfVzYc1P363ysF959pCxmy8YGV5xSUTieQ/M=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "5cf2374c87cbe48139d1571360dcd7dd4807ef1c", + "rev": "74331844605b29ddb1109e1482d784806adbd6a5", "type": "github" }, "original": { @@ -1369,7 +1464,7 @@ }, "zls-overlay": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "gitignore": "gitignore_2", "langref": "langref", "nixpkgs": [ @@ -1380,11 +1475,11 @@ ] }, "locked": { - "lastModified": 1704507479, - "narHash": "sha256-JmZjIkVDQv0L7FZE8F3DXb7QcEp7JKthE+WYn7YlmRU=", + "lastModified": 1705613169, + "narHash": "sha256-K+csoJmze28Mp0+T8sx0MoFwRmIJa+GICP+wNyuYmmQ=", "owner": "zigtools", "repo": "zls", - "rev": "3471da593bc9d979c73b35c516e902c06781310b", + "rev": "a8a83b6ad21e382c49474e8a9ffe35a3e510de3c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c3bcc5c..43ed595 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + jovian-nixos = { + url = "github:Jovian-Experiments/Jovian-NixOS"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs";