CHANGELOG.md

@@ -4,63 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.8.1] - 2021-11-28
-### Added
-- Alias with proxy for PIP to [Bash Config](home/.bashrc)
-
-## [1.8.0] - 2021-11-27
-### Added
-- [Polish Readme](README.pl.md).
-
-## [1.7.10] - 2021-11-26
-### Added
-- Missing date to [Changelog](CHANGELOG.md)
-
-## [1.7.9] - 2021-11-26
-### Changed
-- Names of some sections into questions in [Readme](README.md)
-
-## [1.7.8] - 2021-11-25
-### Added
-- Proxy for Git protocol to [Git Config](home/.config/git/config)
-- git-proxy script.
-
-## [1.7.7] - 2021-11-23
-### Changed
-- Style of some aliases in [Git Config](home/.config/git/config)
-
-## [1.7.6] - 2021-11-22
-### Added
-- Code to include secret config in [Bash Config](home/.bashrc)
-
-## [1.7.5] - 2021-11-22
-### Added
-- Timeout to SSH agent in [Bash Config](home/.bashrc)
-
-## [1.7.4] - 2021-11-22
-### Added
-- Proxy for Lokinet to [SSH Config](home/.ssh/config)
-
-## [1.7.3] - 2021-11-19
-### Added
-- Proxy for Lokinet to [Git Config](home/.config/git/config)
-
-## [1.7.2] - 2021-11-19
-### Added
-- Alias to [Git Config](home/.config/git/config)
-
-## [1.7.1] - 2021-11-19
-### Fixed
-- Alias in [Git Config](home/.config/git/config)
-
-## [1.7.0] - 2021-11-19
-### Added
-- [I2PD Config](home/.i2pd/i2pd.conf)
-
-## [1.6.2] - 2021-11-17
-### Added
-- Code to include secret config in [Tor Config](usr/etc/tor/torrc)
-
 ## [1.6.1] - 2021-11-17
 ### Changed
 - Disabled NoExec and Sandbox in [Tor Config](usr/etc/tor/torrc)

README.md

@@ -1,5 +1,3 @@
-[Polski](README.pl.md)
-
 # dotfiles
 
 Repository with my dotfiles.
