about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Harris <ben@tilde.team>2018-07-24 01:06:48 -0400
committerBen Harris <ben@tilde.team>2018-07-24 01:07:32 -0400
commit78ecf80d3b6ac8b0486b28c9d6d66bf6a3b04252 (patch)
tree3062217b5d4945b518c7561053e3c775dc55d710
parent2606bdd307f068f475502fe05216f0c8d3cedc1a (diff)
fish_greeting only if file exists
-rw-r--r--fish/.config/fish/fishd.zaphod31
-rw-r--r--fish/.config/fish/functions/fish_greeting.fish4
-rwxr-xr-xgit/.gitconfig4
3 files changed, 37 insertions, 2 deletions
diff --git a/fish/.config/fish/fishd.zaphod b/fish/.config/fish/fishd.zaphod
new file mode 100644
index 0000000..93eb0b8
--- /dev/null
+++ b/fish/.config/fish/fishd.zaphod
@@ -0,0 +1,31 @@
+# This file is automatically generated by the fish.
+# Do NOT edit it directly, your changes will be overwritten.
+SET __fish_init_2_39_8:\x1d
+SET __fish_init_2_3_0:\x1d
+SET fish_color_autosuggestion:555\x1ebrblack
+SET fish_color_cancel:\x2dr
+SET fish_color_command:\x2d\x2dbold
+SET fish_color_comment:red
+SET fish_color_cwd:green
+SET fish_color_cwd_root:red
+SET fish_color_end:brmagenta
+SET fish_color_error:brred
+SET fish_color_escape:bryellow\x1e\x2d\x2dbold
+SET fish_color_history_current:\x2d\x2dbold
+SET fish_color_host:normal
+SET fish_color_match:\x2d\x2dbackground\x3dbrblue
+SET fish_color_normal:normal
+SET fish_color_operator:bryellow
+SET fish_color_param:cyan
+SET fish_color_quote:yellow
+SET fish_color_redirection:brblue
+SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
+SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SET fish_color_user:brgreen
+SET fish_color_valid_path:\x2d\x2dunderline
+SET fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell
+SET fish_key_bindings:fish_default_key_bindings
+SET fish_pager_color_completion:\x1d
+SET fish_pager_color_description:B3A06D\x1eyellow
+SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
diff --git a/fish/.config/fish/functions/fish_greeting.fish b/fish/.config/fish/functions/fish_greeting.fish
index 61d7778..f41f6a1 100644
--- a/fish/.config/fish/functions/fish_greeting.fish
+++ b/fish/.config/fish/functions/fish_greeting.fish
@@ -1,3 +1,5 @@
 function fish_greeting
-	cat /var/run/motd
+    if test -f /var/run/motd
+        cat /var/run/motd
+    end
 end
diff --git a/git/.gitconfig b/git/.gitconfig
index 910a9dd..1ad591d 100755
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,7 +1,9 @@
 [user]
 	email = ben@tilde.team
 	name = Ben Harris
-	signingkey = 0647C7F8
+	signingkey = FC2255B7BBC7EABD4EFAFA1068907D8BCCD85A5A
 [push]
 	default = simple
 
+[commit]
+	gpgsign = true