From b34723fc80b4eff9eb5e03abba99911bce3ab421 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 19 Feb 2024 11:10:35 -0600 Subject: [PATCH] Updates for foxtrot --- flake.lock | 206 ++++----------------------------------- flake.nix | 4 +- templates/deno/flake.nix | 4 + 3 files changed, 27 insertions(+), 187 deletions(-) diff --git a/flake.lock b/flake.lock index a24f726..f47431c 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1708029101, - "narHash": "sha256-FPlAle/nl4sJRfd8eILe5M20aRJh/z2KY8ji2yBBwaI=", + "lastModified": 1708305517, + "narHash": "sha256-WYnEspeTTksC21obnnxWOGOAQbnBD0GES0S0XOLsJjs=", "owner": "nix-community", "repo": "disko", - "rev": "810eccbad22cc50323b27161033399eb87658932", + "rev": "1ae1f57dad13595600dd57b6a55fcbaef6673804", "type": "github" }, "original": { @@ -141,11 +141,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708094594, - "narHash": "sha256-vAVKC8DdyQx/XngWV95FRvE+wAtf0f9bqKm3tFipiyE=", + "lastModified": 1708348106, + "narHash": "sha256-CWmdEWqzPYYGqPJcrGJHMTXo+b4oMp/QGzKGKnvwDB0=", "owner": "helix-editor", "repo": "helix", - "rev": "76e512f9445b2a26655248b46cf13413f9a6bbba", + "rev": "cdef4f8a701f921c29fdfe66f104a2edac7fe05c", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", + "lastModified": 1708294481, + "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", "type": "github" }, "original": { @@ -176,77 +176,6 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_4", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1708018354, - "narHash": "sha256-MlbqBzAjiz4Va2M/AvLN96Wq+jsCbEedhfMs5wW1yFM=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "fbf5ba87ce57752653f3bebf6e2be090c702836e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "lexical": { "inputs": { "flake-utils": "flake-utils_2", @@ -285,29 +214,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1708105575, - "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1707956935, - "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -317,22 +230,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1708093448, - "narHash": "sha256-gohEm3/NVyu7WINFhRf83yJH8UM2ie/KY9Iw3VN6fiE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c7763249f02b7786b4ca36e13a4d7365cfba162f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "api-lyte-dev": "api-lyte-dev", @@ -340,7 +237,6 @@ "hardware": "hardware", "helix": "helix", "home-manager": "home-manager", - "hyprland": "hyprland", "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix", "ssbm": "ssbm" @@ -389,15 +285,19 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1707842202, - "narHash": "sha256-3dTBbCzHJBinwhsisGJHW1HLBsLbj91+a5ZDXt7ttW0=", + "lastModified": 1708225343, + "narHash": "sha256-Q0uVUOfumc1DcKsIJIfMCHph08MjkOvZxvPb/Vi8hWw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "48afd3264ec52bee85231a7122612e2c5202fa74", + "rev": "ffed177a9d2c685901781c3c6c9024ae0ffc252b", "type": "github" }, "original": { @@ -471,70 +371,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": "hyprlang", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9510e2e..0c6d6e1 100644 --- a/flake.nix +++ b/flake.nix @@ -19,8 +19,8 @@ hardware.url = "github:nixos/nixos-hardware"; # hardware.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "github:hyprwm/Hyprland"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; + # hyprland.url = "github:hyprwm/Hyprland"; + # hyprland.inputs.nixpkgs.follows = "nixpkgs"; api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git"; api-lyte-dev.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/templates/deno/flake.nix b/templates/deno/flake.nix index 6391206..d2d66da 100644 --- a/templates/deno/flake.nix +++ b/templates/deno/flake.nix @@ -1,5 +1,6 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs?rev=bd645e8668ec6612439a9ee7e71f7eac4099d4f6"; + outputs = { self, nixpkgs, @@ -14,6 +15,9 @@ deno-dev = pkgs.mkShell { buildInputs = with pkgs; [ deno + curl + xh + sqlite ]; };