summaryrefslogtreecommitdiffstats
path: root/fish
diff options
context:
space:
mode:
Diffstat (limited to 'fish')
-rw-r--r--fish/config.fish12
-rw-r--r--fish/fish_variables5
-rw-r--r--fish/functions/jtoday.fish3
-rw-r--r--fish/functions/modlog.fish3
-rw-r--r--fish/functions/mutt.fish3
-rw-r--r--fish/functions/rcal1m.fish3
-rw-r--r--fish/functions/rcal1w.fish3
-rw-r--r--fish/functions/rcal1w_small.fish3
-rw-r--r--fish/functions/rcal2m.fish3
-rw-r--r--fish/functions/rcal2w.fish3
-rw-r--r--fish/functions/rcal2w_small.fish3
-rw-r--r--fish/functions/rcal3w.fish3
-rw-r--r--fish/functions/tallproj.fish3
-rw-r--r--fish/functions/taskstobunkerage.fish3
-rw-r--r--fish/functions/tj.fish7
-rw-r--r--fish/functions/todj.fish14
-rw-r--r--fish/functions/ttoday.fish3
-rw-r--r--fish/functions/venvact.fish3
18 files changed, 76 insertions, 4 deletions
diff --git a/fish/config.fish b/fish/config.fish
index c64e395..003ab48 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -19,10 +19,18 @@ alias xclip='xclip -selection c'
set fish_greeting ""
set -gx TERM screen-256color
#set -gx TERM xterm-256color
-set -gx SHELL /usr/bin/fish
+set -gx SHELL /usr/local//bin/fish
+set -gx LESS '-iMRS -x2'
set -gx PATH ~/.local/bin $PATH
set -gx PATH ~/scripts $PATH
set -gx PATH ~/bin $PATH
+
+set -gx BOOKMARK_PY_SMTP_HOST smtp.fastmail.com
+set -gx BOOKMARK_PY_FROM mrlemon@mailforce.net
+set -gx BOOKMARK_PY_EMAIL bookmark@matthewlemon.com
+# set this when needed in shells:
+# BOOKMARK_PY_SMTP_PWD="$(pass AppPasswords/mbsync_fastmail_may2022)"
+set -gx PATH ~/.fzf/bin $PATH
set -gx FZF_DEFAULT_COMMAND 'ag --nocolor -g ""'
set -gx FZF_CTRL_T_COMMAND $FZF_DEFAULT_COMMAND
set -gx FZF_ALT_C_COMMAND $FZF_DEFAULT_COMMAND
@@ -30,7 +38,7 @@ set -gx FZF_DEFAULT_OPTS '--color info:108,prompt:109,spinner:108,pointer:168,ma
#set -gx FZF_DEFAULT_OPTS '--color=bw'
# OPAM configuration
-source /home/lemon/.opam/opam-init/init.fish > /dev/null 2> /dev/null or true
+#source /home/lemon/.opam/opam-init/init.fish > /dev/null 2> /dev/null or true
#
# THIS REMOVES COLOURS FROM ls COMMAND, ETC
# from https://opensource.com/article/19/9/linux-terminal-colors
diff --git a/fish/fish_variables b/fish/fish_variables
index ae6b661..04804be 100644
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -9,7 +9,7 @@ SETUVAR __fish_classic_git_prompt_initialized:\x1d
SETUVAR __fish_init_2_39_8:\x1d
SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_x:\x1d
-SETUVAR __fish_initialized:3100
+SETUVAR __fish_initialized:3400
SETUVAR fish_color_autosuggestion:555\x1ebrblack
SETUVAR fish_color_cancel:\x2dr
SETUVAR fish_color_command:005fd7
@@ -39,5 +39,6 @@ SETUVAR fish_pager_color_completion:normal
SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_user_paths:/home/lemon/bin\x2dscripts/\x1e/home/lemon/perl5/perlbrew/bin/\x1e/usr/lib/cargo/bin/\x1e/home/lemon/go/bin\x1e/usr/local/go/bin\x1e/snap/bin\x1e/home/lemon/\x2epoetry/bin\x1e/home/lemon/\x2ecargo/bin\x1e/snap/bin\x1e/home/lemon/bin\x1e/home/lemon/bin/adb\x2dfastboot/platform\x2dtools/\x1e/home/lemon/\x2efzf/bin\x1e/home/lemon/bin
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_paths:/home/lemon/bin\x2dscripts/\x1e/home/lemon/perl5/perlbrew/bin/\x1e/usr/lib/cargo/bin/\x1e/home/lemon/go/bin\x1e/usr/local/go/bin\x1e/snap/bin\x1e/home/lemon/\x2epoetry/bin\x1e/home/lemon/\x2ecargo/bin\x1e/home/lemon/bin\x1e/home/lemon/bin/adb\x2dfastboot/platform\x2dtools/\x1e/home/lemon/\x2efzf/bin
SETUVAR fisher_dependency_count:Colored\x2dMan\x2dPages\x1ebass
diff --git a/fish/functions/jtoday.fish b/fish/functions/jtoday.fish
new file mode 100644
index 0000000..f5a2f7a
--- /dev/null
+++ b/fish/functions/jtoday.fish
@@ -0,0 +1,3 @@
+function jtoday --wraps='vim ~/Notes/journal/$(date +%Y-%m-%d).md' --description 'alias jtoday=vim ~/Notes/journal/$(date +%Y-%m-%d).md'
+ vim ~/Notes/journal/$(date +%Y-%m-%d).md $argv;
+end
diff --git a/fish/functions/modlog.fish b/fish/functions/modlog.fish
new file mode 100644
index 0000000..25460a2
--- /dev/null
+++ b/fish/functions/modlog.fish
@@ -0,0 +1,3 @@
+function modlog --wraps='grep -R :MOD /home/lemon/Notes/journal| sort -r|cut -d/ -f6-' --description 'alias modlog=grep -R :MOD /home/lemon/Notes/journal| sort -r|cut -d/ -f6-'
+ grep -R :MOD /home/lemon/Notes/journal| sort -r|cut -d/ -f6- $argv;
+end
diff --git a/fish/functions/mutt.fish b/fish/functions/mutt.fish
new file mode 100644
index 0000000..2e23366
--- /dev/null
+++ b/fish/functions/mutt.fish
@@ -0,0 +1,3 @@
+function mutt --wraps='neomutt -f Mail/fastmail/INBOX/' --description 'alias mutt=neomutt -f Mail/fastmail/INBOX/'
+ neomutt -f Mail/fastmail/INBOX/ $argv;
+end
diff --git a/fish/functions/rcal1m.fish b/fish/functions/rcal1m.fish
new file mode 100644
index 0000000..005aac8
--- /dev/null
+++ b/fish/functions/rcal1m.fish
@@ -0,0 +1,3 @@
+function rcal1m --wraps='ssh bobbins rem -cca -w160 -m' --description 'alias rcal1m=ssh bobbins rem -cca -w160 -m'
+ ssh bobbins rem -cca -w160 -m $argv;
+end
diff --git a/fish/functions/rcal1w.fish b/fish/functions/rcal1w.fish
new file mode 100644
index 0000000..bbda153
--- /dev/null
+++ b/fish/functions/rcal1w.fish
@@ -0,0 +1,3 @@
+function rcal1w --wraps='ssh bobbins rem -cc+a1 -w160 -m' --description 'alias rcal1w=ssh bobbins rem -cc+a1 -w160 -m'
+ ssh bobbins rem -cc+a1 -w160 -m $argv;
+end
diff --git a/fish/functions/rcal1w_small.fish b/fish/functions/rcal1w_small.fish
new file mode 100644
index 0000000..1232b64
--- /dev/null
+++ b/fish/functions/rcal1w_small.fish
@@ -0,0 +1,3 @@
+function rcal1w_small --wraps='ssh bobbins rem -cca+1 -w140 -m' --description 'alias rcal1w_small=ssh bobbins rem -cca+1 -w140 -m'
+ ssh bobbins rem -cca+1 -w140 -m $argv;
+end
diff --git a/fish/functions/rcal2m.fish b/fish/functions/rcal2m.fish
new file mode 100644
index 0000000..1dcf194
--- /dev/null
+++ b/fish/functions/rcal2m.fish
@@ -0,0 +1,3 @@
+function rcal2m --wraps='ssh bobbins rem -cca2 -w160 -m' --description 'alias rcal2m=ssh bobbins rem -cca2 -w160 -m'
+ ssh bobbins rem -cca2 -w160 -m $argv;
+end
diff --git a/fish/functions/rcal2w.fish b/fish/functions/rcal2w.fish
new file mode 100644
index 0000000..9367062
--- /dev/null
+++ b/fish/functions/rcal2w.fish
@@ -0,0 +1,3 @@
+function rcal2w --wraps='ssh bobbins rem -cc+a2 -w160 -m' --description 'alias rcal2w=ssh bobbins rem -cc+a2 -w160 -m'
+ ssh bobbins rem -cc+a2 -w160 -m $argv;
+end
diff --git a/fish/functions/rcal2w_small.fish b/fish/functions/rcal2w_small.fish
new file mode 100644
index 0000000..9f4490c
--- /dev/null
+++ b/fish/functions/rcal2w_small.fish
@@ -0,0 +1,3 @@
+function rcal2w_small --wraps='ssh bobbins rem -cca+2 -w140 -m' --description 'alias rcal2w_small=ssh bobbins rem -cca+2 -w140 -m'
+ ssh bobbins rem -cca+2 -w140 -m $argv;
+end
diff --git a/fish/functions/rcal3w.fish b/fish/functions/rcal3w.fish
new file mode 100644
index 0000000..7bc5fd9
--- /dev/null
+++ b/fish/functions/rcal3w.fish
@@ -0,0 +1,3 @@
+function rcal3w --wraps='ssh bobbins rem -cc+a3 -w160 -m' --description 'alias rcal3w=ssh bobbins rem -cc+a3 -w160 -m'
+ ssh bobbins rem -cc+a3 -w160 -m $argv;
+end
diff --git a/fish/functions/tallproj.fish b/fish/functions/tallproj.fish
new file mode 100644
index 0000000..13980d0
--- /dev/null
+++ b/fish/functions/tallproj.fish
@@ -0,0 +1,3 @@
+function tallproj --wraps='task rc.list.all.projects=1 projects' --description 'alias tallproj=task rc.list.all.projects=1 projects'
+ task rc.list.all.projects=1 projects $argv;
+end
diff --git a/fish/functions/taskstobunkerage.fish b/fish/functions/taskstobunkerage.fish
new file mode 100644
index 0000000..d4ac2ca
--- /dev/null
+++ b/fish/functions/taskstobunkerage.fish
@@ -0,0 +1,3 @@
+function taskstobunkerage --wraps=echo\ \"\#\#\#\ Tasks\\n\\n\\`\\`\\`\"\ \>\>\ /home/lemon/code/html/yulqen.org.hugo/content/bunkerage/day.md\ \&\&\ task\ ml_basic\ \>\>\ /home/lemon/code/html/yulqen.org.hugo/con\ \ \ \ tent/bunkerage/day.md\ \&\&\ echo\ \"\\`\\`\\`\"\ \>\>\ /home/lemon/code/html/yulqen.org.hugo/content/bunkerage/day.md\ \&\&\ cd\ \~/code/html/yulqen.org.hugo/\ \&\&\ make\ push\ \&\&\ cd\ - --description alias\ taskstobunkerage=echo\ \"\#\#\#\ Tasks\\n\\n\\`\\`\\`\"\ \>\>\ /home/lemon/code/html/yulqen.org.hugo/content/bunkerage/day.md\ \&\&\ task\ ml_basic\ \>\>\ /home/lemon/code/html/yulqen.org.hugo/con\ \ \ \ tent/bunkerage/day.md\ \&\&\ echo\ \"\\`\\`\\`\"\ \>\>\ /home/lemon/code/html/yulqen.org.hugo/content/bunkerage/day.md\ \&\&\ cd\ \~/code/html/yulqen.org.hugo/\ \&\&\ make\ push\ \&\&\ cd\ -
+ echo "### Tasks\n\n\`\`\`" >> /home/lemon/code/html/yulqen.org.hugo/content/bunkerage/day.md && task ml_basic >> /home/lemon/code/html/yulqen.org.hugo/con tent/bunkerage/day.md && echo "\`\`\`" >> /home/lemon/code/html/yulqen.org.hugo/content/bunkerage/day.md && cd ~/code/html/yulqen.org.hugo/ && make push && cd - $argv;
+end
diff --git a/fish/functions/tj.fish b/fish/functions/tj.fish
new file mode 100644
index 0000000..8c1caad
--- /dev/null
+++ b/fish/functions/tj.fish
@@ -0,0 +1,7 @@
+function tj -d "Log to the daily journal - wrapper round _tj script" --argument-names 'message'
+ if test -n "$message"
+ echo "$message" | _tj
+ else
+ echo "Please give me your message, wrapped in quotes."
+ end
+end
diff --git a/fish/functions/todj.fish b/fish/functions/todj.fish
new file mode 100644
index 0000000..7e54dfa
--- /dev/null
+++ b/fish/functions/todj.fish
@@ -0,0 +1,14 @@
+function todj -d "Shows the current daily journal" --argument-names 'vimopt'
+ if test -n "$vimopt"
+ if test $vimopt = "-v"
+ set CMD vim
+ else
+ echo "Do not recognise $vimopt. Did you mean -v?"
+ return
+ end
+ else
+ set CMD cat
+ end
+
+ $CMD $(find /home/lemon/Notes/journal -name "*$(date '+%Y-%m-%d')*")
+end
diff --git a/fish/functions/ttoday.fish b/fish/functions/ttoday.fish
new file mode 100644
index 0000000..115f304
--- /dev/null
+++ b/fish/functions/ttoday.fish
@@ -0,0 +1,3 @@
+function ttoday --wraps='task ml_due_or_scheduled_today' --description 'alias ttoday=task ml_due_or_scheduled_today'
+ task ml_due_or_scheduled_today $argv;
+end
diff --git a/fish/functions/venvact.fish b/fish/functions/venvact.fish
new file mode 100644
index 0000000..01bf050
--- /dev/null
+++ b/fish/functions/venvact.fish
@@ -0,0 +1,3 @@
+function venvact --wraps='. ./.venv/bin/activate' --description 'alias venvact=. ./.venv/bin/activate'
+ . ./.venv/bin/activate $argv;
+end
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 20:22:31 +0000