Merge branch 'home' into 'master'

Home

See merge request !11

.gitignore

@@ -1,6 +1,3 @@
 *~
+st
 fixscreens.sh
-st-*
-run-sway.sh
-*-local
-

.gitmodules

@@ -4,3 +4,9 @@
 [submodule "tmuxcompose"]
 	path = tmuxcompose
 	url = https://github.com/truck/tmuxcompose
+[submodule "fonts/codeface"]
+	path = fonts/codeface
+	url = https://github.com/chrissimpkins/codeface
+[submodule "powerline-shell"]
+	path = powerline-shell
+	url = https://github.com/banga/powerline-shell.git

NF_pick.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
-F=$(dmenu -i -l 18 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true' < ~/bin/nflist)
-C=$(ls ~/bin/st* |dmenu -l 8 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true')
+#!/bin/zsh
+F=`dmenu -l 18 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true' < ~/bin/nflist`
+C=`ls ~/bin/st* |dmenu -l 8 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true'`
 ${C} -f "${F}"

README.md

@@ -1,33 +1,19 @@
 HOME version (not server)
 ---
 
-## Stuff.
-
+Stuff.
 Stuff I use, which I continue to update
  * and then have to recreate on another box
  * or have to copy from the work box
  * or all sorts of similar loss of time/debugging.
 
-In the past year, I've used this in 2 different jobs, many different server setups, and tons of home setups.  It's been very helpful to have it.
+DMG's fonts are here also ( http://www.trueschool.se ) - Powerline versions are just patched versions of these.
 
+my "randterm" and "amigaterm2" term scripts (urxvt) + a few other term launches (awesome menu/keylaunch)
 
+zshrc bits... now with zgen! \o/
 
 - this generally gets put in ~/bin/ - some bits (like zshrc) needs to be moved to ~ . Fonts to .fonts obviously.
 
-I have a few scripts (ansible) that use this and set things up, and there are 2 versions:
+and as I add stuff I may comment...
 
-# server
- 
- - includes emacs, git, tmux, and zsh setup things.
- - probably need to move the banga-powerline bit in here as well, as I always install it.
- - tmux setup will likely change soon to be a combination of mine and gpakosz's very good version.
- -- I just can't use his version as is; it is optimized for vi keys, and I do emacs keys. Ctrl-a. (:
- - zshrc bits... now with zgen! \o/
-# home
-
-The stuff from server, plus:
- - X enabled stuff.  Terminal launchers, fonts...
- - DMG's fonts are here also ( http://www.trueschool.se ) - Powerline versions are just patched versions of these.
- - my "randterm" and "amigaterm2" term scripts (urxvt) + a few other term launches (awesome menu/keylaunch)
- - similar launchers for st (which I am using more.)
- 

aliases

@@ -1,15 +1,30 @@
 ruler() { for s in '....^....|' '1234567890'; do w=${#s}; str=$( for (( i=1; $i<=$((($COLUMNS + $w) / $w )) ; i=$i+1 )); do echo -n $s; done ); str=$(echo $str | cut -c -$COLUMNS) ; echo $str; done; }
 
+surftabbednoads() {
+  http_proxy=192.168.42.5:8118 tabbed -r2 surf -e -a@Aa -BDfg
+}
+
+surftabbed() {
+	 tabbed -r2 surf -e -a@Aa -BDfg
+}
+
 mktruckdir() {
-    USER=$(whoami)
-    sudo mkdir ${1}
-    sudo chown ${USER}:${USER} ${1}
+	sudo mkdir ${1}
+	sudo chown truck:truck ${1}
+}
+
+shitwin() {
+	xfreerdp2 /u:"Andrew Holland" +clipboard /jpeg /size:1918x1044 /v:192.168.1.92 /bpp:32	
+}
+
+firewall-ssh() {
+	badssh -oKexAlgorithms=+diffie-hellman-group1-sha1 ntcadmin@77.86.234.126
 }
 
 randmac() {
-    dd if=/dev/urandom bs=4096 count=1 2>/dev/null | sha1sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
+	dd if=/dev/urandom bs=4096 count=1 2>/dev/null | sha1sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
 }
 
 randmacxen() {
-    dd if=/dev/urandom bs=4096 count=1 2>/dev/null | sha1sum| sed 's/^\(..\)\(..\)\(..\).*$/00:16:3E:\1:\2:\3'/
+	dd if=/dev/urandom bs=4096 count=1 2>/dev/null | sha1sum| sed 's/^\(..\)\(..\)\(..\).*$/00:16:3E:\1:\2:\3'/
 }

amigaterm.sh

@@ -1,2 +1,2 @@
-#!/bin/sh
-~/bin/amigaterm2.sh 10 navy 80 orange green "$@"
+#!/bin/zsh
+~/bin/amigaterm2.sh 10 navy 80 orange green $@

amigaterm2.sh

@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/zsh
 # help shit
-if [ "$1" = '-h' ]; then
-    echo Help: "$0" fontsize tintcolor fadepercent fadecolor cursorcolor extrashit
+if [[ $1 == '-h' ]]; then
+    echo Help: $0 fontsize tintcolor fadepercent fadecolor cursorcolor extrashit
 else
 #TP="TopazPlus a600a1200a4000 for Powerline-$1"
-    TP="xft:Topaza500a1000a2000 NF-${1}:antialias=false,xft:Symbola-${1}:antialias=false"
+    TP="xft:TopazPlus a500a1000a2000 for Powerline-${1}:antialias=false,xft:Symbola-${1}:antialias=false"
     PN="xft:P0T\-NOoDLE for Powerline-${1}"
     MS="xft:mOsOul for Powerline-${1}"
     MK="xft:MicroKnightPlus for Powerline-${1}"
@@ -14,21 +14,21 @@ else
     CURSORCOLOR=$5
 # get rid of these arguments so we can do the rest at the end
     shift 5
-echo    urxvtc -fn \""${TP}"\" -fi \""${PN}"\" -fb \""${MS}"\" -fbi \""${MK}"\" \
-	-tint \""${TINTCOLOR}"\" -fade \""${FADEPERCENT}"\" \
-        -fadecolor \""${FADECOLOR}\"" -cr \""${CURSORCOLOR}"\" \
-	-rv -tr -sb -sr -g 80x24 +is -tn \""xterm-256color"\" "$@"
+echo    urxvtc -fn \"${TP}\" -fi "${PN}" -fb \"${MS}\" -fbi \"${MK}\" \
+	-tint \"${TINTCOLOR}\" -fade \"${FADEPERCENT}\" \
+        -fadecolor \"${FADECOLOR}\" -cr \"${CURSORCOLOR}\" \
+	-rv -tr -sb -sr -g 80x24 +is -tn \"xterm-256color\" $@
 
     urxvtc -fn "${TP}" -fi "${PN}" -fb "${MS}" -fbi "${MK}" \
 	-tint "${TINTCOLOR}" -fade "${FADEPERCENT}" \
         -fadecolor "${FADECOLOR}" -cr "${CURSORCOLOR}" \
-	-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" "$@"
- 
-    if [ $? != 0 ]; then
+	-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
+
+    if [[ $? != 0 ]]; then
 	    urxvtd -f -o
 	    urxvtc -fn "${TP}" -fi "${PN}" -fb "${MS}" -fbi "${MK}" \
 		-tint "${TINTCOLOR}" -fade "${FADEPERCENT}" \
 		-fadecolor "${FADECOLOR}" -cr "${CURSORCOLOR}" \
-		-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" "$@"
+		-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
     fi
 fi

amigaterm3.sh

@@ -0,0 +1,34 @@
+#!/bin/zsh
+# help shit
+if [[ $1 == '-h' ]]; then
+    echo Help: $0 fontsize tintcolor fadepercent fadecolor cursorcolor extrashit
+else
+#TP="xft:TopazPlus a600a1200a4000-$1"
+    TP="xft:TopazPlus a600a1200a4000-$1:antialias=false"
+    PN="xft:P0T\-NOoDLE-$1"
+    MS="xft:mOsOul-$1"
+    MK="xft:Microknight-$1"
+    TINTCOLOR=$2
+    FADEPERCENT=$3
+    FADECOLOR=$4
+    CURSORCOLOR=$5
+# get rid of these arguments so we can do the rest at the end
+    shift 5
+echo    urxvtc -fn "$TP" -fi "$PN" -fb "$MS" -fbi "$MK" \
+	-tint "$TINTCOLOR" -fade "$FADEPERCENT" \
+        -fadecolor "$FADECOLOR" -cr "$CURSORCOLOR" \
+	-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
+
+    urxvtc -fn "$TP" -fi "$PN" -fb "$MS" -fbi "$MK" \
+	-tint "$TINTCOLOR" -fade "$FADEPERCENT" \
+        -fadecolor "$FADECOLOR" -cr "$CURSORCOLOR" \
+	-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
+
+    if [[ $? != 0 ]]; then
+	    urxvtd -f -o
+	    urxvtc -fn "$TP" -fi "$PN" -fb "$MS" -fbi "$MK" \
+		-tint "$TINTCOLOR" -fade "$FADEPERCENT" \
+		-fadecolor "$FADECOLOR" -cr "$CURSORCOLOR" \
+		-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
+    fi
+fi

badssh

@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/zsh
 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${@}"
 

bemenu-run-mine

@@ -1,6 +0,0 @@
-#!/bin/sh
-BEMENU_BACKEND=wayland bemenu-run \
- -m -1 \
- --fn 'Berkelium 64 16' \
-  $@
-

blgterm.sh

@@ -1,8 +1,5 @@
-#!/bin/sh
-urxvtc -fn "xft:Topaza600a1200a400 NF:antialias=true" \
-       -fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
-       +is -fg black \
-       -bg lightgrey \
-       -cr orange "$@"
-
-
+urxvtc -fn "xft:TopazPlus a600a1200a4000-:antialias=false" \
+-fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
++is -fg black \
+-bg lightgrey \
+-cr orange

byterm.sh

@@ -1,7 +1,5 @@
-#!/bin/sh
-urxvtc -fn "xft:Topaza600a1200a400 NF:antialias=true" \
-       -fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
-       +is -fg yellow \
-       -bg navy \
-       -cr firebrick "$@"
-
+urxvtc -fn "xft:TopazPlus a600a1200a4000-:antialias=false" \
+-fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
++is -fg yellow \
+-bg navy \
+-cr firebrick

db_background.sh

@@ -1,9 +1,6 @@
-#!/bin/sh
-DB=$(find ~/ -name DB-triple-7680x1600 2>>/dev/null);
-echo $DB
-echo ------
+#!/bin/zsh
 while true; do
 #  feh --bg-scale -z --no-xinerama ~/DB-triple-7680x1600
-  feh --bg-fill -z --no-xinerama $DB
+  feh --bg-fill -z --no-xinerama ~/DB-triple-7680x1600
   sleep 1h
 done

emacs-custom.el

@@ -1,55 +0,0 @@
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(ansi-color-faces-vector
-   [default default default italic underline success warning error])
- '(ansi-color-names-vector
-   (vector "#c5c8c6" "#cc6666" "#b5bd68" "#f0c674" "#81a2be" "#b294bb" "#8abeb7" "#373b41"))
- '(ansi-term-color-vector
-   [unspecified "#000000" "#ff6c60" "#a8ff60" "#ffffb6" "#96cbfe" "#ff73fd" "#96cbfe" "#b5b3aa"])
- '(custom-safe-themes
-   '("8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "50ff65ab3c92ce4758cc6cd10ebb3d6150a0e2da15b751d7fbee3d68bba35a94" "d5b121d69e48e0f2a84c8e4580f0ba230423391a78fcb4001ccb35d02494d79e" "5cd0afd0ca01648e1fff95a7a7f8abec925bd654915153fb39ee8e72a8b56a1f" default))
- '(fci-rule-color "#373b41")
- '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id)
- '(frame-background-mode 'dark)
- '(linum-format "%3i")
- '(nrepl-message-colors
-   '("#336c6c" "#205070" "#0f2050" "#806080" "#401440" "#6c1f1c" "#6b400c" "#23733c"))
- '(package-selected-packages
-   '(roguel-ike helm-unicode unicode-fonts color-theme-sanityinc-tomorrow color-theme-solarized distinguished-theme alect-themes bubbleberry-theme go-snippets company-go cyberpunk-theme dad-joke darkane-theme darkmine-theme helm-themes markdown-mode anti-zenburn-theme helm-tramp magit use-package powerline paradox helm))
- '(paradox-github-token t)
- '(pdf-view-midnight-colors '("#232333" . "#c7c7c7"))
- '(powerline-color1 "#3d3d68")
- '(powerline-color2 "#292945")
- '(tool-bar-mode nil)
- '(vc-annotate-background "#d4d4d4")
- '(vc-annotate-color-map
-   '((20 . "#437c7c")
-     (40 . "#336c6c")
-     (60 . "#205070")
-     (80 . "#2f4070")
-     (100 . "#1f3060")
-     (120 . "#0f2050")
-     (140 . "#a080a0")
-     (160 . "#806080")
-     (180 . "#704d70")
-     (200 . "#603a60")
-     (220 . "#502750")
-     (240 . "#401440")
-     (260 . "#6c1f1c")
-     (280 . "#935f5c")
-     (300 . "#834744")
-     (320 . "#732f2c")
-     (340 . "#6b400c")
-     (360 . "#23733c")))
- '(vc-annotate-very-old-color "#23733c")
- '(warning-suppress-types '((use-package))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(default ((t (:inherit nil :extend nil :stipple nil :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 164 :width normal :family "FantasqueSansMono NF"))))
- '(fixed-pitch ((t (:family "Iosevka")))))

