diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index d94122d..754979e 100755 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -52,7 +52,7 @@ imports = [ # environment. home.packages = [ #scritps -(pkgs.callPackage ../../modules/scripts/dontkillsteam.nix {}) +(pkgs.callPackage ../../modules/scripts/dontkillsteam.nix {}) # kill app (if it is steam put it in some background (pkgs.callPackage ../../modules/scripts/batterynotify.nix {}) (pkgs.callPackage ../../modules/scripts/weather.nix {}) (pkgs.callPackage ../../modules/scripts/cowsay.nix {}) @@ -60,8 +60,9 @@ home.packages = [ (pkgs.callPackage ../../modules/scripts/mountkdrive.nix {}) (pkgs.callPackage ../../modules/scripts/weatherwaybar.nix {}) (pkgs.callPackage ../../modules/scripts/colorpicker.nix {}) -(pkgs.callPackage ../../modules/scripts/killall.nix {}) +(pkgs.callPackage ../../modules/scripts/killall.nix {}) # kill all windows except focused window (pkgs.callPackage ../../modules/scripts/launch.nix {}) # necessary for the apps i launch with hyprland at every start +(pkgs.callPackage ../../modules/scripts/gitnotify.nix {}) #pkgs pkgs.gruvbox-gtk-theme # # Adds the 'hello' command to your environment. It prints a friendly diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix index 8f67109..7087de2 100644 --- a/modules/home-manager/git.nix +++ b/modules/home-manager/git.nix @@ -3,17 +3,8 @@ { programs.git = { enable = true; - # user.email dont work #user.email = "137088692+Totorile1@users.noreply.github.com"; - #user.name = "Totorile1"; - # no declarative parameters for git as it would show in a public git repo more info than I would like. Just use the following commands - # git config --global user.name "YourName" - # git config --global user.email "YourEmail" - # git config --global init.defaultBranch main -# git config --global user.email "137088692+Totorile1@users.noreply.github.com" -#cd ~/nixos\ -#git add . -#git commit -m "Update NixOS configuration" -#git push origin master - -}; + settings = { + init.defaultBranch = "main"; + }; + }; } diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index e098f66..6fe617e 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -197,7 +197,7 @@ in "sleep 1 && custom-wallpaper" "custom-mountkdrive" "waybar" - + "custom-gitnotify" ######################### # login autostart diff --git a/modules/scripts/gitnotify.nix b/modules/scripts/gitnotify.nix new file mode 100644 index 0000000..f7800e2 --- /dev/null +++ b/modules/scripts/gitnotify.nix @@ -0,0 +1,24 @@ +{ writeShellApplication, git, libnotify, ... }: + +writeShellApplication { + name = "custom-gitnotify"; + runtimeInputs = [ + git + libnotify + ]; + text = '' +# Check if git is installed +if ! command -v git >/dev/null 2>&1; then + exit 0 +fi + +NAME=$(git config --global user.name) +EMAIL=$(git config --global user.email) + +if [[ -z "$NAME" || -z "$EMAIL" ]]; then + notify-send \ + "Git not configured" \ + "Set your identity\n or remove this warning by removing the custom-gitnotify line in\n ~/nixos/modules/home-manager/hyprland.nix" +fi + ''; +}