modules/base/profiles.nix

@@ -12,7 +12,6 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
-        btop = enabled;
         curl = enabled;
         fish = enabled;
         jq = enabled;

modules/base/programs/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
-    ./btop.nix
     ./curl.nix
     ./fish.nix
     ./jq.nix

modules/home/profiles.nix

@@ -14,7 +14,6 @@ in {
       programs = {
         agenix = enabled;
         bat = enabled;
-        btop = enabled;
         curl = enabled;
         eza = enabled;
         figlet = enabled;
@@ -25,8 +24,6 @@ in {
         journalctl = enabled;
         jq = enabled;
         just = enabled;
-        lazydocker = enabled;
-        lazygit = enabled;
         less = enabled;
         man = enabled;
         nh = enabled;
@@ -46,13 +43,10 @@ in {
       shell.niri = enabled;
 
       programs = {
-        amfora = enabled;
-        cava = enabled;
         cheat = enabled;
         fzf = enabled;
         gh = enabled;
         glow = enabled;
-        jqp = enabled;
         nemo = enabled;
         neo = enabled;
         neovim = enabled;

modules/home/programs/btop.nix

@@ -1,25 +0,0 @@
-{
-  marleylib,
-  lib,
-  config,
-  osConfig,
-  ...
-}: let
-  inherit (marleylib.module) mkEnableOption';
-
-  cfg = config.marleyos.programs.btop;
-  osCfg = osConfig.marleyos.programs.btop;
-in {
-  options.marleyos.programs.btop.enable = mkEnableOption' "btop" osCfg.enable;
-
-  config = lib.mkIf cfg.enable {
-    programs.btop = {
-      enable = true;
-
-      settings = {
-        truecolor = true;
-        vim_keys = true;
-      };
-    };
-  };
-}

modules/home/programs/default.nix

@@ -1,10 +1,7 @@
 {
   imports = [
     ./agenix.nix
-    ./amfora
     ./bat.nix
-    ./btop.nix
-    ./cava.nix
     ./cheat.nix
     ./curl.nix
     ./eza.nix
@@ -20,10 +17,7 @@
     ./hyfetch
     ./journalctl.nix
     ./jq.nix
-    ./jqp.nix
     ./just.nix
-    ./lazydocker.nix
-    ./lazygit.nix
     ./less.nix
     ./man.nix
     ./nemo.nix

snowflake/modules/home/programs/tui/amfora/default.nix

@@ -2,6 +2,7 @@
   lib,
   config,
   pkgs,
+  inputs,
   ...
 }: let
   cfg = config.marleyos.programs.amfora;

snowflake/modules/home/programs/tui/btop/default.nix

@@ -1,7 +1,6 @@
 {
-  config,
   lib,
-  pkgs,
+  config,
   ...
 }: let
   cfg = config.marleyos.programs.btop;
@@ -9,8 +8,13 @@ in {
   options.marleyos.programs.btop.enable = lib.mkEnableOption "btop";
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      btop
-    ];
+    programs.btop = {
+      enable = true;
+
+      settings = {
+        truecolor = true;
+        vim_keys = true;
+      };
+    };
   };
 }

snowflake/modules/home/programs/tui/cava/default.nix

@@ -1,21 +1,22 @@
 {
-  config,
-  osConfig,
   lib,
-  pkgs,
+  config,
   ...
 }: let
   cfg = config.marleyos.programs.cava;
-  has-mpd = osConfig.services.mpd.enable || config.services.mpd.enable;
 in {
   options.marleyos.programs.cava.enable = lib.mkEnableOption "cava";
 
-  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
+  config = lib.mkIf cfg.enable {
     programs.cava = {
-      enable = true;
+      # FIX: Re-enable once https://github.com/NixOS/nixpkgs/pull/355948 is
+      # ported to nixpkgs/unstable
+      enable = false;
 
+      # TODO: disable this when mpd is not enabled? Can that be detected on non
+      # NixOS systems?
       settings = {
-        input = lib.mkIf has-mpd {
+        input = {
           method = "fifo";
           source = "/tmp/mpd.fifo";
         };

snowflake/modules/home/programs/tui/jqp/default.nix

@@ -1,6 +1,6 @@
 {
-  config,
   lib,
+  config,
   pkgs,
   ...
 }: let

snowflake/modules/home/programs/tui/lazydocker/default.nix

@@ -1,6 +1,6 @@
 {
-  config,
   lib,
+  config,
   pkgs,
   ...
 }: let

snowflake/modules/home/programs/tui/lazygit/default.nix

@@ -129,14 +129,6 @@ in {
             command = "git commit --message '{{.Form.Type}}{{ if .Form.Scope }}({{ .Form.Scope }}){{ end }}{{.Form.Breaking}}: {{.Form.Message}}'";
             loadingText = "Creating conventional commit...";
           }
-          {
-            key = "P";
-            context = "commits";
-            description = "Push a specific commit (and any preceding)";
-            command = "git push {{.SelectedRemote.Name}} {{.SelectedLocalCommit.Sha}}:{{.SelectedLocalBranch.Name}}";
-            loadingText = "Pushing commit...";
-            stream = "yes";
-          }
         ];
       };
     };