emacs-init.el

@@ -1,240 +0,0 @@
-(require 'package)
-(set-language-environment "UTF-8")
-(set-default-coding-systems 'utf-8)
-(setq package-enable-at-startup nil)
-(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
-(add-to-list 'package-archives '("gnu" . "https://elpa.gnu.org/packages/"))
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
-(package-initialize)
-
-(unless (package-installed-p 'use-package)
-  (package-refresh-contents)
-  (package-install 'gnu-elpa-keyring-update)
-  (package-install 'use-package))
-
- (setq custom-file "~/.emacs.d/custom.el")
- (load custom-file)
-
-(use-package diminish
-  :ensure t)
-
-(eval-when-compile
-  (require 'use-package))
-(require 'diminish)
-(require 'bind-key)
-
-(use-package better-defaults
-  :ensure t)
-
-;(use-package powerline
-;  :ensure t
-;  :config
-;  (powerline-default-theme)
-;  :init
-                                        ;  )
-(use-package smart-line-mode
-  :ensure t
-  )
-
-;; helm
-(use-package helm
-  :ensure t
-  :bind (("M-x" . helm-M-x)
-	 ("C-x C-f" . helm-find-files)
-	 ("C-x b" . helm-mini)
-	 ("C-x C-d" . helm-browse-project)
-	 )
-  )
-
-(use-package helm-themes
-  :ensure t)
-(use-package helm-tramp
-  :ensure t)
-
-(use-package unicode-fonts
-  :ensure t
-  :init (unicode-fonts-setup)
-  )
-
-(use-package company
-  :ensure t
-  :init (global-company-mode)
-  :config
-  (progn
-    ;; use company for completion
-    (bind-key [remap completion-at-point] #'company-complete company-mode-map)
-
-    (setq company-tooltip-align-annotations t
-          ;; Easy navigation to candidates with M-<n>
-          company-show-numbers t)
-    )
-  :diminish company-mode
-  )
-
-(use-package company-quickhelp          ; Documentation popups for Company
-  :ensure t
-  :defer t
-  :init (add-hook 'global-company-mode-hook #'company-quickhelp-mode))
-
-(use-package flycheck
-  :ensure t
-  :defer t
-  :init (add-hook 'sh-mode-hook 'flycheck-mode)
-  )
-
-(use-package yasnippet
-  :ensure t
-  :init (yas-global-mode 1)
-  )
-
-(use-package markdown-mode
-  :ensure t)
-
-(use-package magit
-  :ensure t
-  :bind (("C-x g" . magit-status)
-	 )
-  )
-
-(use-package projectile
-  :ensure t
-  :init (projectile-mode +1)
-  )
-
-(use-package helm-projectile
-  :ensure t
-  :init (helm-projectile-on)
-  )
-
-(use-package helm-ag
-  :ensure t
-  :defer t
-  )
-
-
-(use-package paradox
-  :ensure t
-  :defer t)
-
-(use-package helm-unicode
-  :ensure t
-  :defer t)
-
-;; themes
-
-(use-package subatomic256-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package anti-zenburn-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package django-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package paganini-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package cyberpunk-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package cyberpunk-2019-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package grandshell-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package darkmine-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package humanoid-themes
-  :ensure t
-  :defer t
-  )
-
-(use-package birds-of-paradise-plus-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package minsk-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package lush-theme
-  :ensure t
-  :defer t
-  )
-
-;; darkane:
-;;https://raw.githubusercontent.com/FelixFortis/emacs-darkane-theme/master/darkane-theme.el
-;; stick in ~/.emacs.d
-
-(use-package solarized-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package tron-legacy-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package vs-dark-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package sublime-themes
-  :ensure t
-  :defer t
-  )
-
-(use-package blackboard-theme
-  :ensure t
-  :defer t
-  )
-
-(use-package abyss-theme
-  :ensure t
-  :defer t
-  )
-
-;; rand-theme
-(use-package rand-theme
-  :ensure t
-)
-(setq rand-theme-wanted '(abyss anti-zenburn birds-of-paradise-plus blackboard cyberpunk-2019 darkane darkmine django humanoid-dark lush minsk paganini subatomic256 fogus graham hickey odersky wilson vs-dark solarized solarized-wombat-dark solarized-gruvbox-dark spolsky  ))
-
-;; kill the damned gnu screen
-(setq inhibit-startup-screen t)
-
-
-(if window-system
-    (rand-theme)
-  (load-theme 'subatomic256 t)
-  )
-
-(sml/setup)
-
-
-                                   ; screen size is off for some reason uless this is toggled on and off
-(menu-bar-mode)
-(menu-bar-mode)
-

fixdns.sh

@@ -1,9 +1,5 @@
-#!/bin/sh
-cd /tmp/ || exit 'cd did not work'
+#!/bin/zsh
+cd /tmp/
 curl -o resolv.conf -L "https://api.opennicproject.org/geoip/?resolv&ipv=4"
-if [ "$1" = 'write' ]; then
-    sudo mv resolv.conf /etc/
-else
-    less resolv.conf
-fi
+sudo mv resolv.conf /etc/
 

fonts/Envy Code R PR7/Read Me.txt

@@ -0,0 +1,16 @@
+Envy Code R (coding font) preview #7.2
+======================================
+Envy Code R is a fully-scalable monospaced font designed for programming and command prompts.
+
+There are three variants including in the archive - Regular, Bold and Italic.  A large number of additional symbols outside the ASCII range and provided which covers most of the Windows/ISO 1252 codepage, MacOS Roman and a number of other Central European pages.
+
+This archive also contains a folder named 'Visual Studio Italics-as-bold' which contains the Regular and Italic fonts again with an alternate name of 'Envy Code R VS' and with the Italic variant set to identify itself as bold.  This allows you to utilise italics within Visual Studio's syntax highlighter by choosing bold everywhere you want italics - great for comments or strings!
+
+If you wish to use Envy Code R as a font for your Windows Command Prompt run the included .reg registry file and reboot, then choose Properties from the Command Prompt to set it.
+
+Please send feedback to damien@envytech.co.uk and be sure to visit http://damieng.com/fonts/envy-code-r for updates and more information.
+
+[)amien
+Damien Guard, May 2008.
+
+Copyright © 2006-2008 Envy Technologies Ltd.  Free to use but redistribution prohibited.