From 8fa49328205e4a96f984393388c5989bebe3923b Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Tue, 7 May 2024 10:15:44 -0500 Subject: [PATCH] drop needless inputs --- flake.lock | 38 -------------------------------------- flake.nix | 7 +------ modules/nix.nix | 8 -------- 3 files changed, 1 insertion(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 062cfc5..90fc148 100644 --- a/flake.lock +++ b/flake.lock @@ -536,26 +536,6 @@ "type": "github" } }, - "pinix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709390347, - "narHash": "sha256-C7RDQ1xPktZGf8eSDUeZ2ZKetHtM2VJA0C10z0d8tkw=", - "owner": "remi-dupre", - "repo": "pinix", - "rev": "6f7dc0fccb0e48176629d061b07576d092a5d09c", - "type": "github" - }, - "original": { - "owner": "remi-dupre", - "repo": "pinix", - "type": "github" - } - }, "root": { "inputs": { "f1multiviewer": "f1multiviewer", @@ -564,29 +544,11 @@ "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", - "pinix": "pinix", - "stable": "stable", "tsm": "tsm", "zig2nix": "zig2nix", "zls": "zls" } }, - "stable": { - "locked": { - "lastModified": 1714971268, - "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1689347949, diff --git a/flake.nix b/flake.nix index d13b9f3..b7ee17f 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - stable.url = "github:nixos/nixpkgs/nixos-23.11"; + # stable.url = "github:nixos/nixpkgs/nixos-23.11"; tsm.url = "github:daylinmorgan/tsm?dir=nix"; tsm.inputs.nixpkgs.follows = "nixpkgs"; @@ -16,9 +16,6 @@ hyprland-contrib.url = "github:hyprwm/contrib"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - pinix.url = "github:remi-dupre/pinix"; - pinix.inputs.nixpkgs.follows = "nixpkgs"; - nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -36,13 +33,11 @@ "https://hyprland.cachix.org" "https://nixpkgs-wayland.cachix.org" "https://daylin.cachix.org" - # "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=" ]; }; } diff --git a/modules/nix.nix b/modules/nix.nix index c91718a..03f8848 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -24,7 +24,6 @@ pkgs.nixd pkgs.nixfmt-rfc-style self.packages.${pkgs.system}.default - inputs.pinix.packages.${pkgs.system}.default ]; programs.nix-index-database.comma.enable = true; @@ -35,12 +34,5 @@ nix.settings = { trusted-users = [ "@wheel" ]; accept-flake-config = true; - - # substituters = [ - # "https://daylin.cachix.org" - # ]; - # trusted-public-keys = [ - # "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" - # ]; }; }