summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarlonivo <email@marlonivo.xyz>2024-10-02 08:36:24 +0000
committermarlonivo <email@marlonivo.xyz>2024-10-02 08:36:24 +0000
commitfaa0517450ab92b9c9f165e9f428a451aa0a84fa (patch)
treed7262b0c0e8187ebb4267a8b74b2b77c29bf9f65
parent7857769884359a47d927d398495031dfb54376e0 (diff)
UpdateHEADmain
-rw-r--r--.gitignore2
-rw-r--r--README.md44
-rw-r--r--hosts.txt4
-rw-r--r--lazy-hosts8
-rw-r--r--readme.md41
5 files changed, 32 insertions, 67 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ef5c6d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.directory
+
diff --git a/README.md b/README.md
index 2894e46..7f9144e 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,35 @@
### 🟧 Installation & Update:
-I have a `lazy-hosts` script for lazy humans and a quick chain-command to make use of it, it will:
-
-1. Rewrite your `/etc/hosts` file.
-2. Place a script in `/usr/bin` to autimatically update, when you do a system-wide-update.
-3. Delete the `hosts` folder for you
-4. Dont forget to reboot afterwards
+If youre a lazy-linuxer, use this command:
```
git clone https://github.com/marlonivo/hosts.git && cd hosts && chmod +x lazy-hosts && lazy-hosts && rm -r hosts
```
-### 🟦 Blocklist:
+1. `git clone https://github.com/marlonivo/hosts.git` - Downloads repo
+2. `cd hosts && chmod +x lazy-hosts && lazy-hosts` - Uses this script to:
+ 1. Overwrite your `/etc/hosts`
+ 2. Puts itself to `/usr/bin`
+ 3. Every update it will merge repos and keep `/etc/hosts` clean (no comments/empty lines)
+3. `rm -r hosts` - Deletes repo from $HOME
+4. Dont forget to reboot
+
+### 🟦 Lists:
-When you use vim you can type `/`, to search for the individual parts:
+Open `/etc/hosts` with vim and press `:/` to search for:
-1. **Personal Extras**: Add your own Stuff here
-2. **Luke Smith's general-junk List**: [GitHub Link](https://github.com/LukeSmithxyz/etc/blob/master/ips)
-3. **dan.me.uk's tor-exit-node List**: [Website Link](https://www.dan.me.uk/torlist/?full) ❗ THIS WILL TOR BROWSER NOT ABLE TO CONNECT ANYMORE
-4. **columndeeply 10 million-line-porn-block List**: [Github Link](https://github.com/columndeeply/hosts)
+1. **Personal List**: Your stuff
+2. **Luke Smith's List**: [Link](https://github.com/LukeSmithxyz/etc/blob/master/ips)
+3. **dan.me.uk's List**: [Link](https://www.dan.me.uk/torlist/?full) ❗TOR WILL NOT CONNECT ANYMORE
+4. **columndeeply's List**: [Link](https://github.com/columndeeply/hosts)
### 🟩 Devices:
#### Linux:
-Assuming youre not lazy, dont use the `lazy-hosts` script, manually place the list in `/etc/hosts`, delete the folder and keep it updated yourself.
```bash
-cd hosts && sudo cat hosts >> /etc/hosts && rm -r hosts
+sudo cat hosts >> /etc/hosts
```
#### Windows:
@@ -35,21 +37,23 @@ cd hosts && sudo cat hosts >> /etc/hosts && rm -r hosts
Place the domains in `C:\Windows\System32\drivers\etc\hosts`.
#### Android :
-1. Install `adb`:
+1. Activate `USB debugging` and `Rooted debugging` on your phone
+2. Install `adb`, on your computer:
+
```
sudo pacman -S adb
```
-2. Plug phone into your computer.
-3. Run the following commands:
+3. Plug phone into computer.
+4. Run these commands:
```
adb root
adb remount
adb push /etc/hosts /system/etc
```
-#### iPhone (irreversible workaround):
+#### iPhone (irreversible):
1. Go to `Settings > Screen Time > Communication Security`
-2. Turn on filters for sensitive content and enter a password blindly.
-3. This is a pretty good blocklist, you dont need to worry to stumple upon porn related content.
+2. Turn on `filters for sensitive content` and enter a password blindly.
+3. This can be changed unless you call the apple's service center.
### 🟦 License: MIT
diff --git a/hosts.txt b/hosts.txt
index a708b61..4121be7 100644
--- a/hosts.txt
+++ b/hosts.txt
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:755b51c0913a198bc5f4335908c39ad156d11f62046156e4e1229c66771256ea
-size 392322711
+oid sha256:00cbdcf06afc0ca458f0e3414ee76e9300717eb662cd828862e843d5ded7207a
+size 392322623
diff --git a/lazy-hosts b/lazy-hosts
index b339c52..d249392 100644
--- a/lazy-hosts
+++ b/lazy-hosts
@@ -1,15 +1,15 @@
#!/bin/bash
-# Entferne alle Einträge nach der Markierung '# columndeeply's hosts list'
+# Cleaning
sudo sed -i '/# columndeeply\'s hosts list/,$d' /etc/hosts
-# Repository klonen
+# Cloning
git clone https://github.com/columndeeply/hosts.git
-# Neue Einträge hinzufügen
+# Merging
echo "# columndeeply's hosts list" | sudo tee -a /etc/hosts
cat /home/artix/hosts/hosts00 /home/artix/hosts/hosts01 /home/artix/hosts/hosts02 /home/artix/hosts/hosts03 /home/artix/hosts/hosts04 | sudo tee -a /etc/hosts
echo "# END columndeeply's hosts list" | sudo tee -a /etc/hosts
-# Verzeichnis löschen
+# Deleting
rm -rf
diff --git a/readme.md b/readme.md
deleted file mode 100644
index 62e1377..0000000
--- a/readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-### Update Blocklist:
-The script in `sync-hosts` can be used to update the Blocklist, just type in the terminal:
-```
-sync-hosts
-```
-
-### Blocklist Includes:
-1. **Personal Extras**
-2. **Luke Smith's General Junk List**: [GitHub Link](https://github.com/LukeSmithxyz/etc/blob/master/ips) [no further updates]
-3. **dan.me.uk's Tor Exit Node List**: [dan.me.uk Link](https://www.dan.me.uk/torlist/?full) [further updates] ❗ THIS WILL TOR BROWSER NOT ABLE TO CONNECT ANYMORE
-4. **columndeeply 10 Million Porn List**: [Github Link](https://github.com/columndeeply/hosts) [further updates]
-
-
-### Where to Place the Domains:
-
-#### Linux:
-Place the domains in `/etc/hosts`:
-```bash
-sudo /etc/hosts
-```
-
-#### Windows (with administrator privileges):
-Place the domains in `C:\Windows\System32\drivers\etc\hosts`.
-
-##### Android (Developer tools and USB debugging must be turned on):
-1. Install `adb`:
- ```
- sudo pacman -S adb
- ```
-2. Plug the phone into the laptop.
-3. Run the following commands:
- ```
- adb root
- adb remount
- adb push /etc/hosts /system/etc
- ```
-
-##### iPhone (Irreversible):
-1. Go to `Settings > Screen Time > Communication Security`.
-2. Turn on filters for sensitive content and enter a password blindly.
-