Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Chore] Remove 'nixpkgs.overlay' from 'common' module #165

Merged
merged 1 commit into from
Sep 26, 2024
+2 −6
Merged

[Chore] Remove 'nixpkgs.overlay' from 'common' module #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/common-non-darwin.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: MPL-2.0

# configuration options that do not exist for nix-darwin
{ lib, pkgs, config, options, inputs, ... }:
{ lib, pkgs, config, options, ... }:
{
imports = [
./services/nginx.nix
Expand Down
6 changes: 1 addition & 5 deletions modules/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# SPDX-FileCopyrightText: 2020 Serokell <https://serokell.io/>
#
# SPDX-License-Identifier: MPL-2.0

{ lib, pkgs, config, options, inputs, ... }:
{ lib, pkgs, config, options, ... }:
{
imports = [
./ssh-hostkeys.nix
Expand Down Expand Up @@ -36,9 +35,6 @@
'';


nixpkgs.overlays =
[ (import ./../overlay) ];

nix.nixPath = [ "nixpkgs=/etc/nix/nixpkgs" ];

# A hack to get around Nix not recognizing a runtime dependency on nixpkgs
Expand Down