fixup! (desktop) Gen 490: split nixcommit into two scripts, one for committing one for pushing. also renamed nixswitch to rebuild
This commit is contained in:
@@ -27,6 +27,7 @@ let
|
||||
toggle_waybar = (import ./wm-controls/toggle_waybar.nix { self = self; pkgs = pkgs;});
|
||||
rebuild = (import ./nix/rebuild.nix { host = host; self = self; pkgs = pkgs;});
|
||||
nixcommit = (import ./nix/nixcommit.nix { host = host; self = self; pkgs = pkgs;});
|
||||
nixpush = (import ./nix/nixpush.nix { self = self; pkgs = pkgs;});
|
||||
in
|
||||
{
|
||||
home.packages = [
|
||||
@@ -44,6 +45,7 @@ in
|
||||
music
|
||||
nixcommit
|
||||
nixp
|
||||
nixpush
|
||||
nixr
|
||||
rebuild
|
||||
nsp
|
||||
|
||||
@@ -27,6 +27,9 @@ if [ -z "$1" ]; then
|
||||
commits=$(git log origin/$(git rev-parse --abbrev-ref HEAD)..HEAD --oneline)
|
||||
if [ -n "$commits" ]; then
|
||||
git commit --fixup HEAD
|
||||
echo "No commit message given"
|
||||
echo "Squashing into most recent commit"
|
||||
git rebase --autosquash master
|
||||
else
|
||||
echo "No prior local commits to squash into, please provide a commit message"
|
||||
exit
|
||||
|
||||
Reference in New Issue
Block a user