diff --git a/contour.yml b/contour.yml index 2a98ef8..1428260 100644 --- a/contour.yml +++ b/contour.yml @@ -140,7 +140,7 @@ profiles: # If nothing is specified, the users' default login shell will be used. # But you may as well log in to a remote host. # shell: "ssh ubuntu-vm" - shell: "ion" + shell: "fish" # arguments: ["some", "optional", "arguments", "for", "the", "shell"] # Builtin SSH-client configuration. diff --git a/fish/config.fish b/fish/config.fish new file mode 100644 index 0000000..7587fbd --- /dev/null +++ b/fish/config.fish @@ -0,0 +1,2 @@ +starship init fish | source +alias gitui="gitui --theme ~/.config/gitui/mocha.ron" \ No newline at end of file diff --git a/fish/fish_variables b/fish/fish_variables new file mode 100644 index 0000000..1a82b8a --- /dev/null +++ b/fish/fish_variables @@ -0,0 +1,31 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __fish_initialized:3400 +SETUVAR fish_color_autosuggestion:555\x1ebrblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:blue +SETUVAR fish_color_comment:red +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold +SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_selected_background:\x2dr diff --git a/stowfile b/stowfile index 8f89d9a..e99249c 100644 --- a/stowfile +++ b/stowfile @@ -29,9 +29,9 @@ stow: - src: iamb.json links: - "${confhome}/iamb/config.json" - - src: ionrc + - src: fish links: - - "${confhome}/ion/initrc" + - "${confhome}/fish" - src: mutt links: - "${confhome}/mutt" diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 73add04..aeee1bd 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -5,7 +5,7 @@ set-option -sa terminal-overrides ",xterm*:Tc" set -g mouse on # Set shell -set -g default-shell /home/skylar/.cargo/bin/ion +set -g default-shell /usr/bin/fish # Number windows from 1 set -g base-index 1