really dumb merge conflict

.gitignore

@@ -1,2 +1,4 @@
 *.swp
 test*
+
+_site/*

make.sh

@@ -1,10 +1,11 @@
 # compiles new post into target directory
+rootDir='./_site/'
 post() {
 	# check directory existence
 	if [ -f markdown/post/$1 ] 
 	then
-		# compile the new post and drop it in ./post/
+		# CSS file is always relative to the target html location
-		pandoc markdown/post/$1 --css bstyle.css -s -o post/${1%.*}.html
+		pandoc markdown/post/$1 --css style.css -s -o $rootDir/post/${1%.*}.html
 	else
 		# error message incase file was not found
 		echo "File \"$1\" not found in markdown/post"
@@ -12,18 +13,24 @@ post() {
 }
 
 updatestyle() {
-	# make sure that all sub styles are kept up to date with the root stylesheet
+	# Updating index style
-	cp style.css ./page/bstyle.css
+	cp style.css $rootDir/style.css
-	sed -i 's/./fonts/../fonts//g' ./page/bstyle.css
+	sed -i 's/.\/fonts/..\/fonts/g' $rootDir/style.css
-	cp style.css ./post/bstyle.css
+
-	sed -i 's/./fonts/../fonts//g' ./post/bstyle.css
+	# Updating page style
+	cp style.css $rootDir/page/style.css
+	sed -i 's/.\/fonts/..\/fonts/g' $rootDir/page/style.css
+
+	# Updating post style
+	cp style.css $rootDir/post/style.css
+	sed -i 's/.\/fonts/..\/fonts/g' $rootDir/page/style.css
 }
 
 page() {
 	# we want to enforce maintainence of directory structure
 	if [ -f markdown/pages/$1 ] 
 	then
-		pandoc markdown/pages/$1 --css bstyle.css -s -o page/${1%.*}.html
+		pandoc markdown/pages/$1 --css style.css -s -o $rootDir/page/${1%.*}.html
 	else
 		echo "File \"$1\" not found in markdown/pages"
 	fi
@@ -32,28 +39,19 @@ page() {
 # literally just updates the index file nothing else
 index() {
 	# base index file 
-	pandoc ./markdown/index.md --css style.css -s -o index.html # typing succs
+	pandoc ./markdown/index.md --css style.css -s -o $rootDir/index.html # typing succs
 	# next we inject the navbar html stuff
-	sed -i '7r ./templates/navbar.html' index.html
+	sed -i '7r ./templates/navbar.html' $rootDir/index.html
 }
 
-help() {
+# taking function names as param
-	case $1 in 
-		type)
-			echo -e "[post, page] \n\tThe kind of page you want to add to the site"
-			echo "Different types result in different compilation locations"
-			;;
-		target)
-			echo "The file that you want to actually compile to html"
-			;;
-		flag)
-			echo -e "Available flags:\n\tr - rebuilds file, does not update index.html\n\tn - builds file, updates index.html"
-			echo -e "\t*Pages will not update index.html*"
-			;;
-		*)
-			echo "./make.sh type target.md flag"
-	esac
-}
-
-# taking function names as para
 "$@"
+
+if [ -z $1 ]
+then
+	echo './make.sh post file.md	- make new post'
+	echo './make.sh updatestyle	- update & sync style sheets'
+	echo './make.sh page file.md	- make new page'
+	echo './make.sh index		- update index'
+fi
+

markdown/pages/about.md

@@ -1,23 +1,24 @@
-[![Homepage](../img/banner.png)](../index.html)
+# [About Me](../index.html)
-
-# About Me 
 
 _really though what did you expect a blog post?_
 
 ## Who I am 
 
-Student studying computer science, hoping to learn about low level programming, security, and maybe some compiler/language design topics.
+Uhhhhh, yea I'm an infosec student at _literally where University_.
-Generally though I just rice my linux distro, play games, or pretend to study so we'll see how far in get one of those thins.
+I'm not very fond of academia thus far but I like learning stuff on my own; x86\_64 and ARM are kinda my things right now.
+Security is primarily my focus as it gives me a chance to... uhhhhh... I like breaking stuff(software) and seeing what happens.
+Making stuff is also lots of fun, especially when done the hard way.
 
 ## What/Why this site? huh?
 
-Because I like to journal things, and when it feels like people could be watching my posts it makes me put some effort into it.
+I like journaling things and when it feels like someone could be reading it feels as though I should think about what I say instead of saying ~~spitting truthbombs~~ random things.
 Not only that but it gives me a weird motivation to actually do projects outside of school since I think "_oh i should update the site with a new post or something_".
-As long as I don't take on a project in a really dumb way I usually finish it up to a point where it is somewhat usable or mildy interesting.
+As long as I don't take on a project in a really dumb way I usually try finishing up to where point where it seems somewhat interesting.
 
 
 ## Things I enjoy
 
 Not being dead or a fern are probably my top two things I enjoy right ahead of not being a wooly sock in siberia as a third. 
 
-
+Honestly I like making stuff in software, _but hardware is also cool(just exepensive_).
+CTF challenges are lots of fun as well, but I've yet to document my findings on one as many have weird rules about sharing, and I feel weird about it as well.

markdown/pages/links.md

@@ -1,6 +1,4 @@
-[![Homepage](../img/banner.png)](../index.html)
+# [Links and places to find me online](../index.html)
-
-# Links and places to find me online
 
 ### Professional Links/Business inquires
 
@@ -8,6 +6,10 @@ I would highly prefer that you contact me via email so that I may get to the mes
 
 * email: alejandros714@protonmail.com
 
+_A quick side note that I am much more active on gitlab than github_
+* Gitlab Account: https://github.com/shockrahwow
+* Github Account: https://gitlab.com/shockrahwow
+
 ### Social Medias Links 
 
 _List of places to contanct me or find me doing random things in general_

markdown/post/bash-1.md

@@ -1,5 +1,4 @@
-[![Homepage](../img/banner.png)](../index.html)
+# [Bash is weird sometimes](../index.html)
-
 
 # Bash is weird sometimes
 

markdown/post/inthefile.md

@@ -0,0 +1,58 @@
+# [In the file](../index.html)
+
+* first draft of this little writing 
+
+## Preamble Note
+Before I go into any detail at all I should mention that in fact this whole post is somewhat of a rant on a pet peeve of mine.
+At the same time I want to discuss why this mostly exists as a problem I have with the """_absolute state_""" of computer science education.
+
+## I'm in the file what now?
+
+I've lost track of how many times this has been thrown my by students learning about the commandline in a \*nix environment. 
+It's not that I loathe this phrasing but, I completely loathe it.
+Something about it feels as though many don't realize that they're not actually saying anything with this phrase.
+It's like going to change your oil and saying, "_alright im in the engine_".
+
+For those trying to learn "the _commandline/terminal_" I have on piece of advice: a directory is a folder.
+To be honest I know this stems from students being taught """_the commandline_""" with literally 0 context given.
+I use a terminal for everything, hell this whole website was built in the termianl but, even I don't know what people mean when they say, "I know the commandline".
+All I know is that they refer to Linux _stuff_ but even then I'm not completely sure what that is supposed to mean.
+
+## The part where I blame academia
+
+How many times has academia managed to fist its way into every crevice of the world with no complaints I'll never know, but I do know it sucks for everyone.
+I say this because for learning theory academia has always been great, structuring that which needed it most.
+For _everything_ outside of that realm, eh.
+
+It seems like at least in CSU Monterey Bay the staff have a hard-on for Unix but have little idea of how to teach it.
+
+### Another section for my prosed solution so its easy find
+
+Stop directly teaching how to use the commandline. 
+Instead setup students in a situation where commandline utilities would be the easiest to setup or the best choice to use.
+
+> B-b-but if we do that they might not do it pro-
+
+_Stop_, they're going to fuck things up regardless, at least this way they'll learn the dumb meme you're targeting but in a practical manner.
+Trust me whatever they end up learning, they _will not_ forget.
+Details sure; everyone forgets details, but at least most students(apart from the stupid ones) will know at least some basic tricks to help them later in (CS) life.
+
+## Pet Peeve
+
+Nearly everytime I help another student with command line _stuff_ I hold back cringe upon hearing the phrase, "_I'm in the file what do i do now????_".
+If anyone can decipher the meaning of this phrase I would love to know but as of right now I'm stumped.
+It reminds of when a mechanic friend of mine told me of how he can't stand hering customers say, "_yea the engine is on the fritz_".
+
+## Filesystems are vry hrd
+
+Recently at my university more and more of the curriculum has been focused on teaching student of the Unix command line environment.
+This entails a few things: 
+
+1. Teach students some basic utility in case they find themselves needing to do some remote work
+2. Exposure to new tools(_more on this point in another section_)
+
+Though the prospect may be enticing its the execution which ruins the whole thing.
+Primarily the problem with teaching unix to students is the lack of context.
+Tools like _Git_, _Bash_, or even an editor like _Nano_ end up being confusing to students for some new arbitrary reason.
+When I say that these things are confusing I mean I've literally had a student ask me, "_What's the point of Git even? I don't get why we're learning this_".
+

markdown/post/mapping.md

@@ -1,4 +1,4 @@
-[![HomePage](../img/banner.png)](../index.html)
+# [Mapping Again](../index.html)
 
 [Link to the map I discuss here](https://steamcommunity.com/sharedfiles/filedetails/?id=1329660201)
 

markdown/post/neatgit.md

@@ -0,0 +1,15 @@
+# [Git and Vim for Notes](../index.html)
+
+It's no fun looking for  a good note-taking program for school since so many of them seem to just kinda succ.
+The good thing however is that you don't really need a good note taking program like you need a good text editor.
+In case you haven't yet considered it, I'll show you how you can make _your favorite text editor_ the comfiest note taker out there.
+Of course I want to also show you how to get your stuff synced between multiple devices, because that's also super useful.
+
+## Editing, Syncing, File Formats Galore
+
+In my case [vim](https://www.vim.org/) is my go-to editor that I use for basically everything. 
+This is partly due to the fact that I am just efficient using it and partly that I have some plugins which make it super nice for basically every type of text editing that I could ever want or need.
+
+There's all sorts of plugins for vim that you can find out in the ether.
+Utilities like spell-checkers, auto-complete, and in the case of this post, _Goyo_, a special plugin to make vim more distraction free to focus on your work.
+

markdown/post/open.md

@@ -1,6 +1,4 @@
-[![Homepage](../img/banner.png)](../index.html)
+# [All done setting up](../index.html)
-
-# All done setting up
 
 Finally after some struggling with various git clients and learning to use some new tools the source code for this website is finally up and hosted on Gitlab.
 

markdown/post/phil.md

@@ -1,6 +1,4 @@
-[![Homepage](../img/banner.png)](../index.html)
+# [No Non-free JS here](../index.html)
-
-# No Non-free JS here
 
 To explain succintly, I don't like Javascript, especially considering how much power it has on a user's browser.
 Namely the issue being that while it used to mainly be focused around making websites look pretty it now also serves to execute malicious code; luckily I don't think that is too common but that fact alone makes JS for me, something which should be avoided. 

markdown/post/qca1.md

@@ -1,6 +1,4 @@
-[![Homepage](../img/banner.png)](../index.html)
+# [Quake Champions Academy Back from the Dead](../index.html)
-
-# Quake Champions Academy Back from the Dead
 
 Finally after nearly a year I've started working on my Quake Chamions Academy project again but this time I have some specific goals in mind besides just, run lots of community events. 
 

markdown/post/qute.md

@@ -1,6 +1,4 @@
-[![Homepage](../img/banner.png)](../index.html)
+# [A Taste of QuteBrowser](../index.html)
-
-# A Taste of QuteBrowser
 
 I finally sat down and started fully using [Qutebrowser](https://www.qutebrowser.org/) and to be honest, it's great. 
 I had tried using it before but I never bothered to learn how to to use it nor did I try to rice it to be liking. 

page/style.css

@@ -13,55 +13,32 @@ html {
 	font-family: 'Freemono';
 	src: url(../fonts/FreeMono.otf);
 }
-/* sick nav bar */
-.topnav {
-	overflow: hidden;
-}
-.topnav a {
-	float: left;
-	display: block;
-	/* text color */
-	color: #f2f2f2;
-	text-align: center;
-	padding: 14px 16px;
-	text-decoration: none;
-	font-size: 17px;
-}
-.topnav a:hover {
-	background-color: #493267;
-	color: #faebd7;
-}
-.active {
-	background-color: #0e1111;
-	color: #faebd7;
-}
-.topnav .icon {
-	display:none;
-}
-/* now some stuff for the text */
 body {
+<<<<<<< HEAD:page/bstyle.css
   /* regular tex color(for the front page it won't matter much since everything is blockquotes*/
   color: #3b444b;
   background-color: #faebd7;
+=======
+  color: #444;
+>>>>>>> struct:page/style.css
   font-family: Fixedsys; 
   font-size: 12px;
   line-height: 1.7;
   padding: 1em;
   margin: auto;
   max-width: 42em;
-  /*background-image: url("./img/backt.png");*/
+  background-image: url("../img/backt.png");
   background-repeat: repeat;
 }
 
 /* Link stuff */
