diff --git a/flake.lock b/flake.lock index 30ed5ac..9b3e8be 100644 --- a/flake.lock +++ b/flake.lock @@ -23,26 +23,6 @@ "type": "github" } }, - "bscpkgs": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749650500, - "narHash": "sha256-2MHfVPV6RA7qPSCtXh4+KK0F0UjN+J4z8//+n6NK7Xs=", - "ref": "refs/heads/master", - "rev": "9d1944c658929b6f98b3f3803fead4d1b91c4405", - "revCount": 961, - "type": "git", - "url": "https://git.sr.ht/~rodarima/bscpkgs" - }, - "original": { - "type": "git", - "url": "https://git.sr.ht/~rodarima/bscpkgs" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -105,7 +85,6 @@ "root": { "inputs": { "agenix": "agenix", - "bscpkgs": "bscpkgs", "nixpkgs": "nixpkgs" } }, diff --git a/flake.nix b/flake.nix index 3a6c85f..0bdaabe 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,13 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; - bscpkgs.url = "git+https://git.sr.ht/~rodarima/bscpkgs"; - bscpkgs.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, agenix, bscpkgs, ... }: + outputs = { self, nixpkgs, agenix, ... }: let mkConf = name: nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit nixpkgs bscpkgs agenix; theFlake = self; }; + specialArgs = { inherit nixpkgs agenix; theFlake = self; }; modules = [ "${self.outPath}/m/${name}/configuration.nix" ]; }; # For now we only support x86 @@ -38,11 +36,6 @@ in weasel = mkConf "weasel"; }; - #packages.x86_64-linux = self.nixosConfigurations.hut.pkgs // { - # bscpkgs = bscpkgs.packages.x86_64-linux; - # nixpkgs = nixpkgs.legacyPackages.x86_64-linux; - #}; - bscOverlay = import ./overlay.nix; overlays.default = self.bscOverlay; diff --git a/m/common/base/nix.nix b/m/common/base/nix.nix index 0e41b27..ed58f6e 100644 --- a/m/common/base/nix.nix +++ b/m/common/base/nix.nix @@ -1,9 +1,8 @@ -{ pkgs, nixpkgs, bscpkgs, theFlake, ... }: +{ pkgs, nixpkgs, theFlake, ... }: { nixpkgs.overlays = [ - bscpkgs.bscOverlay - (import ../../../pkgs/overlay.nix) + (import ../../../overlay.nix) ]; nixpkgs.config.allowUnfree = true;