@@ -7,11 +5,11 @@ Repository with my dotfiles.
 ## Contents
 
 * [Configuration Files](#configuration-files)
-* [How to download?](#how-to-download)
+* [Downloading](#downloading)
   * [Using Git](#using-git)
   * [Using Curl](#using-curl)
   * [Using Wget](#using-wget)
-* [How to install?](#how-to-install)
+* [Installation](#installation)
 * [Contact](#contact)
 * [License](#license)
 
@@ -20,14 +18,13 @@ Repository with my dotfiles.
 * [Bash](http://www.gnu.org/software/bash/) - [
 .bashrc](home/.bashrc)
 * [Git](https://git-scm.com/) - [config](home/.config/git/config)
-* [I2PD](https://i2pd.website/) - [i2pd.conf](home/.i2pd/i2pd.conf)
 * [SSH](https://www.openssh.com/) - [config](home/.ssh/config)
 * [Termux](https://termux.com/) - [termux.properties](home/.termux/termux.properties)
 * [Tmux](https://github.com/tmux/tmux) - [.tmux.conf](home/.tmux.conf)
 * [Tor](https://www.torproject.org/) - [torrc](usr/etc/tor/torrc)
 * [Vim](https://www.vim.org/) - [.vimrc](home/.vimrc)
 
-## How to download?
+## Downloading
 
 ### Using Git
 
@@ -41,7 +38,7 @@ Repository with my dotfiles.
 
     wget -O - https://codeberg.org/PandaCoderPL/dotfiles/archive/main.tar.gz | tar -xzf -
 
-## How to install?
+## Installation
 
     rsync -qa home/ ~/
 

README.pl.md

@@ -1,54 +0,0 @@
-[English](README.md)
-
-# dotfiles
-
-Repozytorium z moimi plikami konfiguracyjnymi.
-
-## Contents
-
-* [Pliki konfiguracyjne](#pliki-konfiguracyjne)
-* [Jak pobrać?](#jak-pobrać)
-  * [Używając Git](#używając-git)
-  * [Używając Curl](#używając-curl)
-  * [Używając Wget](#używając-wget)
-* [Jak zainstalować?](#jak-zainstalować)
-* [Kontakt](#kontakt)
-* [Licencja](#licencja)
-
-## Pliki konfiguracyjne
-
-* [Bash](http://www.gnu.org/software/bash/) - [
-.bashrc](home/.bashrc)
-* [Git](https://git-scm.com/) - [config](home/.config/git/config)
-* [I2PD](https://i2pd.website/) - [i2pd.conf](home/.i2pd/i2pd.conf)
-* [SSH](https://www.openssh.com/) - [config](home/.ssh/config)
-* [Termux](https://termux.com/) - [termux.properties](home/.termux/termux.properties)
-* [Tmux](https://github.com/tmux/tmux) - [.tmux.conf](home/.tmux.conf)
-* [Tor](https://www.torproject.org/) - [torrc](usr/etc/tor/torrc)
-* [Vim](https://www.vim.org/) - [.vimrc](home/.vimrc)
-
-## Jak pobrać?
-
-### Używając Git
-
-    git clone --depth=1 git://codeberg.org/PandaCoderPL/dotfiles.git
-
-### Używając Curl
-
-    curl -L https://codeberg.org/PandaCoderPL/dotfiles/archive/main.tar.gz | tar -xzf -
-
-### Używając Wget
-
-    wget -O - https://codeberg.org/PandaCoderPL/dotfiles/archive/main.tar.gz | tar -xzf -
-
-## Jak zainstalować?
-
-    rsync -qa home/ ~/
-
-## Kontakt
-
-[Kontakt](https://codeberg.org/PandaCoderPL/PandaCoderPL#contact)
-
-## Licencja
-
-[MIT](LICENSE)

VERSION

@@ -1 +1 @@
-1.8.1
+1.6.1

home/.bashrc

@@ -1,7 +1,7 @@
 # Tmux
 if [[ -z "${TMUX}" ]]; then
     if ! tmux has-session; then
-        eval $(ssh-agent -st 1h)
+        eval $(ssh-agent)
         tmux new-session -n calculator bc -iq
     else
         tmux new-window
@@ -12,7 +12,6 @@ fi
 # Config
 alias bashconfig='vim ${HOME}/.bashrc'
 alias gitconfig='git config --global --edit'
-alias i2pdconfig='vim ${HOME}/.i2pd/i2pd.conf'
 alias sshconfig='vim ${HOME}/.ssh/config'
 alias termuxconfig='vim ${HOME}/.termux/termux.properties'
 alias tmuxconfig='vim ${HOME}/.tmux.conf'
@@ -26,6 +25,3 @@ alias lh='l --human-readable'
 alias ll='lh -l'
 alias la='ll --all'
 alias paste='termux-clipboard-paste'
-alias pip='pip --proxy "socks5h://${RANDOM}:${RANDOM}@127.0.0.1:9050"'
-
-source ~/.bashrc-secret

home/.config/git/config

@@ -1,10 +1,9 @@
 [alias]
 	a = add
-	ae = a -e
 	ba = branch
 	bach = "!f() { \
-		git ba \"$1\" \
+		git ba \"$1\" && \
-		&& git ch \"$1\"; \
+		git ch \"$1\"; \
 		}; f"
 	bd = ba -d
 	bfd = ba -D
@@ -19,15 +18,15 @@
 		}; f"
 	cota = "!f() { \
 		local version=\"v$(cat VERSION)\"; \
-		git co \"$1\" \
+		git co \"$1\" && \
-		&& git ta \"${version}\"; \
+		git ta \"${version}\"; \
 		}; f"
 	fu = "!f() { \
-		git fetch upstream \
+		git fetch upstream && \
-		&& git ch master \
+		git ch master && \
-		&& git rebase upstream/master; \
+		git rebase upstream/master; \
 		}; f"
-	fup = !git fu && git pat
+	fup = fu && p
 	p = push
 	pa = push --all
 	pt = push --tags
@@ -50,7 +49,6 @@
 	gpgSign = true
 [core]
 	editor = vim
-	gitProxy = git-proxy
 	pager = less
 [include]
 	path = ~/.config/git/config-secret
@@ -58,8 +56,6 @@
 	defaultBranch = main
 [http]
 	proxy = socks5h://127.0.0.1:9050
-[http "http://*.loki"]
-	proxy =
 [tag]
 	forceSignAnnotated = true
 	gpgSign = true

home/.i2pd/i2pd.conf

@@ -1,10 +0,0 @@
-daemon = false
-ipv4 = true
-ipv6 = true
-share = 100
-[http]
-enabled = false
-[httpproxy]
-port = 4444
-[socksproxy]
-port = 4447

home/.ssh/config

@@ -1,6 +1,3 @@
-Host *.loki
-ProxyCommand nc %h %p
-
 Host *
 AddKeysToAgent yes
 HashKnownHosts yes

usr/bin/git-proxy

@@ -1 +0,0 @@
-nc -X 5 -x 127.0.0.1:9050 $1 $2

usr/etc/tor/torrc

@@ -19,5 +19,3 @@ DownloadExtraInfo 0
 EnforceDistinctSubnets 1
 SocksPort 9050 IsolateClientAddr IsolateSOCKSAuth IsolateClientProtocol IsolateDestPort IsolateDestAddr
 UseEntryGuards 1
-
-%include /data/data/com.termux/files/usr/etc/tor/torrc-secret