-	/* default link color */
 a {
-  color: #7bb3ff;
+  color: #06e;
   text-decoration: none;
 }
 /* visited link */
 a:visited {
-  color: #9e379f;
+  color: #0047a6;
 }
 /* hovering link */
 a:hover {
@@ -98,6 +75,7 @@ a::selection {
 
 p {
   margin: 1em 0;
+  color: #969696;
 }
 
 img {
@@ -105,7 +83,7 @@ img {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  color: #493267;
+  color: #e1e1e1;
   line-height: 125%;
   margin-top: 2em;
   font-weight: normal;
@@ -141,11 +119,15 @@ h6 {
 }
 
 blockquote {
+<<<<<<< HEAD:page/bstyle.css
   /* this bit for the text color */
   color: #3b444b;
+=======
+  color: #d8d8d8;
+>>>>>>> struct:page/style.css
   margin: 0;
   padding-left: 3em;
-  border-left: 0.5em #493267 solid;
+  border-left: 0.5em #008fae solid;
 }
 
 hr {
@@ -159,10 +141,10 @@ hr {
 }
 
 pre, code, kbd, samp {
-  background-color: lightblue;
+  background-color: #000;
   border-radius: 8px; 
   padding: 8px;
-  color: #000;
+  color: #00cc03;
   font-family: Freemono, monospace, monospace;
   _font-family: 'courier new', monospace;
   font-size: 0.98em;
@@ -213,7 +195,7 @@ sub {
 ul, ol {
   margin: 1em 0;
   padding: 0 0 0 2em;
-  color: #a3a3a3;
+  color: #858585;
 }
 
 li p:last-child {

post/style.css

@@ -13,55 +13,32 @@ html {
 	font-family: 'Freemono';
 	src: url(../fonts/FreeMono.otf);
 }
-/* sick nav bar */
-.topnav {
-	overflow: hidden;
-}
-.topnav a {
-	float: left;
-	display: block;
-	/* text color */
-	color: #f2f2f2;
-	text-align: center;
-	padding: 14px 16px;
-	text-decoration: none;
-	font-size: 17px;
-}
-.topnav a:hover {
-	background-color: #493267;
-	color: #faebd7;
-}
-.active {
-	background-color: #0e1111;
-	color: #faebd7;
-}
-.topnav .icon {
-	display:none;
-}
-/* now some stuff for the text */
 body {
+<<<<<<< HEAD:post/bstyle.css
   /* regular tex color(for the front page it won't matter much since everything is blockquotes*/
   color: #3b444b;
   background-color: #faebd7;
+=======
+  color: #444;
+>>>>>>> struct:post/style.css
   font-family: Fixedsys; 
   font-size: 12px;
   line-height: 1.7;
   padding: 1em;
   margin: auto;
   max-width: 42em;
-  /*background-image: url("./img/backt.png");*/
+  background-image: url("../img/backt.png");
   background-repeat: repeat;
 }
 
 /* Link stuff */
-	/* default link color */
 a {
-  color: #7bb3ff;
+  color: #06e;
   text-decoration: none;
 }
 /* visited link */
 a:visited {
-  color: #9e379f;
+  color: #0047a6;
 }
 /* hovering link */
 a:hover {
@@ -98,6 +75,7 @@ a::selection {
 
 p {
   margin: 1em 0;
+  color: #969696;
 }
 
 img {
@@ -105,7 +83,7 @@ img {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  color: #493267;
+  color: #e1e1e1;
   line-height: 125%;
   margin-top: 2em;
   font-weight: normal;
@@ -141,11 +119,15 @@ h6 {
 }
 
 blockquote {
+<<<<<<< HEAD:post/bstyle.css
   /* this bit for the text color */
   color: #3b444b;
+=======
+  color: #d8d8d8;
+>>>>>>> struct:post/style.css
   margin: 0;
   padding-left: 3em;
-  border-left: 0.5em #493267 solid;
+  border-left: 0.5em #008fae solid;
 }
 
 hr {
@@ -159,10 +141,10 @@ hr {
 }
 
 pre, code, kbd, samp {
-  background-color: lightblue;
+  background-color: #000;
   border-radius: 8px; 
   padding: 8px;
-  color: #000;
+  color: #00cc03;
   font-family: Freemono, monospace, monospace;
   _font-family: 'courier new', monospace;
   font-size: 0.98em;
@@ -213,7 +195,7 @@ sub {
 ul, ol {
   margin: 1em 0;
   padding: 0 0 0 2em;
-  color: #a3a3a3;
+  color: #858585;
 }
 
 li p:last-child {

rebuild.sh

@@ -0,0 +1,17 @@
+# Because sometimes you just have to rebuild everything
+rootDir='./_site/'
+post() {
+	for file in ./markdown/post/*
+	do
+		fileName=$(basename $file)
+		pandoc $file --css style.css -s -o $rootDir/post/${fileName%.*}.html
+	done
+}
+
+page() {
+	for file in ./markdown/pages/*
+	do
+		pandoc $file --css style.css -s -o $rootDir/page/${fileName%.*}.html
+	done
+}
+"$@"

style.css

@@ -49,12 +49,10 @@ body {
   padding: 1em;
   margin: auto;
   max-width: 42em;
-  /*background-image: url("./img/backt.png");*/
-  background-repeat: repeat;
 }
 
 /* Link stuff */
-	/* default link color */
+/* default link color */
 a {
   color: #7bb3ff;
   text-decoration: none;
@@ -98,6 +96,7 @@ a::selection {
 
 p {
   margin: 1em 0;
+  color: #F1C6A7;
 }
 
 img {
@@ -145,7 +144,7 @@ blockquote {
   color: #3b444b;
   margin: 0;
   padding-left: 3em;
-  border-left: 0.5em #493267 solid;
+  border-left: 0.5em #008fae solid;
 }
 
 hr {
@@ -159,10 +158,10 @@ hr {
 }
 
 pre, code, kbd, samp {
-  background-color: lightblue;
+  background-color: #000;
-  border-radius: 8px; 
+  /*border-radius: 8px; */
-  padding: 8px;
+  padding: 4px;
-  color: #000;
+  color: #EECA3E;
   font-family: Freemono, monospace, monospace;
   _font-family: 'courier new', monospace;
   font-size: 0.98em;