Compare commits

..

2 Commits
vhs ... master

Author SHA1 Message Date
92d14e41b5
document git secret shitshow 2024-08-21 17:13:26 +02:00
79fff90250
clean up some git basics 2024-08-21 17:08:33 +02:00
17 changed files with 74 additions and 342 deletions

View File

@ -64,8 +64,6 @@ atrm 2
Check `/var/spool/atd/` to see the jobs.
![At it again](/tapes/at.gif)
## Automation
Automatically add a job for later, by setting the date, then using echo for the command.

View File

@ -1,42 +0,0 @@
Require at
Require atd
Sleep 500ms
Type "at teatime"
Enter
Sleep 1.5s
Type "./"
Sleep 500ms
Type "baskup.sh"
Sleep 1.5s
Enter
Sleep 1.5s
Ctrl+D
Sleep 3.5s
Type "atq"
Enter
Sleep 1.5s
Type "atq 1"
Sleep 500ms
Type "4"
Enter
Sleep 500ms
Type "at"
Sleep 1s
Type " -c 15"
Enter
Sleep 1.5s
Type "at"
Sleep 500ms
Type " "
Sleep 500ms
Type "-"
Sleep 500ms
Type "c 15 | grep PWD"
Enter
Sleep 5.5s
Type "atrm 15"
Sleep 2s
Enter
Sleep 3s
Ctrl+D

View File

@ -10,8 +10,6 @@ tags: [ "Documentation", "Basics" ]
type cmus
```
![where is cmus?](/tapes/which.gif)
# Whereis the Program
Ask where the `angband` program is, along with all its configuration files:

View File

@ -1,33 +0,0 @@
Require cmus
Type "whereis cmus"
Enter
Sleep 1s
Type "which cmus"
Enter
Sleep 500ms
Type "type /bin/cmus"
Enter
Sleep 5s
Type "man cmus"
Enter
Sleep 1s
Type " "
Sleep 1s
Type " "
Sleep 1s
Type " "
Sleep 500ms
Type " "
Sleep 1.5s
Type " "
Sleep 500ms
Type " "
Sleep 1.5s
Type " "
Sleep 500ms
Type " q"
Sleep 500ms
Type "cmus"
Sleep 3s
Ctrl+D

View File

@ -1,11 +0,0 @@
Require yay
Set Shell "bash"
Set FontSize 20
Set Width 1400
Set Height 900
Sleep 2s
Type "yes | yay"

View File

@ -92,7 +92,7 @@ A branch is a full copy of the project to test additional ideas.
You can make a new branch called 'featurez' like this:
```bash
git branch *featurez*
git branch $FEATURE_BRANCH
```
Have a look at all your branches:
@ -104,19 +104,20 @@ git branch
Switch to your new branch:
```bash
git checkout *featurez*
git checkout $FEATURE_BRANCH
```
And if your changes are rubbish, checkout the "master" branch again, then delete "featurez":
```bash
git branch -D *featurez*
git branch -D $FEATURE_BRANCH
```
Or if it's a good branch, push it to the remote:
```bash
git push *origin* *featurez*
remote=origin
git push $remote $FEATURE_BRANCH
```
## Merging
@ -124,13 +125,13 @@ git push *origin* *featurez*
Once you like the feature, merge it into the main branch. Switch to master then merge it:
```bash
git merge *featurez*
git merge $FEATURE_BRANCH
```
and delete `featurez` as you've already merged it:
And delete the branch, as you've already merged it:
```bash
git branch -d featurez
git branch -d $FEATURE_BRANCH
```
# Subtree
@ -141,34 +142,6 @@ git branch -d featurez
git subtree add -P config git@gitlab.com:bindrpg/config.git master
```
## Pulling a Subtree from an existing git
The project has subdirectories sub-1,sub-2,sub-3. The first should be its own repository, but should also retain its own history.
First, we extract its history as an independent item, and make that into a seprate branch.
```bash
git subtree split --prefix=sub-1 -b sub
```
If you want something a few directories deep, you can use `--prefix=sub-1/dir-2/dir-3
Then go and create a new git somewhere else:
```bash
cd ..;mkdir sub-1;cd sub-1;git init --bare
```
Then go back to your initial git repo, and do the following:
git push ../subtest sub:master
Finally, you can clone this repo from your original.
```bash
git clone ../subtest
```
# Tricks
## Delete All History

9
data/git/git_secret.md Normal file
View File

@ -0,0 +1,9 @@
---
title: "git secret"
tags: [ "data", "git" ]
---
This utility is largely useless, as it can only identify people by their email.
So if someone has multiple GPG keys associated with one email, the tool will not work.
Worse than not working, it may 'suddenly' stop working as you try to transfer a secret to someone, who then discovers that `git-secret` requires them to mess about with their GPG keyring in order to use the repository.

34
data/git/subtree.md Normal file
View File

@ -0,0 +1,34 @@
---
title: "git"
tags: [ "Documentation", "data", "git", "subtree" ]
---
## Pulling a Subtree from an existing git
The project has subdirectories `sub-1`, `sub-2`, `sub-3`.
The first should be its own repository, but should also retain its own history.
First, we extract its history as an independent item, and make that into a seprate branch.
```bash
git subtree split --prefix=sub-1 -b sub
```
If you want something a few directories deep, you can use `--prefix=sub-1/dir-2/dir-3
Then go and create a new git somewhere else:
```bash
cd ..;mkdir sub-1;cd sub-1;git init --bare
```
Then go back to your initial git repo, and do the following:
git push ../subtest sub:master
Finally, you can clone this repo from your original.
```bash
git clone ../subtest
```

