update flake
This commit is contained in:
@@ -6,8 +6,6 @@ in {
|
||||
home.packages = with pkgs; [ tea ];
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = username;
|
||||
userEmail = email;
|
||||
signing.key = "D8EDD65BCB54AC8719BE4EBD8D5D880EB08F1544";
|
||||
ignores = [
|
||||
".cache/"
|
||||
@@ -21,38 +19,44 @@ in {
|
||||
"result"
|
||||
"result-*"
|
||||
];
|
||||
extraConfig = {
|
||||
settings = {
|
||||
user = {
|
||||
name = username;
|
||||
email = email;
|
||||
};
|
||||
aliases = {
|
||||
essa = "push --force";
|
||||
co = "checkout";
|
||||
fuck = "commit --amend -m";
|
||||
c = "commit -m";
|
||||
ca = "commit -am";
|
||||
forgor = "commit --amend --no-edit";
|
||||
graph = "log --all --decorate --graph --oneline";
|
||||
oops = "checkout --";
|
||||
l = "log";
|
||||
r = "rebase";
|
||||
s = "status --short";
|
||||
ss = "status";
|
||||
d = "diff";
|
||||
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
|
||||
st = "status";
|
||||
br = "branch";
|
||||
df =
|
||||
"!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
||||
hist = ''
|
||||
log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
||||
llog = ''
|
||||
log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
|
||||
edit-unmerged =
|
||||
"!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
||||
};
|
||||
|
||||
init.defaultBranch = "main";
|
||||
push.autoSetupRemote = true;
|
||||
color.ui = "1";
|
||||
commit.gpgSign = true;
|
||||
};
|
||||
aliases = {
|
||||
essa = "push --force";
|
||||
co = "checkout";
|
||||
fuck = "commit --amend -m";
|
||||
c = "commit -m";
|
||||
ca = "commit -am";
|
||||
forgor = "commit --amend --no-edit";
|
||||
graph = "log --all --decorate --graph --oneline";
|
||||
oops = "checkout --";
|
||||
l = "log";
|
||||
r = "rebase";
|
||||
s = "status --short";
|
||||
ss = "status";
|
||||
d = "diff";
|
||||
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
|
||||
st = "status";
|
||||
br = "branch";
|
||||
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
||||
hist = ''
|
||||
log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
||||
llog = ''
|
||||
log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
|
||||
edit-unmerged =
|
||||
"!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,111 +8,113 @@ in {
|
||||
|
||||
programs.nixvim = {
|
||||
plugins.mkdnflow = {
|
||||
enable = true;
|
||||
modules = { conceal = false; };
|
||||
toDo.symbols = [ " " "-" "x" "!" "/" ];
|
||||
mappings = {
|
||||
MkdnCreateLink = false;
|
||||
MkdnCreateLinkFromClipboard = {
|
||||
key = "<leader>ml";
|
||||
modes = [ "n" "v" ];
|
||||
enable = false;
|
||||
settings = {
|
||||
modules = { conceal = false; };
|
||||
to_do.symbols = [ " " "-" "x" "!" "/" ];
|
||||
# mappings = {
|
||||
# MkdnCreateLink = false;
|
||||
# MkdnCreateLinkFromClipboard = {
|
||||
# key = "<leader>ml";
|
||||
# modes = [ "n" "v" ];
|
||||
# };
|
||||
# MkdnDecreaseHeading = {
|
||||
# key = "<leader>m-";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnDestroyLink = false;
|
||||
# MkdnEnter = {
|
||||
# key = "<CR>";
|
||||
# modes = [ "v" ];
|
||||
# };
|
||||
# MkdnExtendList = false;
|
||||
# MkdnFoldSection = {
|
||||
# key = "<leader>mf";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnUnfoldSection = {
|
||||
# key = "<leader>mF";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnFollowLink = {
|
||||
# key = "gd";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnGoBack = false;
|
||||
# MkdnGoForward = false;
|
||||
# MkdnIncreaseHeading = {
|
||||
# key = "<leader>m+";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnMoveSource = false;
|
||||
# MkdnNewListItem = false;
|
||||
# MkdnNewListItemAboveInsert = {
|
||||
# key = "O";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnNewListItemBelowInsert = {
|
||||
# key = "o";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnNextHeading = {
|
||||
# key = "<leader>m#";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnNextLink = false;
|
||||
# MkdnPrevLink = false;
|
||||
# MkdnPrevHeading = {
|
||||
# key = "<leader>m*";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnSTab = false;
|
||||
# MkdnTab = false;
|
||||
# MkdnTableNewColAfter = {
|
||||
# key = "<leader>mc";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnTableNewColBefore = {
|
||||
# key = "<leader>mC";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnTableNewRowAbove = {
|
||||
# key = "<leader>mR";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnTableNewRowBelow = {
|
||||
# key = "<leader>mr";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnTableNextCell = {
|
||||
# key = "<S-Tab>";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnTableNextRow = false;
|
||||
# MkdnTablePrevCell = {
|
||||
# key = "<S-Tab>";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnTablePrevRow = false;
|
||||
# MkdnToggleToDo = {
|
||||
# key = "<C-Space>";
|
||||
# modes = [ "n" "v" ];
|
||||
# };
|
||||
# MkdnUpdateNumbering = {
|
||||
# key = "<leader>mn";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnYankAnchorLink = {
|
||||
# key = "ya";
|
||||
# modes = "n";
|
||||
# };
|
||||
# MkdnYankFileAnchorLink = {
|
||||
# key = "yfa";
|
||||
# modes = "n";
|
||||
# };
|
||||
# };
|
||||
tables = {
|
||||
formatOnMove = true;
|
||||
trimWhitespace = true;
|
||||
};
|
||||
MkdnDecreaseHeading = {
|
||||
key = "<leader>m-";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnDestroyLink = false;
|
||||
MkdnEnter = {
|
||||
key = "<CR>";
|
||||
modes = [ "v" ];
|
||||
};
|
||||
MkdnExtendList = false;
|
||||
MkdnFoldSection = {
|
||||
key = "<leader>mf";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnUnfoldSection = {
|
||||
key = "<leader>mF";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnFollowLink = {
|
||||
key = "gd";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnGoBack = false;
|
||||
MkdnGoForward = false;
|
||||
MkdnIncreaseHeading = {
|
||||
key = "<leader>m+";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnMoveSource = false;
|
||||
MkdnNewListItem = false;
|
||||
MkdnNewListItemAboveInsert = {
|
||||
key = "O";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnNewListItemBelowInsert = {
|
||||
key = "o";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnNextHeading = {
|
||||
key = "<leader>m#";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnNextLink = false;
|
||||
MkdnPrevLink = false;
|
||||
MkdnPrevHeading = {
|
||||
key = "<leader>m*";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnSTab = false;
|
||||
MkdnTab = false;
|
||||
MkdnTableNewColAfter = {
|
||||
key = "<leader>mc";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNewColBefore = {
|
||||
key = "<leader>mC";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNewRowAbove = {
|
||||
key = "<leader>mR";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNewRowBelow = {
|
||||
key = "<leader>mr";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNextCell = {
|
||||
key = "<S-Tab>";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNextRow = false;
|
||||
MkdnTablePrevCell = {
|
||||
key = "<S-Tab>";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTablePrevRow = false;
|
||||
MkdnToggleToDo = {
|
||||
key = "<C-Space>";
|
||||
modes = [ "n" "v" ];
|
||||
};
|
||||
MkdnUpdateNumbering = {
|
||||
key = "<leader>mn";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnYankAnchorLink = {
|
||||
key = "ya";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnYankFileAnchorLink = {
|
||||
key = "yfa";
|
||||
modes = "n";
|
||||
};
|
||||
};
|
||||
tables = {
|
||||
formatOnMove = true;
|
||||
trimWhitespace = true;
|
||||
};
|
||||
};
|
||||
extraFiles = {
|
||||
|
||||
@@ -12,7 +12,7 @@ in {
|
||||
extraPackages = with pkgs.bat-extras; [
|
||||
batman
|
||||
batdiff
|
||||
batgrep
|
||||
# batgrep
|
||||
batwatch
|
||||
# prettybat
|
||||
];
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
"size 530 300, class:^(.*blueman-manager.*)$"
|
||||
"move 100%-w-20 40, class:^(.*blueman-manager.*)$"
|
||||
"tag +portal, class:^(.*desktop-portal.*)$"
|
||||
"tag +dialog, initialTitle:^.(Calendar Reminders).*$"
|
||||
"noborder, tag:portal"
|
||||
"noblur, tag:portal"
|
||||
"noshadow, tag:portal"
|
||||
|
||||
Reference in New Issue
Block a user