swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

git update aliases

Browse source
This commit is contained in:
Swarsel 2023-12-11 03:19:38 +01:00
parent 84b5cd816c
commit 49ef1a8186
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
6 changed files with 13 additions and 1831 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Emacs.org
View file

@ -1183,8 +1183,7 @@ This is a section adapted from org-download to make some org-download functions
;; (setq dnd-capture-source nil) ;; (setq dnd-capture-source nil)
;; ;; these ne ;; these next lines provide an interface for org-download in markdown mode for use with obsidian
xt lines provide an interface for org-download in markdown mode for use with obsidian
(defvar org-download-markdown-link-format (defvar org-download-markdown-link-format
"![[./%s]]\n" "![[./%s]]\n"

6
Nix.org
View file

@ -1688,9 +1688,12 @@ Other programs:
programs.git = { programs.git = {
enable = true; enable = true;
aliases = { aliases = {
a = "add";
c = "commit"; c = "commit";
co = "checkout"; co = "checkout";
b = "branch";
s = "status"; s = "status";
r = "restore";
p = "pull"; p = "pull";
pp = "push"; pp = "push";
}; };
@ -1877,7 +1880,8 @@ zsh is clearly the most convenient shell for me and it happens to be super neat
edithome = "bash ~/.dotfiles/scripts/editor.sh ~/.dotfiles/Nix.org"; edithome = "bash ~/.dotfiles/scripts/editor.sh ~/.dotfiles/Nix.org";
magit = "emacsclient -nc -e \"(magit-status)\""; magit = "emacsclient -nc -e \"(magit-status)\"";
config="git --git-dir=$HOME/.cfg/ --work-tree=$HOME"; config="git --git-dir=$HOME/.cfg/ --work-tree=$HOME";
c="git --git-dir=$HOME/.cfg/ --work-tree=$HOME"; g="git";
c="git --git-dir=$HOME/.dotfiles/.git --work-tree=$HOME/.dotfiles/";
passpush = "cd ~/.local/share/password-store; git add .; git commit -m 'pass file changes'; git push; cd -;"; passpush = "cd ~/.local/share/password-store; git add .; git commit -m 'pass file changes'; git push; cd -;";
passpull = "cd ~/.local/share/password-store; git pull; cd -;"; passpull = "cd ~/.local/share/password-store; git pull; cd -;";
}; };

6
profiles/common/home.nix
View file

@ -460,9 +460,12 @@ programs.eza = {
programs.git = { programs.git = {
enable = true; enable = true;
aliases = { aliases = {
a = "add";
c = "commit"; c = "commit";
co = "checkout"; co = "checkout";
b = "branch";
s = "status"; s = "status";
r = "restore";
p = "pull"; p = "pull";
pp = "push"; pp = "push";
}; };
@ -620,7 +623,8 @@ programs.zsh = {
edithome = "bash ~/.dotfiles/scripts/editor.sh ~/.dotfiles/Nix.org"; edithome = "bash ~/.dotfiles/scripts/editor.sh ~/.dotfiles/Nix.org";
magit = "emacsclient -nc -e \"(magit-status)\""; magit = "emacsclient -nc -e \"(magit-status)\"";
config="git --git-dir=$HOME/.cfg/ --work-tree=$HOME"; config="git --git-dir=$HOME/.cfg/ --work-tree=$HOME";
c="git --git-dir=$HOME/.cfg/ --work-tree=$HOME"; g="git";
c="git --git-dir=$HOME/.dotfiles/.git --work-tree=$HOME/.dotfiles/";
passpush = "cd ~/.local/share/password-store; git add .; git commit -m 'pass file changes'; git push; cd -;"; passpush = "cd ~/.local/share/password-store; git add .; git commit -m 'pass file changes'; git push; cd -;";
passpull = "cd ~/.local/share/password-store; git pull; cd -;"; passpull = "cd ~/.local/share/password-store; git pull; cd -;";
}; };

3
programs/emacs/init.el
View file

@ -846,8 +846,7 @@
;; (setq dnd-capture-source nil) ;; (setq dnd-capture-source nil)
;; ;; these ne ;; these next lines provide an interface for org-download in markdown mode for use with obsidian
xt lines provide an interface for org-download in markdown mode for use with obsidian
(defvar org-download-markdown-link-format (defvar org-download-markdown-link-format
"![[./%s]]\n" "![[./%s]]\n"

1824
programs/emacs/init.el~
View file

File diff suppressed because it is too large Load diff

2
scripts/checkconfigstatus.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# CFG=$(git --git-dir=$HOME/.cfg/ --work-tree=$HOME diff --numstat | wc -l) # CFG=$(git --git-dir=$HOME/.cfg/ --work-tree=$HOME diff --numstat | wc -l)
CFG=$(git --git-dir=$HOME/.cfg/ --work-tree=$HOME status -s | wc -l) CFG=$(git --git-dir=$HOME/.dotfiles/.git --work-tree=$HOME/.dotfiles/ status -s | wc -l)
CSE=$(git --git-dir=$HOME/Documents/GitHub/CSE_TUWIEN/.git --work-tree=$HOME/Documents/GitHub/CSE_TUWIEN/ status -s | wc -l) CSE=$(git --git-dir=$HOME/Documents/GitHub/CSE_TUWIEN/.git --work-tree=$HOME/Documents/GitHub/CSE_TUWIEN/ status -s | wc -l)
PASS=$(git --git-dir=$HOME/.local/share/password-store/.git --work-tree=$HOME/.local/share/password-store/ status -s | wc -l) PASS=$(git --git-dir=$HOME/.local/share/password-store/.git --work-tree=$HOME/.local/share/password-store/ status -s | wc -l)