fixing gitcofig

This commit is contained in:
ari committed 2024-05-19 00:07:36 -04:00
1 parent 6818d5e7ad
commit 024ac197ba
5 files changed
+4 -4

No files matched your search

+1 -2
View File
@@ -14,8 +14,7 @@
};
};
outputs = { self, home-manager, nix-darwin, nixpkgs }: {
default
lib = {
lib = {
makeImports = { ... }@attrs: [ (import ./main.nix attrs) ];
makeNixOsModule = { system, configuration ? null, ... }@attrs:
nixpkgs.lib.nixosSystem {
+29
View File
@@ -0,0 +1,29 @@
[alias]
pp = "!f() { \
echo 'git pull --ff';\
git pull --ff; \
echo 'git push';\
git push; \
}; f";
up = "pull --rebase --autostash";
ca = "commit -a";
ls = "log --oneline";
cap = "!f() { \
echo 'commiting code'; \
git ca ${@}; \
echo 'pushing...'; \
git push ; \
}; f";
undo-commit = "!f() { \
lastcommit=$(git log --oneline -n 1); \
echo '[[switching]] from' $lastcommit; \
git reset --soft HEAD~${1:-1}; \
lastcommit=$(git log --oneline -n 1); \
echo '[[switching]] to' $lastcommit; \
git status; \
}; f";
sync = "!f() { \
target_branch=${1:-main}; \
remote=${2:-origin}; \
git fetch $remote $target_branch:$target_branch; \
}; f";
+1 -1
View File
@@ -2,7 +2,7 @@
{ pkgs, ... }:
let
gitconfigs =
(builtins.filterSource (path: type: type != "directory") ../configs/gitconfigs);
(builtins.filterSource (path: type: type != "directory") ./gitconfigs);
gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs);
in
{
+1
View File
@@ -14,6 +14,7 @@
, home-manager ? {
enable = false;
}
, ...
}:
{ ... }:
{