From c6e3513a5dd2d72ad8ee764f3c68cdc7b4800b8c Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 22 Jun 2023 12:07:51 -0400 Subject: [PATCH] meta: Use packages module May or may not separate or split this later. --- default.nix | 1 - modules/default.nix | 1 + src/main.nix => modules/packages.nix | 11 ++++++----- 3 files changed, 7 insertions(+), 6 deletions(-) rename src/main.nix => modules/packages.nix (88%) diff --git a/default.nix b/default.nix index fd878303..e66b83ac 100644 --- a/default.nix +++ b/default.nix @@ -10,6 +10,5 @@ ./modules ./overlays ./specializations - ./src/main.nix ]; } diff --git a/modules/default.nix b/modules/default.nix index e3344717..2015b93d 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -15,6 +15,7 @@ ./neovim.nix ./networking.nix ./nix.nix + ./packages.nix ./piper.nix ./pipewire.nix ./resolved.nix diff --git a/src/main.nix b/modules/packages.nix similarity index 88% rename from src/main.nix rename to modules/packages.nix index bcf22522..b4a9e7a5 100644 --- a/src/main.nix +++ b/modules/packages.nix @@ -1,4 +1,6 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, ... }: + +{ environment.systemPackages = with pkgs; [ grimblast waycorner @@ -82,10 +84,9 @@ go-thumbnailer ]; - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "osu-lazer-bin" - ]; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "osu-lazer-bin" + ]; environment.defaultPackages = [ ]; }