diff --git a/flake.lock b/flake.lock index 12b53f5..0f55297 100644 --- a/flake.lock +++ b/flake.lock @@ -825,11 +825,11 @@ }, "nur": { "locked": { - "lastModified": 1729031606, - "narHash": "sha256-jkNTTsaFqK1Fw9PZZVf8LGgTTXZCRHMxUSjRFqwcsog=", + "lastModified": 1729035911, + "narHash": "sha256-MD81qtqfNYzbKssBk6hmozn3sB/qR+LL1Tx8qQE6+9U=", "owner": "nix-community", "repo": "NUR", - "rev": "2476177b9e2bb9cde1393c928ba58574d6b6d78f", + "rev": "64079c912fb1734bf1f06ba4754ae8a1b6fa6e25", "type": "github" }, "original": { diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 157c258..efcf60e 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -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 diff --git a/modules/home/scripts/nix/nixcommit.nix b/modules/home/scripts/nix/nixcommit.nix index e861d58..4196885 100644 --- a/modules/home/scripts/nix/nixcommit.nix +++ b/modules/home/scripts/nix/nixcommit.nix @@ -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