Merge pull request #5 from mardukpill/testing

merge testing

modules/home/cli/git/default.nix

@@ -1 +1,43 @@
-{ }
+{
+  lib,
+  pkgs,
+  namespace,
+  config,
+  ...
+}:
+let
+  inherit (lib) mkIf types;
+  inherit (lib.${namespace}) mkOpt;
+
+  cfg = config.${namespace}.cli.git;
+in
+{
+  options.${namespace}.cli.git = {
+    manage = mkOpt types.bool true "whether to manage git home configuration";
+  };
+
+  config = mkIf cfg.manage {
+    programs.git = {
+      enable = true;
+
+      delta = {
+        enable = true;
+
+        options = {
+          dark = true;
+          line-numbers = true;
+        };
+      };
+
+      extraConfig = {
+        init = {
+          defaultBranch = "main";
+        };
+
+        push = {
+          autoSetupRemote = true;
+        };
+      };
+    };
+  };
+}

modules/home/wms/hyprland/binds.nix

@@ -8,7 +8,6 @@
 }:
 let
   inherit (lib) mkIf;
-  grimblast = inputs.hyprland-contrib.packages.${pkgs.hostPlatform.system}.grimblast;
 
   cfg = config.${namespace}.wms.hyprland;
 in

modules/home/wms/hyprland/default.nix

@@ -23,9 +23,8 @@ let
   inherit (lib) mkIf mkEnableOption;
   inherit (lib.${namespace}) enabled;
   inherit (inputs) hyprland;
-  cfg = config.${namespace}.wms.hyprland;
-  grimblast = inputs.hyprland-contrib.packages.${pkgs.hostPlatform.system}.grimblast;
 
+  cfg = config.${namespace}.wms.hyprland;
 in
 {
   options.${namespace}.wms.hyprland = {
@@ -52,7 +51,7 @@ in
         hyprpicker
 
         grimblast
-        # hyprzoom
+        dotties.hyprzoom
 
         swappy
         gtk-engine-murrine # TODO: move to dedicated file

modules/nixos/wms/hyprland/default.nix

@@ -6,7 +6,7 @@
   ...
 }:
 let
-  inherit (lib) mkIf mkEnableOption enabled;
+  inherit (lib) mkIf mkEnableOption;
 
   cfg = config.${namespace}.wms.hyprland;
 in
@@ -16,6 +16,9 @@ in
   };
 
   config = mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [ ];
+
     programs.hyprland.enable = true;
     programs.hyprland.portalPackage = pkgs.xdg-desktop-portal-gtk;
 

packages/hyprzoom/default.nix

@@ -0,0 +1,44 @@
+{
+  pkgs,
+  lib,
+  namespace,
+  ...
+}:
+pkgs.writeShellScriptBin "hyprzoom" ''
+
+    if [ "$#" -ne 1 ]; then
+    		echo "Usage: $0 {in|out}"
+    		exit 1
+    fi
+
+
+    get_zoom_factor() {
+    	hyprctl getoption cursor:zoom_factor | grep -oP '\d+(\.\d+)?'
+    }
+
+    zoom_step=0.5
+    current_zoom=$(get_zoom_factor)
+
+    # Check if the current zoom factor is retrieved successfully
+    if [ -z "$current_zoom" ]; then
+        echo "Error: Could not retrieve the current zoom factor."
+        exit 1
+    fi
+
+    # Adjust the zoom factor based on the argument
+    if [ "$1" == "in" ]; then
+        new_zoom=$(echo "$current_zoom + $zoom_step" | ${pkgs.bc}/bin/bc)
+    elif [ "$1" == "out" ]; then
+        new_zoom=$(echo "$current_zoom - $zoom_step" | ${pkgs.bc}/bin/bc)
+    else
+        echo "Usage: $0 {in|out}"
+        exit 1
+    fi
+
+  	# use bc, due to bash being unable to handle floats
+    if (( $(echo "$new_zoom < 1" | ${pkgs.bc}/bin/bc -l) )); then
+      new_zoom=1
+    fi
+
+  	${pkgs.hyprland}/bin/hyprctl keyword cursor:zoom_factor $new_zoom
+''