diff --git a/config/fish/conf.d/fish_frozen_key_bindings.fish b/config/fish/conf.d/fish_frozen_key_bindings.fish new file mode 100644 index 0000000..d868325 --- /dev/null +++ b/config/fish/conf.d/fish_frozen_key_bindings.fish @@ -0,0 +1,14 @@ +# This file was created by fish when upgrading to version >= 4.3, to migrate +# the 'fish_key_bindings' variable from its old default scope (universal) +# to its new default scope (global). We recommend you delete this file +# and configure key bindings in ~/.config/fish/config.fish if needed. + +set --global fish_key_bindings fish_vi_key_bindings + +# Prior to version 4.3, fish shipped an event handler that runs +# `set --universal fish_key_bindings fish_default_key_bindings` +# whenever the fish_key_bindings variable is erased. +# This means that as long as any fish < 4.3 is still running on this system, +# we cannot complete the migration. +# As a workaround, erase the universal variable at every shell startup. +set --erase --universal fish_key_bindings diff --git a/config/fish/fish_variables b/config/fish/fish_variables index f97c885..937a7fe 100644 --- a/config/fish/fish_variables +++ b/config/fish/fish_variables @@ -1,32 +1,4 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR __fish_initialized:3800 -SETUVAR fish_color_autosuggestion:brblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:normal -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:white\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_vi_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:yellow\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 -SETUVAR fish_user_paths:/home/green/\x2elocal/share/npm/bin +SETUVAR __fish_initialized:4300 +SETUVAR fish_user_paths:/home/green/\x2elocal/bin\x1e/home/green/\x2elocal/share/npm/bin diff --git a/config/kanata/rc.kanata b/config/kanata/rc.kanata old mode 100644 new mode 100755 diff --git a/config/profile b/config/profile new file mode 100644 index 0000000..167ba15 --- /dev/null +++ b/config/profile @@ -0,0 +1,7 @@ +export EDITOR=vim +export BROWSER=nyxt +export PAGER=bat +export SHELL=/usr/bin/fish +export TERMINAL=wezterm +export PATH="$HOME/.dotfiles/scripts:$PATH" +export PATH="/usr/local/bin:$PATH" diff --git a/config/xinitrc b/config/xinitrc new file mode 100644 index 0000000..50a963a --- /dev/null +++ b/config/xinitrc @@ -0,0 +1,5 @@ +#!/bin/sh + +[ -f ~/.profile ] && . ~/.profile + +exec stumpwm diff --git a/link.sh b/link.sh index b41d031..83026fc 100755 --- a/link.sh +++ b/link.sh @@ -23,6 +23,8 @@ backup_and_link() { } backup_and_link "$DOTFILES/config/starship.toml" "$HOME/.config/starship.toml" +backup_and_link "$DOTFILES/config/profile" "$HOME/.profile" +backup_and_link "$DOTFILES/config/xinitrc" "$HOME/.xinitrc" backup_and_link "$DOTFILES/vimrc" "$HOME/.vimrc" backup_and_link "$DOTFILES/config/wezterm" "$HOME/.config/wezterm" backup_and_link "$DOTFILES/config/fish" "$HOME/.config/fish" diff --git a/scripts/nyxt b/scripts/nyxt new file mode 100755 index 0000000..6c7a129 --- /dev/null +++ b/scripts/nyxt @@ -0,0 +1,2 @@ +#!/bin/sh +exec flatpak run engineer.atlas.Nyxt "$@"