Distant Horizons v2.0.0
(and up) shader compatibility information.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# make sure we're not on Wayland, because xrandr doesn't work on Wayland | |
if [ "$(loginctl show-session $(loginctl user-status $USER | grep -E -m 1 'session-[0-9]+\.scope' | sed -E 's/^.*?session-([0-9]+)\.scope.*$/\1/') -p Type | grep -ic "wayland")" -ge 1 ]; then # stolen from stackoverflow | |
echo "You aren't using X!" | |
exit | |
fi | |
# no more annoying cursor | |
tput civis |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/env python3 | |
'''VGASimulator.py - Pedro José Pereira Vieito © 2016 | |
View VGA output from a VHDL simulation. | |
Ported from VGA Simulator: | |
https://github.com/MadLittleMods/vga-simulator | |
by Eric Eastwood <[email protected]> | |
More info about how to generate VGA output from VHDL simulation here: | |
http://ericeastwood.com/blog/8/vga-simulator-getting-started |
Use case: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:
- preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
- actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location
NB: Check out git subtree
/git submodule
and this Stack Overflow question before going through the steps below. This gist is just a record of how I solved this problem on my own one day.
Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.