From a0de925ff39e1cce74ae316e03406731a56d2fef Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 14 May 2022 21:00:08 -0500 Subject: [PATCH 1/4] Work fixes --- common/bin/install-user-chrome-css.fish | 5 ++++- common/fish/paths.fish | 2 ++ common/tmux/conf | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/bin/install-user-chrome-css.fish b/common/bin/install-user-chrome-css.fish index 93bba10..e725881 100755 --- a/common/bin/install-user-chrome-css.fish +++ b/common/bin/install-user-chrome-css.fish @@ -1,6 +1,9 @@ #!/usr/bin/env fish -set profile_dirs ~/.mozilla/firefox/*.dev-edition-default +set profile_dirs "$HOME/.mozilla/firefox/*.dev-edition-default" +if test (uname) = Darwin + set profile_dirs "$HOME/Library/Application Support/Firefox/Profiles/*.dev-edition-default" +end for p in $profile_dirs mkdir -p $p/chrome diff --git a/common/fish/paths.fish b/common/fish/paths.fish index cf5c303..046c483 100644 --- a/common/fish/paths.fish +++ b/common/fish/paths.fish @@ -26,6 +26,8 @@ set --export --universal GOPATH $HOME/.go set --export --universal GOBIN $GOPATH/bin set paths_candidates \ + /opt/homebrew/bin \ + /opt/homebrew/sbin \ $DOTFILES_PATH/common/bin \ $HOME/.bin \ $HOME/.local/bin \ diff --git a/common/tmux/conf b/common/tmux/conf index b56729e..e848b9d 100644 --- a/common/tmux/conf +++ b/common/tmux/conf @@ -22,8 +22,6 @@ bind M-l source-file "$XDG_CONFIG_HOME/tmux/layouts/dev.tmux" set -g update-environment "WAYLAND_DISPLAY DISPLAY" -# TODO: check if kitty is installed? -set -g default-terminal "kitty" set -g mouse on set -g escape-time 0 set -g monitor-activity on From 41173b15aae8e1ceaa3b4978c777d6d415096132 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 14 May 2022 21:02:19 -0500 Subject: [PATCH 2/4] Fix --- common/bin/install-user-chrome-css.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/bin/install-user-chrome-css.fish b/common/bin/install-user-chrome-css.fish index e725881..a81fea3 100755 --- a/common/bin/install-user-chrome-css.fish +++ b/common/bin/install-user-chrome-css.fish @@ -2,7 +2,7 @@ set profile_dirs "$HOME/.mozilla/firefox/*.dev-edition-default" if test (uname) = Darwin - set profile_dirs "$HOME/Library/Application Support/Firefox/Profiles/*.dev-edition-default" + set profile_dirs $HOME/Library/Application\ Support/Firefox/Profiles/*.dev-edition-default end for p in $profile_dirs From a8c33c9f089a6d308647d4463fe7881adb991aaf Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 18 May 2022 01:27:19 -0500 Subject: [PATCH 3/4] WIP --- common/fish/config.fish | 9 +++++---- common/helix/config.toml | 4 +++- common/helix/runtime | 1 + common/kitty/kitty.conf | 6 ++++++ 4 files changed, 15 insertions(+), 5 deletions(-) create mode 120000 common/helix/runtime diff --git a/common/fish/config.fish b/common/fish/config.fish index f106100..880ad5b 100755 --- a/common/fish/config.fish +++ b/common/fish/config.fish @@ -10,8 +10,8 @@ for f in vars colors prompt functions key-bindings source $FISH_PATH/$f.fish end -if has_command brew && test -f (brew --prefix asdf)/lib/asdf.fish - set -Ux ASDF_DIR (brew --prefix asdf) +if has_command brew && test -f (brew --prefix asdf)/libexec/asdf.fish + set --universal --export ASDF_DIR (brew --prefix asdf) source (brew --prefix asdf)/libexec/asdf.fish else if test -f $HOME/.asdf/asdf.fish source $HOME/.asdf/asdf.fish @@ -41,5 +41,6 @@ if test -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh set --prepend --export --global fish_user_paths $HOME/.nix-profile/bin /nix/var/nix/profiles/default/bin end - -test $PWD = $HOME && begin; cd $NICE_HOME || cd; end +test $PWD = $HOME && begin + cd $NICE_HOME || cd +end diff --git a/common/helix/config.toml b/common/helix/config.toml index 168f24d..9f1ad56 100644 --- a/common/helix/config.toml +++ b/common/helix/config.toml @@ -1,2 +1,4 @@ +theme = "bogster" + [keys.insert] -j = { k = "normal_mode" } +j = { k = "normal_mode" } \ No newline at end of file diff --git a/common/helix/runtime b/common/helix/runtime new file mode 120000 index 0000000..2c5d6d7 --- /dev/null +++ b/common/helix/runtime @@ -0,0 +1 @@ +/Users/danielflanagan/code/helix/runtime \ No newline at end of file diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index 29976cb..c07aa9f 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -25,6 +25,12 @@ map shift+insert paste_from_clipboard map ctrl+shift+v paste_from_selection map ctrl+shift+c copy_to_clipboard +map ctrl+shift+h neighboring_window left +map ctrl+shift+l neighboring_window right +map ctrl+shift+k neighboring_window up +map ctrl+shift+j neighboring_window down +map ctrl+shift+h nth_window -1 + enable_audio_bell yes url_style single From 5df5373e4c1824fc4cb41ac3f426919ccbd8c5a5 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 18 May 2022 14:41:59 -0500 Subject: [PATCH 4/4] Kitty layout --- common/kitty/kitty.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index c07aa9f..35e3b38 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -19,6 +19,8 @@ adjust_line_height 0 window_padding_width 10.0 window_margin_width 0.0 +enabled_layouts tall:bias=50;full_size=1;mirrored=true + map ctrl+shift+equal change_font_size all +0.5 map ctrl+shift+minus change_font_size all -0.5 map shift+insert paste_from_clipboard