View File

@ -2,6 +2,29 @@
title: "sc-im"
tags: [ "Documentation", "data" ]
---
# Basic Commands
> H = highest part
> L = lowest part
> gg = top
> g$ = most right.
> g0 = most left.
> \ = insert middle
> \> = insert left
> < = insert right
gb4 = to to cell b4
> aa = see all text in cells
> f = format cells so you can see it.
> fl = format wider right
> fh = format smaller left
> fj = format wider down
> fk = format smaller down
# Edit
## Text
@ -10,7 +33,6 @@ tags: [ "Documentation", "data" ]
|:----------------------|:---:|
| text (left align) | < |
| text (right align) | > |
| text (right align) | `|` |
| Edit existing text | E |
## Meta Actions
@ -25,26 +47,6 @@ tags: [ "Documentation", "data" ]
| paste with format | Pc |
| delete a cell | x |
# Movement
| Action | Key |
|:-------------------------------:|:---:|
| highest part | H |
| lowest part | L |
| top | gg |
| move right | g$ |
| move left | g0 |
| insert middle | \ |
| insert left | \> |
| insert right | < |
| to to cell b4 | b4 |
| see all text in cells | aa |
| format cells so you can see it. | f |
| format wider right | fl |
| format smaller left | fh |
| format wider down | fj |
| format smaller down | fk |
## Functions

View File

@ -19,4 +19,3 @@ w3m ddg.gg
| T | new tab |
| { / } | switch tabs |
![w3m browser](/tapes/w3m.gif)

View File

@ -1,43 +0,0 @@
Require w3m
Sleep 1s
Type "w3m ddg.gg"
Sleep 500ms
Enter
Sleep 1.5s
Tab
Enter
Type "cats"
Enter
Sleep 2s
Tab
Enter
Sleep 2s
Type "jjjjjjjjjjjj"
Tab
Enter
Sleep 2s
Type "U"
Sleep 500ms
Ctrl+U
Sleep 500ms
Type "dmz.rs"
Sleep 500ms
Enter
Sleep 4.5s
Type "jjjjjjjj"
Tab
Type "j"
Sleep 500ms
Enter
Sleep 1s
Type " "
Sleep 2s
Backspace
Sleep 500ms
Type " "
Sleep 1.5s
Type " "
Sleep 2s
Type "qy"
Sleep 500ms

View File

