From 389faad342b94d547321ae5b07ebcf16dd98e544 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 7 Nov 2024 14:53:44 -0600 Subject: [PATCH] rearrange flake.nix --- flake.lock | 228 +---------------------------------------------------- flake.nix | 42 +++++----- 2 files changed, 27 insertions(+), 243 deletions(-) diff --git a/flake.lock b/flake.lock index 008f2df..c940ede 100644 --- a/flake.lock +++ b/flake.lock @@ -120,38 +120,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -246,60 +214,6 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -361,27 +275,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -714,27 +607,6 @@ "type": "github" } }, - "nim2nix_4": { - "inputs": { - "nixpkgs": [ - "utils", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725469705, - "narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=", - "owner": "daylinmorgan", - "repo": "nim2nix", - "rev": "42af12ca45025c7146bc24e27f5d8b65b003d663", - "type": "github" - }, - "original": { - "owner": "daylinmorgan", - "repo": "nim2nix", - "type": "github" - } - }, "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts", @@ -798,31 +670,6 @@ "type": "github" } }, - "nixgl": { - "inputs": { - "flake-utils": [ - "roc", - "flake-utils" - ], - "nixpkgs": [ - "roc", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713543440, - "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", - "owner": "guibou", - "repo": "nixGL", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", - "type": "github" - }, - "original": { - "owner": "guibou", - "repo": "nixGL", - "type": "github" - } - }, "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", @@ -1108,33 +955,9 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", "pixi": "pixi", - "roc": "roc", "stable": "stable", "tsm": "tsm", - "utils": "utils", - "zig-overlay": "zig-overlay", - "zls": "zls" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "roc", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727490462, - "narHash": "sha256-OrrPiNBiikv9BR464XTT75FzOq7tKAvMbMi7YOKVIeg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "11a13e50debafae4ae802f1d6b8585101516dd93", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "utils": "utils" } }, "stable": { @@ -1228,51 +1051,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1320,7 +1098,9 @@ }, "utils": { "inputs": { - "nim2nix": "nim2nix_4", + "nim2nix": [ + "nim2nix" + ], "nixpkgs": "nixpkgs_8" }, "locked": { diff --git a/flake.nix b/flake.nix index 2b9ac33..28cdd2e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,9 @@ nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; lix = { url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; @@ -21,7 +23,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.lix.follows = "lix"; }; - # keep for when lix breaks :/ # lix-module = { # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; @@ -38,30 +39,33 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland-contrib.url = "github:hyprwm/contrib"; - roc.url = "github:roc-lang/roc"; - zig-overlay.url = "github:mitchellh/zig-overlay"; - zls.url = "github:zigtools/zls"; - nim2nix.url = "github:daylinmorgan/nim2nix"; - pixi.url = "github:daylinmorgan/pixi-flake"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; - tsm.url = "github:daylinmorgan/tsm?dir=nix"; - hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; - utils.url = "git+https://git.dayl.in/daylin/utils.git"; - - nim2nix.inputs.nixpkgs.follows = "nixpkgs"; - hyprman.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - pixi.inputs.nixpkgs.follows = "nixpkgs"; - roc.inputs.nixpkgs.follows = "nixpkgs"; + tsm.url = "github:daylinmorgan/tsm?dir=nix"; tsm.inputs.nixpkgs.follows = "nixpkgs"; - zls.inputs.nixpkgs.follows = "nixpkgs"; - zls.inputs.zig-overlay.follows = "zig-overlay"; - zig-overlay.inputs.nixpkgs.follows = "nixpkgs"; + hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; + hyprman.inputs.nixpkgs.follows = "nixpkgs"; + utils.url = "git+https://git.dayl.in/daylin/utils.git"; + utils.inputs.nim2nix.follows = "nim2nix"; + nim2nix.url = "github:daylinmorgan/nim2nix"; + nim2nix.inputs.nixpkgs.follows = "nixpkgs"; + pixi.url = "github:daylinmorgan/pixi-flake"; + pixi.inputs.nixpkgs.follows = "nixpkgs"; + + # roc = { + # url = "github:roc-lang/roc"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + + # zig-overlay.url = "github:mitchellh/zig-overlay"; + # zig-overlay.inputs.nixpkgs.follows = "nixpkgs"; + # zls.url = "github:zigtools/zls"; + # zls.inputs.nixpkgs.follows = "nixpkgs"; + # zls.inputs.zig-overlay.follows = "zig-overlay"; + }; nixConfig = {