commit 17d768dd49d457126c7b58547678b9398ab49411
parent 8acad838b9765b35907f885136c088b0a937a16a
Author: GuyClicking <bpaul848@gmail.com>
Date: Sun, 18 Jul 2021 22:24:00 +1000
Merge branch 'master' of git.bpaul.xyz:/var/www/git/website
Diffstat:
10 files changed, 312 insertions(+), 12 deletions(-)
diff --git a/art/trees/branch b/art/trees/branch
@@ -0,0 +1,12 @@
+ \ /
+ \ /
+ \ /
+ #####\ /#####
+ ######X######
+ ######|######
+ ####|####
+ #####|#####
+ ##### | #####
+ #### | ####
+ ## | ##
+ |
diff --git a/art/trees/christmas-tree-thingo b/art/trees/christmas-tree-thingo
@@ -0,0 +1,13 @@
+ /\
+ / \
+ /____\
+ / \
+ /______\
+ / \
+ /________\
+ / \
+/__________\
+ \ /
+ | |
+ } {
+ )' '(
diff --git a/art/trees/circle-tree b/art/trees/circle-tree
@@ -0,0 +1,8 @@
+ ######
+ ########
+ ########
+ ######
+ | |
+ | |
+ | |
+ | |
diff --git a/art/trees/tree b/art/trees/tree
@@ -0,0 +1,12 @@
+ /88888888888\
+ /8888888888888\
+ /888888888888888\
+ /88888888888888888\
+ \88888888888888888/
+ \888888888888888/
+ \8/ \88|88/ \8/
+ | | |
+ | | |
+ | | |
+ | | |
+ | | |
diff --git a/houses.html b/houses.html
@@ -0,0 +1,71 @@
+<html>
+<head>
+ <meta charset="UTF-8">
+<style>
+a {
+ color: inherit;
+ outline: 0;
+ text-decoration: inherit;
+}
+
+body {
+ font-family: monospace;
+ color: white;
+ background-color: black;
+}
+
+pre {
+ font-family: monospace;
+}
+</style>
+</head>
+<body>
+ <pre>
+ /\ /\ /\ /\ /\ /\ /\ /\ /\ /\
+ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
+ /____\ /____\ /____\ /____\ /____\ /____\ /____\ /____\ /____\ /____\
+ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
+ /______\ /______\ /______\ /______\ /______\ /______\ /______\ /______\ /______\ /______\
+ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
+ /________\ /________\ /________\ /________\ /________\ /________\ /________\ /________\ /________\ /________\
+ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
+<a href="/index.html"> ,_____________,</a> /__________\ /__________\ /__________\ /__________\ /__________\ /__________\ /__________\ /__________\ /__________\ /__________\
+<a href="/index.html"> | |</a> \ / \ / \ / \ / \ / \ / \ / \ / \ / \ /
+<a href="/index.html"> | town < |</a> | | | | | | | | | | | | | | | | | | | |
+<a href="/index.html"> |_____________|</a> } { } { } { } { } { } { } { } { } { } {
+<a href="/index.html"> | </a> )' '( )' '( )' '( )' '( )' '( )' '( )' '( )' '( )' '( )' '(
+<a href="/index.html">__________________</a>_____________________________________________________________________________________________________________________________________________
+<a href="/index.html">__________________</a>_____________________________________________________________________________________________________________________________________________
+<a href="/index.html"> </a>
+<a href="/index.html"> - - - - - - </a> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+<a href="/index.html">__________________</a>_______________________________________________________________, ,_____________________________________________________________________
+<a href="/index.html">__________________</a>_______________________________________________________________| | |_____________________________________________________________________
+ | |
+ | | |
+ | |
+ | | |
+ | |
+ | | |
+ | |
+ | | |
+ | |
+ | | |
+ | |
+ | | |
+ | |
+ | | | ,________________________________,
+ | | | |
+ | | | | If you want a house or plot of |
+ | | | land contact me |
+ | | | | |
+ | | |________________________________|
+ | | | |
+_________________________________________________________________________________| |_____________________________________________________________________
+_________________________________________________________________________________| | |_____________________________________________________________________
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+_______________________________________________________________________________________________________________________________________________________________
+_______________________________________________________________________________________________________________________________________________________________
+ </pre>
+</body>
+</html>
diff --git a/index.html b/index.html
@@ -1,15 +1,61 @@
<html>
- <head>
- <title>
- bpaul website
- </title>
- </head>
- <body>
- hi im bpaul
+<head>
+ <meta charset="UTF-8">
+<style>
+a {
+ color: inherit;
+ outline: 0;
+ text-decoration: inherit;
+}
- <br><br>
+body {
+ font-family: monospace;
+ color: white;
+ background-color: black;
+}
- <a href="/blog/">blog</a><br>
- <a href="/linux-blog/">linux blog</a>
- </body>
+pre {
+ font-family: monospace;
+}
+</style>
+</head>
+<body>
+ This page will look wrong if you aren't using a monospace font.<br>
+ The old home page is <a href="/old.html">>>>here<<<</a><br>
+ You can click on doors to go in to the buildings!!
+ <pre>
+,_______________________,
+| |
+| |
+| ____ ___ _____ |
+| / ___|_ _|_ _| |
+| | | _ | | | | |
+| | |_| || | | | |
+| \____|___| |_| |
+| |
+| ____ _ _ |
+| |/ \\ /|_|_) |
+| |\_/ \/\/ |_| \ |
+| |
+| |
+| |
+| |
+| |
+| |
+| |
+| | ,__________,
+| | | |
+| | | Lemonade | ,_____________,
+| <a href="http://git.bpaul.xyz">,_______,</a> | |__________| <a href="/houses.html">| |</a>
+| <a href="http://git.bpaul.xyz">| | |</a> | | o | <a href="/houses.html">| houses > |</a>
+| <a href="http://git.bpaul.xyz">| | |</a> | |__v__|____| <a href="/houses.html">|_____________|</a>
+|_______<a href="http://git.bpaul.xyz">|___|___|</a>_______| |__________| <a href="/houses.html"> | </a>
+_________________________________________________________<a href="/houses.html">__________________</a>
+_________________________________________________________<a href="/houses.html">__________________</a>
+ <a href="/houses.html"> </a>
+ - - - - - - - - - - - - - - - - - - - <a href="/houses.html"> - - - - - - </a>
+_________________________________________________________<a href="/houses.html">__________________</a>
+_________________________________________________________<a href="/houses.html">__________________</a>
+ </pre>
+</body>
</html>
diff --git a/linux-blog/2.html b/linux-blog/2.html
@@ -0,0 +1,46 @@
+<html>
+ <head>
+ <title>
+ bpaul blog
+ </title>
+ </head>
+ <body>
+ <a href="/linux-blog/">back</a>
+
+ <h1>fzf is better</h1>
+ <p>
+ date: 20/05/21<br>
+ fzf is better than dmenu!
+ The problem with dmenu is that you cant do things with it in the terminal (well you can but it might be weird) like cding.
+ But with fzf, you can!
+ My favourite thing about fzf so far is probably the fzf-tmux script that fzf comes with.
+ But yeah fzf is basically just dmenu but better (oh yeah it is also faster i think).<br><br>
+
+ Another thing about fzf is the vim integration.
+ It is very useful!<br><br>
+
+ Here is a list of some cool fzf scripts:<br>
+ <a href="https://github.com/junegunn/fzf/wiki/Examples#changing-directory)">fd</a><br><br>
+ fh (Search command history and run command)<br>
+ This is basically just CTRL-r<br><br>
+ <pre><code>
+fh() {
+ eval $(history -n | fzf-tmux -r +m)
+}
+ </code></pre><br>
+
+ Here is a list of some cool fzf vim thingos:<br>
+ Colorscheme menu (lua lol):<br>
+ <pre><code>
+function colourscheme()
+vim.api.nvim_eval('fzf#run(fzf#wrap({"source":luaeval("{'..string.gsub(vim.api.nvim_eval("globpath(&rtp, 'colors/*.vim')") .. '\n','.-/colors/(.-).vim\n',"'%1',")..'}"),"sink":"colorscheme"}))')
+end
+ </code></pre><br>
+ Basically it gets the colors with globpath and then does regex stuff then feeds it into fzf with the colorscheme sink (sinks are the commands that get run with the thing selected).<br><br>
+
+ <br>
+
+ I might add more stuff here later
+ </p>
+ </body>
+</html>
diff --git a/linux-blog/index.html b/linux-blog/index.html
@@ -14,5 +14,6 @@
<br>
<a href="/linux-blog/1.html">1. dmenu is op (01/03/2021)</a>
+ <a href="/linux-blog/2.html">2. fzf is better (20/05/2021)</a>
</body>
</html>
diff --git a/index.html b/old.html
diff --git a/self-stuff/vim-cheatsheet.html b/self-stuff/vim-cheatsheet.html
@@ -1,6 +1,97 @@
<html>
<body>
- <table>
+ Normal mode commands<br>
+ <table style="width:100%">
+ <col style="width:25%">
+ <col style="width:75%">
+ <tr>
+ <th>Tag</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>a</td>
+ <td>Append. Enter insert mode pointing at the character one after the cursor.</td>
+ </tr>
+ <tr>
+ <td>A</td>
+ <td>Enter insert mode pointing at the character one after the end of the current line.</td>
+ </tr>
+ <tr>
+ <td>CTRL-A</td>
+ <td>Increment the number under the cursor by one.</td>
+ </tr>
+ <tr>
+ <td>b</td>
+ <td>Back. Go to the start of the current word or previous word if you are already at the current word start.</td>
+ </tr>
+ <tr>
+ <td>B</td>
+ <td>Go to the start of the current WORD or previous WORD if you are already at the current WORD start. WORD means anything space separated, not - separated etc.</td>
+ </tr>
+ <tr>
+ <td>CTRL-B</td>
+ <td>Scroll up one page.</td>
+ </tr>
+ <tr>
+ <td>c</td>
+ <td>Change. Goes c<motion>. Delete what is selected by <motion> and open insert mode. Not separated for undos like d<motion>i would be.</td>
+ </tr>
+ <tr>
+ <td>cc</td>
+ <td>Clear the current line and open insert mode.</td>
+ </tr>
+ <tr>
+ <td>C</td>
+ <td>Delete every character from the cursor to the end of the current line and open insert mode. Not separated for undos like Di would be.</td>
+ </tr>
+ <tr>
+ <td>CTRL-C</td>
+ <td>Cancel whatever you are halfway through doing. E.g. c3 CTRL-C would cancel your c command.</td>
+ </tr>
+ <tr>
+ <td>d</td>
+ <td>Delete. Goes d<motion>. Delete what is selected by <motion>.</td>
+ </tr>
+ <tr>
+ <td>dd</td>
+ <td>Delete the current line and move the cursor to the next line.</td>
+ </tr>
+ <tr>
+ <td>D</td>
+ <td>Delete every character from the cursor to the end of the current line.</td>
+ </tr>
+ <tr>
+ <td>CTRL-D</td>
+ <td>Scroll down half a page.</td>
+ </tr>
+ <tr>
+ <td>e</td>
+ <td>End. Go to the end of the current word or next word if you are already at the current word end.</td>
+ </tr>
+ <tr>
+ <td>E</td>
+ <td>Go to the end of the current WORD or next WORD if you are already at the current WORD end. See B</td>
+ </tr>
+ <tr>
+ <td>CTRL-E</td>
+ <td>Scroll down by one line.</td>
+ </tr>
+ <tr>
+ <td>f</td>
+ <td>Goes nf<char>. Move the pointer to the nth occurence of <char> going forwards from the pointer to the end of the line.</td>
+ </tr>
+ <tr>
+ <td>F</td>
+ <td>Goes nF<char>. Move the pointer to the nth occurence of <char> going backwards from the pointer to the start of the line.</td>
+ </tr>
+ <tr>
+ <td>CTRL-F</td>
+ <td>Scroll down one page.</td>
+ </tr>
+ <tr>
+ <td>CTRL-F</td>
+ <td>Scroll down one page.</td>
+ </tr>
</table>
</body>
</html>
