commit 60322204a1cfaa8a7965862ae89c9951c1adf462
parent 1383c490cd5dc4693bba02e5d569a49ce46f9e1a
Author: gearsix <gearsix@tuta.io>
Date: Thu, 26 Jan 2023 11:56:05 +0000
Merge branch 'master' of notabug.org:gearsix/dotfiles
Diffstat:
13 files changed, 207 insertions(+), 4 deletions(-)
diff --git a/bashrc b/bashrc
@@ -6,10 +6,11 @@ export PS1='\[\e[1m\]\A \[\e[0m\e[3m\]\w \[\e[0m\]$ '
export CC=gcc
export EDITOR=micro
export GOPATH=$HOME/.go
-export PLAN9=/usr/local/plan9port
+export PLAN9=/usr/lib/plan9
export PATH=$PATH:~/.local/bin:$GOPATH/bin:/usr/local/go/bin:$PLAN9/bin
# aliases
+alias wbright='brightnessctl set'
alias myip='curl https://ipinfo.io/ip;echo ""'
alias mapscii='telnet mapscii.me'
alias parrot.live='curl parrot.live'
@@ -19,7 +20,8 @@ alias xopen='xdg-open'
alias cls='clear'
alias s!!='sudo !!'
-alias rm='trash-put -ri' # verbose, recursive, interactive
+#alias rm='trash-rm -vri' # verbose, recursive, interactive
+alias rm='rm -vri' # verbose, recursive, interactive
alias cp='cp -vr' # verbose, recursive
alias mv='mv -vi' # verbose, interactive
alias mkd='mkdir -p' # make parent directories
@@ -35,6 +37,11 @@ alias llu='ls -lAhu' # list format, show almost all, human-readable, sort by
# open a new window instead of `less`ing it (if using gnome-terminal)
if [ "$(command -v gnome-terminal)" != "" ]; then alias man='gnome-terminal -- man'; fi
+# valgrind options I always use
+alias valgrind='valgrind -s --show-leak-kinds=all --leak-check=full'
+
+# --- From other Debian bashrc
+
# Taken from debian /usr/share/doc/bash/examples/startup-files
# don't put duplicate lines or lines starting with space in the history.
HISTCONTROL=ignoreboth
diff --git a/colors/README b/colors/README
@@ -0,0 +1,20 @@
+
+# acme colors
+
+A repository with resource files to match the Sam/Acme colorscheme.
+
+Currently it just holds Sam/ACME colorscemes because I've become quite fond of
+it and it's quite an obscure colorscheme, see:
+
+ - https://en.wikipedia.org/wiki/Sam_(text_editor)
+ - https://en.wikipedia.org/wiki/Acme_(text_editor)
+
+*note:* There are minor variations in the yellow colors, different
+because some applications render colors differently.
+
+## install
+
+Just run ./install FILE, where FILE matches the text editor resource file you'd
+like to install. It'll be automatically moved to where it needs to be for the
+corresponding text editor to locate it.
+
diff --git a/colors/acme.Xresources b/colors/acme.Xresources
@@ -0,0 +1,2 @@
+*background: ivory
+*foreground: black
diff --git a/colors/acme.alacritty b/colors/acme.alacritty
@@ -0,0 +1,4 @@
+colors:
+ primary:
+ background: '#ffffd8'
+ foreground: '#000000'
diff --git a/colors/acme.micro b/colors/acme.micro
@@ -0,0 +1,22 @@
+# ~/.config/micro/colorschemes/acme.micro
+# 'black' gets overwritten by the terminal
+# so #08080808 is used, which is close enough
+
+color-link default "#080808,#ffffea"
+
+color-link statement "italic #080808"
+color-link constant "bold #080808"
+color-link constant.string "italic #080808"
+color-link identifier "bold #080808"
+color-link special "bold #080808"
+color-link type "bold #080808"
+color-link preproc "bold #080808"
+color-link underlined "bold #080808"
+color-link symbol "bold #080808"
+
+color-link comment "italic red"
+color-link todo "bold brightred"
+color-link error "bold brightred"
+
+color-link statusline ",#aeeeee"
+color-link line-number ",#aeeeee"
diff --git a/colors/acme.vim b/colors/acme.vim
@@ -0,0 +1,37 @@
+" ~/.config/nvim/colors/
+highlight clear
+
+" for cterm, 'black' might get overwritten by the terminal emulator, so we use
+" 232 (#080808), which is close enough.
+
+highlight! Normal guibg=#ffffea guifg=#000000 ctermbg=230 ctermfg=232
+highlight! NonText guibg=bg guifg=#ffffea ctermbg=bg ctermfg=230
+highlight! StatusLine guibg=#aeeeee guifg=#000000 gui=NONE ctermbg=159 ctermfg=232 cterm=NONE
+highlight! StatusLineNC guibg=#eaffff guifg=#000000 gui=NONE ctermbg=194 ctermfg=232 cterm=NONE
+highlight! WildMenu guibg=#000000 guifg=#eaffff gui=NONE ctermbg=black ctermfg=159 cterm=NONE
+highlight! VertSplit guibg=#ffffea guifg=#000000 gui=NONE ctermbg=159 ctermfg=232 cterm=NONE
+highlight! Folded guibg=#cccc7c guifg=fg gui=italic ctermbg=187 ctermfg=fg cterm=italic
+highlight! FoldColumn guibg=#fcfcce guifg=fg ctermbg=229 ctermfg=fg
+highlight! Conceal guibg=bg guifg=fg gui=NONE ctermbg=bg ctermfg=fg cterm=NONE
+highlight! LineNr guibg=bg guifg=#505050 gui=italic ctermbg=bg ctermfg=239 cterm=italic
+highlight! Visual guibg=fg guifg=bg ctermbg=fg ctermfg=bg
+highlight! CursorLine guibg=#ffffca guifg=fg ctermbg=230 ctermfg=fg
+
+highlight! Statement guibg=bg guifg=fg gui=italic ctermbg=bg ctermfg=fg cterm=italic
+highlight! Identifier guibg=bg guifg=fg gui=bold ctermbg=bg ctermfg=fg cterm=bold
+highlight! Type guibg=bg guifg=fg gui=bold ctermbg=bg ctermfg=fg cterm=bold
+highlight! PreProc guibg=bg guifg=fg gui=bold ctermbg=bg ctermfg=fg cterm=bold
+highlight! Constant guibg=bg guifg=#101010 gui=bold ctermbg=bg ctermfg=233 cterm=italic
+"highlight! Comment guibg=bg guifg=#303030 gui=italic ctermbg=bg ctermfg=236 cterm=italic
+highlight! Comment guibg=bg guifg=#ff0000 gui=italic ctermbg=bg ctermfg=236 cterm=italic
+highlight! Special guibg=bg guifg=fg gui=bold ctermbg=bg ctermfg=fg cterm=bold
+highlight! SpecialKey guibg=bg guifg=fg gui=bold ctermbg=bg ctermfg=fg cterm=bold
+highlight! Directory guibg=bg guifg=fg gui=bold ctermbg=bg ctermfg=fg cterm=bold
+highlight! link Title Directory
+highlight! link MoreMsg Comment
+highlight! link Question Comment
+
+" vim
+hi link vimFunction Identifier
+
+let g:colors_name = "acme"
diff --git a/colors/install.sh b/colors/install.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+
+for arg in "$@"; do
+ file=$arg
+ dir=""
+
+ if [ "$file" = "acme.vim" ]; then
+ dir=~/.config/nvim/colors
+ elif [ "$file" = "acme.micro" ] || [ "$file" = "paper.micro" ]; then
+ dir=~/.config/micro/colorschemes
+ elif [ "$file" = "acme.Xresources" ]; then
+ dir=~/.Xresources
+ elif [ "$file" = "" ]; then
+ echo "usage: ./install FILE"
+ exit
+ else
+ echo "unrecognised file: $file"
+ continue
+ fi
+
+ mkdir -pv $dir
+ ln -vi "$file" $dir
+done
+
diff --git a/colors/paper.micro b/colors/paper.micro
@@ -0,0 +1,20 @@
+# ~/.config/micro/colorschemes/paper.micro
+
+color-link default ","
+
+color-link statement "italic"
+color-link constant "bold"
+color-link constant.string "italic"
+color-link identifier "bold"
+color-link special "bold"
+color-link type "bold"
+color-link preproc "bold"
+color-link underlined "bold"
+color-link symbol "bold"
+
+color-link comment "italic red"
+color-link todo "bold brightred"
+color-link error "bold brightred"
+
+color-link statusline ","
+color-link line-number ","
diff --git a/micro.bindings b/micro.bindings
@@ -0,0 +1,29 @@
+{
+ "Ctrl-Q": "Quit",
+ "Ctrl-W": "Save",
+ "Ctrl-E": "EndOfLine",
+ "Ctrl-R": "Redo",
+
+ "Ctrl-A": "SelectAll",
+ "Ctrl-S": "StartOfLine",
+ "Ctrl-D": "DuplicateLine",
+ "Ctrl-F": "OpenFile",
+ "Ctrl-G": "JumpLine",
+ "Ctrl-H": "ToggleHelp",
+
+ "CtrlBackslash": "Find",
+ "Ctrl-Z": "Undo",
+ "Ctrl-X": "Cut",
+ "Ctrl-C": "Copy",
+ "Ctrl-V": "Paste",
+
+ "CtrlLeftSq": "PreviousTab",
+ "CtrlRightSq": "NextTab",
+ "CtrlPageUp": "NextTab",
+ "CtrlPageDown": "PreviousTab",
+
+ "CtrlLeft": "WordLeft",
+ "CtrlRight": "WordRight",
+
+ "Ctrl-Space": "CommandMode",
+}
diff --git a/micro.settings b/micro.settings
@@ -0,0 +1,6 @@
+{
+ "autoclose": false,
+ "colorscheme": "paper",
+ "softwrap": true,
+ "wordwrap": true
+}
diff --git a/sfeedrc b/sfeedrc
@@ -8,8 +8,8 @@ feeds() {
feed "codemadness" "https://www.codemadness.nl/atom.xml"
feed "Shining Rock Software" "https://shiningrocksoftware.com/feed/"
# tech
- feed "golang" "https://go.dev/blog/feed.atom"
- feed "golang releases" "https://github.com/golang/go/releases.atom"
+ feed "null program" "https://nullprogram.com/feed/"
+ feed "hackaday" "https://hackaday.com/blog/feed/"
feed "linux kernel" "https://www.kernel.org/feeds/kdist.xml" "https://www.kernel.org"
feed "nodejs releases" "https://nodejs.org/en/feed/releases.xml"
feed "opensuse" "https://news.opensuse.org/feed.xml"
diff --git a/user-dirs.dirs b/user-dirs.dirs
@@ -13,3 +13,4 @@ XDG_DOCUMENTS_DIR="$HOME/docs"
XDG_MUSIC_DIR="$HOME/music"
XDG_PICTURES_DIR="$HOME/pics"
XDG_VIDEOS_DIR="$HOME/vids"
+XDG_CONFIG_HOME="$HOME/.config"
diff --git a/zshrc b/zshrc
@@ -0,0 +1,31 @@
+# gearsix ~/.zshrc
+
+# exports
+export EDITOR=nvim
+export PLAN9=/Users/gearsix/Development/build/plan9port
+export GOPATH="/Users/gearsix/.go"
+export HOMEBREW="/opt/homebrew"
+export PATH=$PATH:/usr/local/bin/:$PLAN9/bin:$GOPATH/bin:$HOMEBREW/bin
+export PS1="%B%T%b %~ %% "
+
+# aliases (local)
+alias cls="clear"
+alias l="ls -lh"
+alias ll="ls -lhA"
+alias lls="ls -lhAS"
+alias llt="ls -lhAt"
+alias mkd="mkdir -p"
+alias cp="cp -vr"
+alias mv="mv -vi"
+alias rm="rm -vri"
+
+# functions
+func myip () {
+ curl https://ipinfo.io/ip
+ echo ""
+}
+
+func parrot.live () {
+ curl parrot.live
+}
+
