From 0bdd97a80b0f9a25011e88625f8f3008bc3c809a Mon Sep 17 00:00:00 2001 From: h7x4 Date: Wed, 4 Jun 2025 12:10:34 +0200 Subject: [PATCH] home/breakerbox: add more program breakers --- home/breakerbox.nix | 36 ++++++++++++++++++++---------- home/programs/alacritty.nix | 1 - home/programs/emacs/default.nix | 8 ++++--- home/programs/feh.nix | 6 ++--- home/programs/firefox.nix | 1 - home/programs/mpv.nix | 2 -- home/programs/ncmpcpp.nix | 1 - home/programs/newsboat/default.nix | 2 -- home/programs/obs-studio.nix | 6 ++--- home/programs/prism-launcher.nix | 2 -- home/programs/qutebrowser.nix | 1 - home/programs/rofi/default.nix | 2 -- home/programs/taskwarrior.nix | 8 ++++--- 13 files changed, 40 insertions(+), 36 deletions(-) diff --git a/home/breakerbox.nix b/home/breakerbox.nix index 61d89af..925e413 100644 --- a/home/breakerbox.nix +++ b/home/breakerbox.nix @@ -7,6 +7,7 @@ in imports = [ ./programs/nix.nix + ./programs/alacritty.nix ./programs/aria2.nix ./programs/atuin.nix ./programs/bash.nix @@ -16,7 +17,10 @@ in ./programs/cargo.nix # ./programs/comma.nix ./programs/direnv + ./programs/emacs ./programs/eza.nix + ./programs/feh.nix + ./programs/firefox.nix ./programs/fzf.nix ./programs/gdb.nix ./programs/gh-dash.nix @@ -27,15 +31,23 @@ in ./programs/jq.nix ./programs/less.nix ./programs/man.nix + ./programs/mpv.nix + ./programs/ncmpcpp.nix ./programs/neovim + ./programs/newsboat ./programs/nix-index ./programs/nushell.nix + ./programs/obs-studio.nix ./programs/pandoc.nix + ./programs/prism-launcher.nix ./programs/python.nix + ./programs/qutebrowser.nix ./programs/ripgrep.nix + ./programs/rofi ./programs/skim.nix ./programs/sqlite.nix ./programs/ssh + ./programs/taskwarrior.nix ./programs/tealdeer ./programs/texlive.nix ./programs/thunderbird.nix @@ -51,18 +63,6 @@ in ] ++ (optionals graphics [ ./config/gtk.nix - ./programs/alacritty.nix - ./programs/emacs - ./programs/feh.nix - ./programs/firefox.nix - ./programs/mpv.nix - ./programs/ncmpcpp.nix - ./programs/newsboat - ./programs/obs-studio.nix - ./programs/prism-launcher.nix - ./programs/qutebrowser.nix - ./programs/rofi - ./programs/taskwarrior.nix ./programs/vscode ./programs/zathura.nix ./programs/zed @@ -132,5 +132,17 @@ in services.pueue.enable = true; + programs.alacritty.enable = graphics; + programs.emacs.enable = graphics; + programs.feh.enable = graphics; + programs.firefox.enable = graphics; + programs.mpv.enable = graphics; + programs.ncmpcpp.enable = graphics; + programs.newsboat.enable = graphics; + programs.obs-studio.enable = graphics; + programs.prism-launcher.enable = graphics; + programs.qutebrowser.enable = graphics; + programs.rofi.enable = graphics; + programs.taskwarrior.enable = graphics; programs.thunderbird.enable = graphics; } diff --git a/home/programs/alacritty.nix b/home/programs/alacritty.nix index 476d06a..50c5326 100644 --- a/home/programs/alacritty.nix +++ b/home/programs/alacritty.nix @@ -1,7 +1,6 @@ { pkgs, lib, config, ... }: { programs.alacritty = { - enable = true; settings = { window = { padding = { x = 15; y = 15; }; diff --git a/home/programs/emacs/default.nix b/home/programs/emacs/default.nix index 9d28ce9..532247f 100644 --- a/home/programs/emacs/default.nix +++ b/home/programs/emacs/default.nix @@ -1,4 +1,6 @@ -{ pkgs, ... }: let +{ config, lib, pkgs, ... }: +let + cfg = config.programs.emacs; configEl = pkgs.stdenv.mkDerivation { name = "config.el"; @@ -14,11 +16,11 @@ ''; }; -in { +in +lib.mkIf cfg.enable { xdg.configFile."emacs/init.el".source = configEl.outPath; programs.emacs = { - enable = true; extraPackages = epkgs: with epkgs; [ # # package use-package diff --git a/home/programs/feh.nix b/home/programs/feh.nix index d222b6f..cbf6d77 100644 --- a/home/programs/feh.nix +++ b/home/programs/feh.nix @@ -1,4 +1,4 @@ -{ machineVars, ... }: +{ ... }: { - programs.feh.enable = !machineVars.headless; -} \ No newline at end of file + programs.feh = { }; +} diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index 7d83a51..681c0a9 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -1,7 +1,6 @@ { lib, pkgs, ... }: { programs.firefox = { - enable = true; profiles.h7x4 = { bookmarks = { force = true; diff --git a/home/programs/mpv.nix b/home/programs/mpv.nix index 69773db..81d4d88 100644 --- a/home/programs/mpv.nix +++ b/home/programs/mpv.nix @@ -1,8 +1,6 @@ { config, lib, machineVars, ... }: { programs.mpv = { - enable = !machineVars.headless; - config = { screenshot-directory = "${config.xdg.userDirs.pictures}/mpv-screenshots"; diff --git a/home/programs/ncmpcpp.nix b/home/programs/ncmpcpp.nix index 9727f6e..0edd3ff 100644 --- a/home/programs/ncmpcpp.nix +++ b/home/programs/ncmpcpp.nix @@ -1,7 +1,6 @@ { config, pkgs, ... }: { programs.ncmpcpp = { - enable = true; package = pkgs.ncmpcpp.override { visualizerSupport = true; }; bindings = [ diff --git a/home/programs/newsboat/default.nix b/home/programs/newsboat/default.nix index 78f3949..ef42faa 100644 --- a/home/programs/newsboat/default.nix +++ b/home/programs/newsboat/default.nix @@ -11,8 +11,6 @@ in { imports = [ ./sources.nix ]; programs.newsboat = { - enable = true; - fetch-articles.enable = true; vacuum.enable = true; diff --git a/home/programs/obs-studio.nix b/home/programs/obs-studio.nix index 7ca3149..0d934d7 100644 --- a/home/programs/obs-studio.nix +++ b/home/programs/obs-studio.nix @@ -1,4 +1,4 @@ -{ machineVars, ... }: +{ ... }: { - programs.obs-studio.enable = !machineVars.headless; -} \ No newline at end of file + programs.obs-studio = { }; +} diff --git a/home/programs/prism-launcher.nix b/home/programs/prism-launcher.nix index 1c54f9d..ffbc9f3 100644 --- a/home/programs/prism-launcher.nix +++ b/home/programs/prism-launcher.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { programs.prism-launcher = { - enable = true; - package = pkgs.prismlauncher.override { jdk17 = pkgs.jdk21; }; diff --git a/home/programs/qutebrowser.nix b/home/programs/qutebrowser.nix index a85fab1..2ce11cb 100644 --- a/home/programs/qutebrowser.nix +++ b/home/programs/qutebrowser.nix @@ -1,7 +1,6 @@ { ... }: { programs.qutebrowser = { - enable = true; aliases = {}; searchEngines = {}; settings = {}; diff --git a/home/programs/rofi/default.nix b/home/programs/rofi/default.nix index 87715bc..27a84e3 100644 --- a/home/programs/rofi/default.nix +++ b/home/programs/rofi/default.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { programs.rofi = { - enable = true; - # plugins = with pkgs; [ # rofi-emoji # rofi-mpd diff --git a/home/programs/taskwarrior.nix b/home/programs/taskwarrior.nix index f33dfea..75ec0fb 100644 --- a/home/programs/taskwarrior.nix +++ b/home/programs/taskwarrior.nix @@ -1,7 +1,9 @@ -{ pkgs, ... }: -{ +{ config, lib, pkgs, ... }: +let + cfg = config.programs.taskwarrior; +in +lib.mkIf cfg.enable { programs.taskwarrior = { - enable = true; package = pkgs.taskwarrior3; config = rec { report.minimal.filter = "(status:pending or status:waiting)";