From ec418619aba4abbd66ecee5351d7656df3c63436 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 20 Jun 2023 08:27:38 -0400 Subject: [PATCH] meta: Replace crystal-flake with nixpkgs-crystalline --- flake.lock | 188 +++++------------------------------------------- flake.nix | 6 +- home/neovim.nix | 1 + src/main.nix | 5 +- 4 files changed, 22 insertions(+), 178 deletions(-) diff --git a/flake.lock b/flake.lock index 06593c2..69aea02 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "ameba-src": { - "flake": false, - "locked": { - "lastModified": 1679041484, - "narHash": "sha256-pc9mtVR/PBhM5l1PnDkm+y+McxbrfAmQzxmLi761VF4=", - "owner": "crystal-ameba", - "repo": "ameba", - "rev": "7c74d196d6d9a496a81a0c7b79ef44f39faf41b8", - "type": "github" - }, - "original": { - "owner": "crystal-ameba", - "ref": "v1.4.3", - "repo": "ameba", - "type": "github" - } - }, "base16": { "inputs": { "nixpkgs": [ @@ -38,121 +21,6 @@ "type": "github" } }, - "bdwgc-src": { - "flake": false, - "locked": { - "lastModified": 1661523039, - "narHash": "sha256-UYJQGeSykmfydGAmTlNJNyAPBasBkddOSoopBHiY7TI=", - "owner": "ivmai", - "repo": "bdwgc", - "rev": "cd1fbc1dbfd2cc888436944dd2784f39820698d7", - "type": "github" - }, - "original": { - "owner": "ivmai", - "ref": "v8.2.2", - "repo": "bdwgc", - "type": "github" - } - }, - "crystal-aarch64-darwin": { - "flake": false, - "locked": { - "narHash": "sha256-NqYaZHM3kHAgYbO0RDJtA8eHqp4vVe4MBpisTOGrRVw=", - "type": "tarball", - "url": "https://github.com/crystal-lang/crystal/releases/download/1.8.1/crystal-1.8.1-1-darwin-universal.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/crystal-lang/crystal/releases/download/1.8.1/crystal-1.8.1-1-darwin-universal.tar.gz" - } - }, - "crystal-flake": { - "inputs": { - "ameba-src": "ameba-src", - "bdwgc-src": "bdwgc-src", - "crystal-aarch64-darwin": "crystal-aarch64-darwin", - "crystal-src": "crystal-src", - "crystal-x86_64-darwin": "crystal-x86_64-darwin", - "crystal-x86_64-linux": "crystal-x86_64-linux", - "crystalline-src": "crystalline-src", - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683429373, - "narHash": "sha256-Mx5lwMyk2T40wFqOoYcJLs4srwO2UrsepTZhlHNuTrI=", - "owner": "manveru", - "repo": "crystal-flake", - "rev": "e7a443c20e2be6e5dd870586705dd27c91aa9c5c", - "type": "github" - }, - "original": { - "owner": "manveru", - "repo": "crystal-flake", - "type": "github" - } - }, - "crystal-src": { - "flake": false, - "locked": { - "lastModified": 1681995387, - "narHash": "sha256-t+1vM1m62UftCvfa90Dg6nqt6Zseh/GP/Gc1VfOa4+c=", - "owner": "crystal-lang", - "repo": "crystal", - "rev": "a59a3dbd738269d5aad6051c3834fc70f482f469", - "type": "github" - }, - "original": { - "owner": "crystal-lang", - "ref": "1.8.1", - "repo": "crystal", - "type": "github" - } - }, - "crystal-x86_64-darwin": { - "flake": false, - "locked": { - "narHash": "sha256-NqYaZHM3kHAgYbO0RDJtA8eHqp4vVe4MBpisTOGrRVw=", - "type": "tarball", - "url": "https://github.com/crystal-lang/crystal/releases/download/1.8.1/crystal-1.8.1-1-darwin-universal.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/crystal-lang/crystal/releases/download/1.8.1/crystal-1.8.1-1-darwin-universal.tar.gz" - } - }, - "crystal-x86_64-linux": { - "flake": false, - "locked": { - "narHash": "sha256-/Jk3uiglM/hzjygxmMUgVTvz+tuFFjBv8+uUIL05rXo=", - "type": "tarball", - "url": "https://github.com/crystal-lang/crystal/releases/download/1.8.1/crystal-1.8.1-1-linux-x86_64.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/crystal-lang/crystal/releases/download/1.8.1/crystal-1.8.1-1-linux-x86_64.tar.gz" - } - }, - "crystalline-src": { - "flake": false, - "locked": { - "lastModified": 1681549124, - "narHash": "sha256-kx3rdGqIbrOaHY7V3uXLqIFEYzzsMKzNwZ6Neq8zM3c=", - "owner": "elbywan", - "repo": "crystalline", - "rev": "4ac0ae282c5f4172230fea1e93df51c2b380f475", - "type": "github" - }, - "original": { - "owner": "elbywan", - "ref": "v0.9.0", - "repo": "crystalline", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -173,24 +41,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, - "locked": { - "lastModified": 1672152762, - "narHash": "sha256-U8iWWHgabN07zfbgedogMVWrEP1Zywyf3Yx3OYHSSgE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "19e0f88324d90509141e192664ded98bb88ef9b2", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, "locked": { "lastModified": 1685662779, "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", @@ -248,7 +98,7 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": "nixpkgs" }, "locked": { @@ -281,6 +131,22 @@ "type": "github" } }, + "nixpkgs-crystalline": { + "locked": { + "lastModified": 1687263500, + "narHash": "sha256-wjYgYqOpDV3+bcpq/eLXtfEdo4IeKsKxAGeSBJw521U=", + "owner": "donovanglover", + "repo": "nixpkgs", + "rev": "5fc6d1bdb9202839a01e86d944b8ff6f37f002f9", + "type": "github" + }, + "original": { + "owner": "donovanglover", + "ref": "crystalline", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-hyprland-autoname-workspaces": { "locked": { "lastModified": 1687166409, @@ -298,24 +164,6 @@ } }, "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1671359686, - "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1685564631, @@ -367,11 +215,11 @@ }, "root": { "inputs": { - "crystal-flake": "crystal-flake", "home-manager": "home-manager", "hypr-contrib": "hypr-contrib", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_2", + "nixpkgs-crystalline": "nixpkgs-crystalline", "nixpkgs-hyprland-autoname-workspaces": "nixpkgs-hyprland-autoname-workspaces", "nixpkgs-srb2": "nixpkgs-srb2", "stylix": "stylix" diff --git a/flake.nix b/flake.nix index c6e0c3e..7d79842 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-hyprland-autoname-workspaces.url = "github:donovanglover/nixpkgs/hyprland-autoname-workspaces"; nixpkgs-srb2.url = "github:donovanglover/nixpkgs/srb2"; + nixpkgs-crystalline.url = "github:donovanglover/nixpkgs/crystalline"; home-manager = { url = "github:nix-community/home-manager/master"; @@ -37,10 +38,5 @@ }; nix-gaming.url = "github:fufexan/nix-gaming"; - - crystal-flake = { - url = "github:manveru/crystal-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; } diff --git a/home/neovim.nix b/home/neovim.nix index 2ec7280..34be5e5 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -30,6 +30,7 @@ in nixfmt # crystal + crystal shards # node/yarn/deno diff --git a/src/main.nix b/src/main.nix index 9ec0c43..328c200 100644 --- a/src/main.nix +++ b/src/main.nix @@ -2,9 +2,9 @@ , lib , hypr-contrib , nix-gaming -, crystal-flake , nixpkgs-hyprland-autoname-workspaces , nixpkgs-srb2 +, nixpkgs-crystalline , ... }: @@ -31,8 +31,6 @@ let VARIABLES = import ./variables.nix; in { environment.systemPackages = with pkgs; [ hypr-contrib.packages."${VARIABLES.system}".grimblast nix-gaming.packages."${VARIABLES.system}".osu-stable - crystal-flake.packages.${VARIABLES.system}.crystal - crystal-flake.packages.${VARIABLES.system}.crystalline waycorner slade typespeed @@ -109,6 +107,7 @@ let VARIABLES = import ./variables.nix; in { greetd.tuigreet nixpkgs-hyprland-autoname-workspaces.legacyPackages.${VARIABLES.system}.hyprland-autoname-workspaces nixpkgs-srb2.legacyPackages.${VARIABLES.system}.srb2 + nixpkgs-crystalline.legacyPackages.${VARIABLES.system}.crystalline ]; nixpkgs.config.allowUnfreePredicate = pkg: