Merge branch 'zenix/hm-cosmic' into nixbook/cosmic

home/programs/git.nix

@@ -9,11 +9,18 @@
       bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" ''
         url=$1
         basename=''${url##*/}
-        name=''${2:-''${basename%.*}}
+        if [[ $2 == -* ]]
+        then
+          opts=''${@:2}
+          name=''${basename%.*}
+        else
+          opts=''${@:3}
+          name=''${2:-''${basename%.*}}
+        fi
 
         mkdir "$name"
 
-        git clone --bare "$url" "$name/.bare" || {
+        git clone --bare "$url" "$name/.bare" $opts || {
           rm -r "$name"
           exit 1
         }
@@ -23,7 +30,7 @@
 
         git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 
-        git fetch origin
+        git fetch origin $opts
       ''}/bin/bare-clone";
     };
     difftastic = {

home/programs/graphical.nix

@@ -9,11 +9,10 @@
     # system
     selectdefaultapplication
     easyeffects
-    pavucontrol
+    pwvucontrol
     helvum
 
     # tools
-    obs-studio
     inkscape
     libsForQt5.okular
     gimp
@@ -31,6 +30,14 @@
     bitwarden
   ];
 
+  programs.obs-studio = {
+    enable = true;
+    plugins = [
+      pkgs.obs-studio-plugins.wlrobs
+      pkgs.obs-studio-plugins.obs-pipewire-audio-capture
+    ];
+  };
+
   xdg.mimeApps.defaultApplications = {
     "application/pdf" = "sioyek.desktop";
   };
@@ -46,6 +53,4 @@
       "file:///home/tristan/Downloads"
     ];
   };
-
-  programs.librewolf.enable = true;
 }

home/programs/lf/default.nix

@@ -37,6 +37,7 @@ in {
     R = "drag";
     "<f-2>" = ":rename";
     "<enter>" = "open-with";
+    "<f-5>" = ":reload";
   };
   programs.lf.extraConfig = ''
     set sixel true