From 27b953275cf478290238952c04c2ca791162d2cf Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 13 Oct 2022 21:32:47 -0600 Subject: [PATCH] bins: only install rage on systems with gui enabled --- bins/default.nix | 5 +---- gui/default.nix | 12 ++++++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bins/default.nix b/bins/default.nix index ee6cd69..ca5bcc3 100644 --- a/bins/default.nix +++ b/bins/default.nix @@ -1,11 +1,8 @@ { pkgs, lib, isUnstable, ... }: let ix = pkgs.writeScriptBin "ix" (import ./ix.nix { inherit (pkgs) perl; }); - rage = pkgs.writeScriptBin "rage" (import ./rage.nix { inherit pkgs; }); sfetch = pkgs.writeScriptBin "sfetch" (import ./sfetch.nix { inherit (pkgs) minisign curl; }); checkRestart = pkgs.writeScriptBin "check-restart" (import ./check-restart.nix { inherit (pkgs) perl; }); -in { - environment.systemPackages = with pkgs; [ rage ix sfetch xclip checkRestart ]; -} +in { environment.systemPackages = with pkgs; [ ix sfetch xclip checkRestart ]; } diff --git a/gui/default.nix b/gui/default.nix index 668cd7c..548c416 100644 --- a/gui/default.nix +++ b/gui/default.nix @@ -1,5 +1,7 @@ { config, lib, pkgs, ... }: -with lib; { +let + rage = pkgs.writeScriptBin "rage" (import ../bins/rage.nix { inherit pkgs; }); +in with lib; { imports = [ ./gnome.nix ./kde.nix ./xfce.nix ./arcan.nix ]; options = { @@ -40,7 +42,13 @@ with lib; { sound.enable = true; security.rtkit.enable = true; - environment.systemPackages = with pkgs; [ brave go-font vlc pcsctools ]; + environment.systemPackages = with pkgs; [ + brave + go-font + vlc + pcsctools + rage + ]; programs = { firejail = {