feat: lazygit

modules/base/profiles.nix

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

modules/base/programs/btop.nix

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

modules/base/programs/default.nix

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

modules/home/profiles.nix

@@ -14,6 +14,7 @@ in {
       programs = {
         agenix = enabled;
         bat = enabled;
+        btop = enabled;
         curl = enabled;
         eza = enabled;
         figlet = enabled;
@@ -24,6 +25,8 @@ in {
         journalctl = enabled;
         jq = enabled;
         just = enabled;
+        lazydocker = enabled;
+        lazygit = enabled;
         less = enabled;
         man = enabled;
         nh = enabled;
@@ -43,10 +46,13 @@ 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/amfora/default.nix

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

modules/home/programs/btop.nix

@@ -0,0 +1,25 @@
+{
+  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/cava.nix

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

modules/home/programs/default.nix

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

modules/home/programs/jqp.nix

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

modules/home/programs/lazydocker.nix

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

modules/home/programs/lazygit.nix

@@ -129,6 +129,14 @@ 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";
+          }
         ];
       };
     };