Merge branch 'master' of gitlab.com:shockrah/shockrah-city

This commit is contained in:
shockrah 2020-02-20 12:43:39 -08:00
commit 4d052ac79b
17 changed files with 93 additions and 9 deletions

11
.gitattributes vendored Normal file
View File

@ -0,0 +1,11 @@
img/favicon.png filter=lfs diff=lfs merge=lfs -text
img/werks.png filter=lfs diff=lfs merge=lfs -text
img/atx/before.jpg filter=lfs diff=lfs merge=lfs -text
img/atx/finished.jpg filter=lfs diff=lfs merge=lfs -text
img/atx/fio.jpg filter=lfs diff=lfs merge=lfs -text
img/atx/hddfinal.jpg filter=lfs diff=lfs merge=lfs -text
img/atx/hdd.jpg filter=lfs diff=lfs merge=lfs -text
img/atx/mbtest.jpg filter=lfs diff=lfs merge=lfs -text
img/atx/psutest.jpg filter=lfs diff=lfs merge=lfs -text
img/atx/rack.jpg filter=lfs diff=lfs merge=lfs -text
img/desktop/dwm-pop.png filter=lfs diff=lfs merge=lfs -text

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 130 B

BIN
img/desktop/dwm-pop.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 130 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 130 B

1
make
View File

@ -74,6 +74,7 @@ while getopts ":aslrhp:" opt;do
post './prebuild/about.md'
post './prebuild/links.md'
post './prebuild/index.md'
post './prebuild/stream.md'
exit 0
;;
p)

60
prebuild/post/pop-dwm.md Normal file
View File

@ -0,0 +1,60 @@
# DWM and POP!\_OS
## tl;dr
Make a `/usr/share/xsessions/dwm.desktop` file with contents listed below and a /comfy/ script.
## Doing the thing tho
1. We need a `/usr/share/xsession/dwm.desktop` file. Mine looks like this:
```
[Desktop Entry]
Name=DWM
Comment=This session logs in to DWM
Exec=/home/shockrah/Rice/dwm-launcher.sh
Type=Application
```
Nothing to crazy its basically a `toml` config with an executable as the entry point of the DE.
For reference here's the official Pop OS config:
```
[Desktop Entry]
Name=Pop
Comment=This session logs you into Pop
Exec=env GNOME_SHELL_SESSION_MODE=pop /usr/bin/gnome-session --systemd --session=pop
TryExec=/usr/bin/gnome-shell
Type=Application
DesktopNames=pop:GNOME
X-GDM-SessionRegisters=true
X-Ubuntu-Gettext-Domain=gnome-session-3.0
```
This time there's more fluff but you can ignore it for the most part(I think).
2. Now let's look at that script I have have [/home/shockrah/Rice/dwm-launcher.sh]:
```sh
#!/bin/sh
# This script is used to mimic an xinitrc to some degree
set -x
eval `ssh-agent`
compton --backend glx --xrender-sync --xrender-sync-fence -b
bright 50 DWM# custom brightness script
feh --randomize --bg-fill ~/Pictures/Papes/* &
statline &
exec dwm
```
Nothing crazy right? Yeap that's it really to setup DWM with any changes you might have easily with Pop OS.
In case you're wondering here's what my setup currently looks like:
![Background Images I found on /wg/](/img/desktop/dwm-pop.png)

15
prebuild/stream.md Normal file
View File

@ -0,0 +1,15 @@
# Twitch Stream
<iframe src="https://player.twitch.tv/?channel=shockrah" frameborder="0" allowfullscreen="true" scrolling="no" height="378" width="620"></iframe>
# Latest Interesting highlight
Cool skip that I found that ended up being really hard to setup let alone execute.
<div style="width: 100%; height: 0px; position: relative; padding-bottom: 56.250%;"><iframe src="https://streamable.com/s/b4h2r/wtdgkb" frameborder="0" width="100%" height="100%" allowfullscreen style="width: 100%; height: 100%; position: absolute;"></iframe></div>
# Various Social Media's
> Discord: `shockrah#2647`
<blockquote>Mastadon: <a href="https://qoto.org/@shockrah">https://qoto.org/@shockrah</a></blockquote>

View File

@ -1,9 +0,0 @@
<div class="topnav" id="myTopnav">
<a href="#home" class="active">Home</a>
<a href="https://gitlab.com/shockrahwow">Site Source</a>
<a href="./page/links.html">Contact</a>
<a href="./page/about.html">About</a>
<i class="fa fa-bars"></i>
</a>
</div>

View File

@ -22,6 +22,9 @@
<li class="pure-menu-item">
<a class="pure-menu-link" href="/links.html">Links</a>
</li>
<li class="pure-menu-item">
<a class="pure-menu-link" href="/stream.html">Stream</a>
</li>
</ul>
</div>
</div>