From 8f73721cc5ec911d3098cc65d30a4d005619b843 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 16 May 2024 16:03:10 -0700 Subject: [PATCH] flake: migrate to flakehub --- flake.lock | 122 +++++++++++++++++++++-------------------------------- flake.nix | 14 +++--- shell.nix | 1 - 3 files changed, 52 insertions(+), 85 deletions(-) diff --git a/flake.lock b/flake.lock index 7a6dbb4..7878f6d 100644 --- a/flake.lock +++ b/flake.lock @@ -45,17 +45,16 @@ ] }, "locked": { - "lastModified": 1715756862, - "narHash": "sha256-cNGZK/RNvb29giR2KtnbwU5lx2Kw+wWqAaeWqfYlPts=", - "owner": "nix-community", - "repo": "disko", - "rev": "cb1d6fba694ab3887600d606106f5a044ba1712c", - "type": "github" + "lastModified": 1715070411, + "narHash": "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90=", + "rev": "4677f6c53482a8b01ee93957e3bdd569d51261d6", + "revCount": 852, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/nix-community/disko/1.6.1/018f541f-b4b9-7cfd-af90-db24c6681f31/source.tar.gz" }, "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/nix-community/disko/%2A.tar.gz" } }, "flake-compat": { @@ -112,17 +111,16 @@ }, "hardware": { "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", - "type": "github" + "lastModified": 1715881912, + "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=", + "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828", + "revCount": 1660, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixos-hardware/0.1.1660%2Brev-ff1be1e3cdf884df0935ab28745ab13c3c26d828/018f828a-4d94-77f4-a4bb-b6e7ef20596b/source.tar.gz" }, "original": { - "owner": "nixos", - "repo": "nixos-hardware", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixos-hardware/%2A.tar.gz" } }, "home-manager": { @@ -132,17 +130,16 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", - "type": "github" + "lastModified": 1702537497, + "narHash": "sha256-br4Z7OFEHWN8oOnKf40BoS6QFt1EyVLqwaVGBG7/DT8=", + "rev": "7a88cdedbda35f808ed2f329a7a811e0511870f9", + "revCount": 3192, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3192%2Brev-7a88cdedbda35f808ed2f329a7a811e0511870f9/018c6725-7e9b-7e8e-bb57-f493c0e4f7dc/source.tar.gz" }, "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/nix-community/home-manager/0.1.%2A.tar.gz" } }, "nix-colors": { @@ -164,20 +161,32 @@ "type": "github" } }, - "nixpkgs": { + "nixos-hardware": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "lastModified": 1715881912, + "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixos-hardware", + "type": "indirect" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "revCount": 626834, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.626834%2Brev-33d1e753c82ffc557b4a585c77de43d4c922ebb5/018f8037-433d-77f3-b4bb-e542e48f7fd6/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, "nixpkgs-lib": { @@ -195,22 +204,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1715458492, - "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8e47858badee5594292921c2668c11004c3b0142", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1686020360, @@ -248,33 +241,12 @@ "hardware": "hardware", "home-manager": "home-manager", "nix-colors": "nix-colors", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "vscode-server": "vscode-server" } }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1715482972, - "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", - "owner": "mic92", - "repo": "sops-nix", - "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", - "type": "github" - }, - "original": { - "owner": "mic92", - "repo": "sops-nix", - "type": "github" - } - }, "spicetify-nix": { "inputs": { "flake-utils": "flake-utils", diff --git a/flake.nix b/flake.nix index c9e2589..16e89eb 100644 --- a/flake.nix +++ b/flake.nix @@ -6,15 +6,11 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - hardware.url = "github:nixos/nixos-hardware"; - sops-nix = { - url = "github:mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz"; + hardware.url = "https://flakehub.com/f/NixOS/nixos-hardware/*.tar.gz"; home-manager = { - url = "github:nix-community/home-manager"; + url = "https://flakehub.com/f/nix-community/home-manager/0.1.*.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -24,7 +20,7 @@ }; disko = { - url = "github:nix-community/disko"; + url = "https://flakehub.com/f/nix-community/disko/*.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -40,7 +36,7 @@ home-manager, deploy-rs, disko, - vscode-server, + vscode-server, nixos-hardware, ... }@inputs: let diff --git a/shell.nix b/shell.nix index 0e36a2c..c8c3cef 100644 --- a/shell.nix +++ b/shell.nix @@ -20,7 +20,6 @@ pkgs.mkShell { git deploy-rs - sops gnupg age ];