diff --git a/flake.lock b/flake.lock index e933451..00a2c21 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "aagl-gtk": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716664326, - "narHash": "sha256-L7MeDg9Q6Si2Rwxe++BoNdldX9Os/DzqoqGDJod0qyk=", - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "rev": "347a50c615c45b3c89c41e774736861b7b41cf71", - "type": "github" - }, - "original": { - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "type": "github" - } - }, "blobs": { "flake": false, "locked": { @@ -39,7 +18,7 @@ }, "cargo2nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" @@ -102,11 +81,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -118,11 +97,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -163,22 +142,6 @@ "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": "nixpkgs-lib" @@ -521,7 +484,7 @@ "mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -783,7 +746,7 @@ }, "nvim-overlay": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", @@ -806,7 +769,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "gitignore": "gitignore", "nixpkgs": [ "nvim-overlay", @@ -833,7 +796,6 @@ }, "root": { "inputs": { - "aagl-gtk": "aagl-gtk", "emacs-overlay": "emacs-overlay", "filehost": "filehost", "flake-parts": "flake-parts", diff --git a/flake.nix b/flake.nix index a30f53a..1f0ba60 100644 --- a/flake.nix +++ b/flake.nix @@ -37,10 +37,6 @@ url = github:hyprwm/contrib; #inputs.nixpkgs.follows = "nixpkgs"; }; - aagl-gtk = { - url = github:ezKEa/aagl-gtk-on-nix; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = inputs@{ self, ... }: @@ -63,6 +59,9 @@ formatter ]; }; + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + }; }; }; } diff --git a/hosts/nix.nix b/hosts/nix.nix index db6694e..976e614 100644 --- a/hosts/nix.nix +++ b/hosts/nix.nix @@ -1,10 +1,8 @@ -{ config, pkgs, self, ... }: +{ self, ... }: { nixpkgs = { config = { - allowUnfree = true; allowBroken = true; - allowInsecure = true; }; overlays = [ self.overlays.default diff --git a/pkgs/default.nix b/pkgs/default.nix index 5002530..ed9d049 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,4 +5,8 @@ default = packages; }; }; + + perSystem = { pkgs, ... }: { + packages = self.overlays.default null pkgs; + }; }