From 9e3c15eecff2b0c48ebe97aac4d65e7a00c41875 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 26 Apr 2024 11:14:21 -0500 Subject: [PATCH] remove inputs comments --- flake.lock | 19 +++---------------- flake.nix | 10 +++------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index aa59f6e..1ec151e 100644 --- a/flake.lock +++ b/flake.lock @@ -535,21 +535,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1706063522, - "narHash": "sha256-o1m9en7ovSjyktXgX3n/6GJEwG06WYa/9Mfx5hTTf5g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95c1439b205d507f3cb88aae76e02cd6a01ac504", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "pinix": { "inputs": { "nixpkgs": [ @@ -781,7 +766,9 @@ "zig2nix": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1713576181, diff --git a/flake.nix b/flake.nix index 9986621..56eebc0 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,8 @@ tsm.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland/main"; - # hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland-contrib.url = "github:hyprwm/contrib"; - # hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - # nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs"; pinix.url = "github:remi-dupre/pinix"; pinix.inputs.nixpkgs.follows = "nixpkgs"; @@ -24,13 +21,12 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; zig2nix.url = "github:Cloudef/zig2nix"; - # zig2nix.inputs.nixpkgs.follows = "nixpkgs"; + zig2nix.inputs.nixpkgs.follows = "nixpkgs"; zls.url = "github:zigtools/zls"; zls.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; - # f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; }; nixConfig = { @@ -38,13 +34,13 @@ "https://hyprland.cachix.org" "https://nixpkgs-wayland.cachix.org" "https://daylin.cachix.org" - "https://cache.garnix.io" + # "https://cache.garnix.io" ]; extra-trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + # "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; }; }