@ -1,28 +0,0 @@
Require xbps-query
Require xbps-install
Set Shell "bash"
Set FontSize 20
Set Width 1400
Set Height 900
Type "sudo xbps-install --sync" Enter Sleep 700ms Enter
Type "sudo xbps-install --update --yes" Sleep 700ms
Backspace 33
Type "echo same but faster!" Sleep 200ms Enter
Type "sudo xbps-install -uy" Enter Sleep 700ms
Type "echo now we just download" Sleep 2s Enter
Type "sudo xbps-install -SD --yes" Sleep 700ms Enter
Type "echo and install from the downloaded updates..." Sleep 2s Enter
Type "sudo xbps-install -Du" Sleep 700ms Enter
Sleep 4s

View File

@ -1,64 +0,0 @@
Require xbps-query
Require xbps-install
Set Shell "bash"
#Set FontSize 20
#Set Width 1400
#Set Height 900
#Hide
#
#Type "sudo xbps-remove -y cowsay xcowsay aerc"
Show
Type "xbps-query cows" Enter Sleep 1s
Type "nothing..."
Backspace 11
Type "xbps-query --search cows" Sleep 500ms Enter
Type "xbps-query --repository --search cows" Sleep 500ms Enter
Type "echo same but faster!" Sleep 200ms Enter
Type "xbps-query -Rs cows" Sleep 500ms Enter
Sleep 3s
Type "sudo xbps-install -y xcowsay" Enter Sleep 700ms Enter
Sleep 5
Type "xbps-query --repository --search 'email'" Sleep 300ms Enter
Type "too much...." Sleep 1s
Backspace 13
Sleep 1s
Type "xbps-query -R --search '^email'" Sleep 300ms Enter
Sleep 2s
Type "xbps-query -Rs --regex '^email terminal'" Sleep 300ms Enter
Type "???" Sleep 2s
Backspace 3
Sleep 3s
Type "regex first!" Sleep 2s
Backspace 12
Type "xbps-query --regex -Rs '^email.*terminal'" Sleep 300ms Enter Sleep 900ms
Type "xbps-query --regex -Rs '^terminal.*email'" Sleep 300ms Enter Sleep 900ms
Type "sudo xbps-install aerc" Enter Sleep 300ms Enter Sleep 2s

View File

@ -1,28 +0,0 @@
Require xbps-query
Require xbps-install
Set Shell "bash"
#Set FontSize 20
#Set Width 1400
#Set Height 900
Type "sudo xbps-remove --yes thunderbird" Enter Sleep 2s
Type "time to kill orphans" Sleep 600ms
Backspace 21
Enter
Type "xbps-remove --remove-orphans --dry-run" Sleep 700ms
Backspace 38
Enter
Type "xbps-remove -on | cowsay" Sleep 300ms Enter Sleep 1.5s
Type "sudo xbps-remove --yes -o" Sleep 700ms Enter
Sleep 2s

View File

@ -22,8 +22,6 @@ Search with regex:
xbps-query --regex -Rs 'cow(s)?\w'
```
![xbps searches](/tapes/xbps-query.gif)
List what's required for cowsay
```bash
@ -70,8 +68,6 @@ Upgrade current packages.
xbps-install -Suv
```
![xbps searches](/tapes/xbps-install.gif)
## Remove/ Uninstall
Remove cowsay
@ -94,8 +90,6 @@ xbps-remove -o
Show information about cowsay
![xbps searches](/tapes/xbps-remove.gif)
## Fixes
Reinstall cowsay

View File

@ -3,8 +3,6 @@ title: "lf - The Light File Manager"
tags: [ "Documentation", "File Browser" ]
---
![lf](/tapes/lf.gif)
## Config File
If you don't have a `~/.config/lf/lfrc` file, you can probably find an example in `/usr/share/examples/lf`.

View File

@ -1,24 +0,0 @@
Require lf
Set Shell "bash"
Set FontSize 12
Set Width 800
Set Height 600
Type "lf"
Sleep 1.5s
Enter
Sleep 1.5s
Type "jjj"
Sleep 1s
Enter
Sleep 2s
Type "fortune > file"
Enter
Sleep 2s
Enter
Type "/file"
Enter
Sleep 3s
Type "q"