~charles/dotfiles

9a55c9f370970ddb5ada3f9fef8ec8bd67289802 — Charles A. Daniels 3 months ago d957e5b
remove fish-configs, add alt+shift+f
6 files changed, 6 insertions(+), 67 deletions(-)

D modules/fish-config/module.cfg
D modules/fish-config/overlay/config.fish
D modules/fish-config/setup.fish
D modules/fish-config/setup.sh
M modules/gnome-keyboard-settings/gnome-keyboard-settings.sh
M modules/shell-utils/bin/img-autoname
D modules/fish-config/module.cfg => modules/fish-config/module.cfg +0 -4
@@ 1,4 0,0 @@
MODULE_TYPE="overlay"
MODULE_TARGET="$HOME/.config/fish"
MODULE_SOURCE="./overlay"
MODULE_COMMAND="sh setup.sh"

D modules/fish-config/overlay/config.fish => modules/fish-config/overlay/config.fish +0 -38
@@ 1,38 0,0 @@
# silence greeting
set fish_greeting

# setup PS1/prompt
function fish_prompt
    set_color red

    if set -q SSHH_CLIENT
        printf '%s' (hostname)
    end
    printf '$ '

    set_color normal
end

# use vim keybindings
function fish_user_key_bindings
  fish_vi_key_bindings
end

# no mode indicator
function fish_mode_prompt; end

# pull in bash config
if functions -q fenv
    # fenv may not be available on first run if the plugin hasn't been installed
    # yet.
    fenv source ~/.profile
    fenv source ~/.bashrc
end

# source ~/.fishrc.local if it is present
if [ -f "$HOME/.fishrc.local" ]
    source "$HOME/.fishrc.local"
end

# on macOS, ensure homebrews bin is a higher priority than the system one.
set -gx PATH /opt/homebrew/bin $PATH

D modules/fish-config/setup.fish => modules/fish-config/setup.fish +0 -14
@@ 1,14 0,0 @@
#!/usr/bin/env fish

curl -sL https://git.io/fisher | source

fisher install\
	jorgebucaran/fisher\
	oh-my-fish/plugin-foreign-env\
	evanlucas/fish-kubectl-completions\
	ryotako/fish-completion-generator\
	oh-my-fish/plugin-license

if [ -x (which rq) ]
	rq install-completions > "$HOME/.config/fish/completions/rq.fish"
end

D modules/fish-config/setup.sh => modules/fish-config/setup.sh +0 -9
@@ 1,9 0,0 @@
#!/bin/sh

if [ ! -x "$(which fish)" ] ; then
	echo "FATAL: fish not found in PATH" 1>&2
	exit 1
fi

cd "$(dirname "$0")"
fish --no-config ./setup.fish

M modules/gnome-keyboard-settings/gnome-keyboard-settings.sh => modules/gnome-keyboard-settings/gnome-keyboard-settings.sh +5 -1
@@ 72,10 72,14 @@ gsettings set org.gnome.desktop.sound input-feedback-sounds false
# Focus follows mouse without raising
gsettings set org.gnome.desktop.wm.preferences focus-mode sloppy

# alt+shift+space to goggle maximize
# alt+shift+space to toggle maximize
clear_bindings '<Shift><Alt>space'
gsettings set org.gnome.desktop.wm.keybindings toggle-maximized "['<Shift><Alt>space']"

# alt+shift+f to toggle fullscreen
clear_bindings '<Shift><Alt>f'
gsettings set org.gnome.desktop.wm.keybindings toggle-fullscreen "['<Shift><Alt>f']"

# Move windows between workspaces.
clear_bindings "['<Shift><Alt>1']"
clear_bindings "['<Shift><Alt>2']"

M modules/shell-utils/bin/img-autoname => modules/shell-utils/bin/img-autoname +1 -1
@@ 49,7 49,7 @@ while true ; do
	fi


	seq="$(echo "$base" | egrep -o '[0-9][0-9]+')"
	seq="$(echo "$base" | egrep -o '[0-9][0-9]+' | tr -d '\n')"
	ext="$(echo "$base" | tr '.' '\n' | tail -n 1)"
	new="$parent/$created""_$seq.$ext"