From c076c756e6cb847418b2aca3fd730ebfe7f11a55 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 30 Jul 2023 22:53:42 +0100
Subject: [PATCH] refactor(nixos): remove unused overlay
---
system/nixos/nixedo/configuration.nix | 10 ++++++----
system/shared/nixpkgs.nix | 5 -----
system/shared/overlays.nix | 1 -
3 files changed, 6 insertions(+), 10 deletions(-)
delete mode 100644 system/shared/nixpkgs.nix
delete mode 100644 system/shared/overlays.nix
diff --git a/system/nixos/nixedo/configuration.nix b/system/nixos/nixedo/configuration.nix
index 91d69335..36e5e8a5 100644
--- a/system/nixos/nixedo/configuration.nix
+++ b/system/nixos/nixedo/configuration.nix
@@ -5,8 +5,6 @@
{ config, lib, pkgs, ... }:
let
- nixpkgs = import ../../shared/nixpkgs.nix { };
-
configure-gtk = pkgs.writeTextFile {
name = "configure-gtk";
destination = "/bin/configure-gtk";
@@ -24,13 +22,17 @@ let
};
in
{
- nixpkgs = nixpkgs;
-
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
+ nixpkgs = {
+ config = {
+ allowUnfree = true;
+ };
+ };
+
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
diff --git a/system/shared/nixpkgs.nix b/system/shared/nixpkgs.nix
deleted file mode 100644
index a39e65de..00000000
--- a/system/shared/nixpkgs.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{}: {
- config = { allowUnfree = true; };
-
- overlays = [ (import ./overlays.nix) ];
-}
diff --git a/system/shared/overlays.nix b/system/shared/overlays.nix
deleted file mode 100644
index ddb4f237..00000000
--- a/system/shared/overlays.nix
+++ /dev/null
@@ -1 +0,0 @@
-self: super: { }