From 2b440bbde3bd51d6a1529e0aead1fe39b3f3be9d Mon Sep 17 00:00:00 2001 From: oddlama Date: Fri, 9 Dec 2022 16:38:56 +0100 Subject: [PATCH] fix: use legacyPackages, now compiling fine --- core/default.nix | 1 - core/nix.nix | 2 +- flake.nix | 2 +- hosts/nom/default.nix | 2 +- nix/home-manager.nix | 6 +----- users/oddlama/default.nix | 8 +------- 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/core/default.nix b/core/default.nix index 81fb003..bf72111 100644 --- a/core/default.nix +++ b/core/default.nix @@ -1,5 +1,4 @@ { - config, lib, pkgs, ... diff --git a/core/nix.nix b/core/nix.nix index 21be458..d1e9b96 100644 --- a/core/nix.nix +++ b/core/nix.nix @@ -25,6 +25,6 @@ flake-registry = /etc/nix/registry.json ''; optimise.automatic = true; - gc.automatic = true; + gc.automatic = true; }; } diff --git a/flake.nix b/flake.nix index 23eb18e..bf85dd7 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ checks = import ./nix/checks.nix inputs localSystem; devShells.default = import ./nix/dev-shell.nix inputs localSystem; - packages = + legacyPackages = { default = self.packages.${localSystem}.all; } diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix index 89fca56..7ac2c7a 100644 --- a/hosts/nom/default.nix +++ b/hosts/nom/default.nix @@ -52,7 +52,7 @@ hardware = { enableRedistributableFirmware = true; enableAllFirmware = true; - video.hidpi.enable = lib.mkDefault true; + video.hidpi.enable = true; opengl.enable = true; }; diff --git a/nix/home-manager.nix b/nix/home-manager.nix index cf3c1b6..17d8a3c 100644 --- a/nix/home-manager.nix +++ b/nix/home-manager.nix @@ -8,11 +8,7 @@ inherit (nixpkgs) lib; hosts = (import ./hosts.nix).homeManager.all; - genModules = hostName: {homeDirectory, ...}: { - config, - pkgs, - ... - }: { + genModules = hostName: {homeDirectory, ...}: {config, ...}: { imports = [(../hosts + "/${hostName}")]; nix.registry = { nixpkgs.flake = nixpkgs; diff --git a/users/oddlama/default.nix b/users/oddlama/default.nix index 7c17b43..e36b4da 100644 --- a/users/oddlama/default.nix +++ b/users/oddlama/default.nix @@ -1,9 +1,3 @@ -{ - config, - impermanence, - lib, - pkgs, - ... -}: +{lib, ...}: with lib; { }