From 9188308c44f861fbd7c30719b1ce1cce048c18b7 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Wed, 14 Aug 2024 14:56:28 +0200 Subject: [PATCH] Update and fix config --- .chezmoiignore | 1 - .../conf.d/{alias.fish => alias.fish.tmpl} | 4 +- dot_config/fish/config.fish | 20 ----- dot_config/fish/config.fish.tmpl | 20 +++++ dot_config/fish/fish_plugins | 1 + dot_config/fish/fish_variables | 74 ------------------- dot_config/nvim/lua/config/lazy.lua | 8 -- dot_config/nvim/lua/plugins/test.lua | 13 ---- dot_ssh/config.tmpl | 9 ++- 9 files changed, 31 insertions(+), 119 deletions(-) rename dot_config/fish/conf.d/{alias.fish => alias.fish.tmpl} (87%) delete mode 100644 dot_config/fish/config.fish create mode 100644 dot_config/fish/config.fish.tmpl delete mode 100644 dot_config/fish/fish_variables delete mode 100644 dot_config/nvim/lua/plugins/test.lua diff --git a/.chezmoiignore b/.chezmoiignore index ba8febb..8f37934 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -23,6 +23,5 @@ LICENSE .config/nvim/lua/config .config/nvim/lua/plugins/telescope.lua .config/nvim/lua/plugins/core.lua -.config/nvim/lua/plugins/test.lua .config/nvim/lua/plugins/disabled.lua {{ end }} diff --git a/dot_config/fish/conf.d/alias.fish b/dot_config/fish/conf.d/alias.fish.tmpl similarity index 87% rename from dot_config/fish/conf.d/alias.fish rename to dot_config/fish/conf.d/alias.fish.tmpl index fa11f8b..b4c6c62 100644 --- a/dot_config/fish/conf.d/alias.fish +++ b/dot_config/fish/conf.d/alias.fish.tmpl @@ -1,3 +1,4 @@ +{{- if eq .chezmoi.os "openbsd" }} abbr top "htop" abbr ctags "uctags" abbr make "gmake" @@ -5,11 +6,12 @@ abbr tar "gtar" abbr man "manpager.sh" abbr mutt "neomutt" abbr dvim "doas nvim" -abbr lg "lazygit" abbr ic "doas ifconfig" abbr pq "doas pkg_info -Q" abbr pa "doas pkg_add" abbr pd "doas pkg_delete" +{{- end }} +abbr lg "lazygit" abbr ccd "chezmoi cd" abbr cdi "chezmoi diff" abbr cap "chezmoi apply" diff --git a/dot_config/fish/config.fish b/dot_config/fish/config.fish deleted file mode 100644 index d26d1a5..0000000 --- a/dot_config/fish/config.fish +++ /dev/null @@ -1,20 +0,0 @@ -if status is-interactive - set -gx EDITOR nvim - set -gx LC_ALL en_US.UTF-8 - set -gx LANG en_US.UTF-8 - set -gx FZF_DEFAULT_COMMAND "fd --type file --color=always" - set -gx GOPATH $HOME/go - set -gx GPG_TTY $(tty) - set -gx CC "clang-16" - set -g PERL5LIB $HOME/perl5/lib/perl5 - set -g PERL_LOCAL_LIB_ROOT $HOME/perl5 - set -g PERL_MB_OPT '--install_base "/home/jan/perl5"' - set -g PERL_MM_OPT 'INSTALL_BASE=/home/jan/perl5' - set -U fish_greeting - - fish_add_path -g ~/.local/bin ~/.cargo/bin ~/perl5/bin /usr/local/bin /usr/local/sbin - fish_vi_key_bindings - - atuin init fish | source - starship init fish | source -end diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl new file mode 100644 index 0000000..3f15ed4 --- /dev/null +++ b/dot_config/fish/config.fish.tmpl @@ -0,0 +1,20 @@ +if status is-interactive + set -gx EDITOR nvim + set -gx LC_ALL en_US.UTF-8 + set -gx LANG en_US.UTF-8 + set -gx FZF_DEFAULT_COMMAND "fd --type file --color=always" + set -gx GOPATH $HOME/go + set -gx GPG_TTY $(tty) + set -gx CC clang + set -g PERL5LIB $HOME/perl5/lib/perl5 + set -g PERL_LOCAL_LIB_ROOT $HOME/perl5 + set -g PERL_MB_OPT '--install_base "/home/jan/perl5"' + set -g PERL_MM_OPT 'INSTALL_BASE=/home/jan/perl5' + set -U fish_greeting + + fish_add_path -g {{ .path }} + fish_vi_key_bindings + + atuin init fish | source + starship init fish | source +end diff --git a/dot_config/fish/fish_plugins b/dot_config/fish/fish_plugins index 38893ce..c5b7b51 100644 --- a/dot_config/fish/fish_plugins +++ b/dot_config/fish/fish_plugins @@ -2,3 +2,4 @@ jorgebucaran/fisher kidonng/zoxide.fish plttn/fish-eza patrickf1/fzf.fish +danhper/fish-ssh-agent diff --git a/dot_config/fish/fish_variables b/dot_config/fish/fish_variables deleted file mode 100644 index 9055b9f..0000000 --- a/dot_config/fish/fish_variables +++ /dev/null @@ -1,74 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR --export EZA_LAAD_OPTIONS:\x2d\x2dall\x1e\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LAAID_OPTIONS:\x2d\x2dall\x1e\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2dicons\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LAAI_OPTIONS:\x2d\x2dall\x1e\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2dicons -SETUVAR --export EZA_LAA_OPTIONS:\x2d\x2dall\x1e\x2d\x2dall\x1e\x2d\x2dbinary -SETUVAR --export EZA_LAD_OPTIONS:\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LAID_OPTIONS:\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2dicons\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LAI_OPTIONS:\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2dicons -SETUVAR --export EZA_LA_OPTIONS:\x2d\x2dall\x1e\x2d\x2dbinary -SETUVAR --export EZA_LC_OPTIONS:\x2d\x2dacross -SETUVAR --export EZA_LD_OPTIONS:\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LE_OPTIONS:\x2d\x2dextended\x1e\x2d\x2dlong -SETUVAR --export EZA_LG_OPTIONS:\x2d\x2dgit\x1e\x2d\x2dgit\x2dignore\x1e\x2d\x2dlong -SETUVAR --export EZA_LID_OPTIONS:\x2d\x2dicons\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LI_OPTIONS:\x2d\x2dicons -SETUVAR --export EZA_LL_OPTIONS:\x2d\x2dlong -SETUVAR --export EZA_LO_OPTIONS:\x2d\x2doneline -SETUVAR --export EZA_LT_OPTIONS:\x2d\x2dtree\x1e\x2d\x2dlevel -SETUVAR --export EZA_L_OPTIONS:\x1d -SETUVAR --export EZA_STANDARD_OPTIONS:\x2d\x2dgroup\x1e\x2d\x2dheader\x1e\x2d\x2dgroup\x2ddirectories\x2dfirst -SETUVAR --export __FISH_EZA_ALIASES:l\x1ela\x1eld\x1eli\x1elid\x1elaa\x1elad\x1elai\x1elaid\x1elaad\x1elaai\x1elaaid\x1ell\x1ella\x1elld\x1elli\x1ellid\x1ellaa\x1ellad\x1ellai\x1ellaid\x1ellaad\x1ellaai\x1ellaaid\x1elg\x1elga\x1elgd\x1elgi\x1elgid\x1elgaa\x1elgad\x1elgai\x1elgaid\x1elgaad\x1elgaai\x1elgaaid\x1ele\x1elea\x1eled\x1elei\x1eleid\x1eleaa\x1elead\x1eleai\x1eleaid\x1eleaad\x1eleaai\x1eleaaid\x1elt\x1elta\x1eltd\x1elti\x1eltid\x1eltad\x1eltai\x1eltaid\x1eltaad\x1eltaai\x1eltaaid\x1elc\x1elca\x1elcd\x1elci\x1elcid\x1elcaa\x1elcad\x1elcai\x1elcaid\x1elcaad\x1elcaai\x1elcaaid\x1elo\x1eloa\x1elod\x1eloi\x1eloid\x1eloaa\x1eload\x1eloai\x1eloaid\x1eloaad\x1eloaai\x1eloaaid -SETUVAR --export __FISH_EZA_BASE_ALIASES:l\x1ell\x1elg\x1ele\x1elt\x1elc\x1elo -SETUVAR --export __FISH_EZA_EXPANDED:a\x1ed\x1ei\x1eid\x1eaa\x1ead\x1eai\x1eaid\x1eaad\x1eaai\x1eaaid -SETUVAR --export __FISH_EZA_EXPANDED_OPT_NAME:LA\x1eLD\x1eLI\x1eLID\x1eLAA\x1eLAD\x1eLAI\x1eLAID\x1eLAAD\x1eLAAI\x1eLAAID -SETUVAR --export __FISH_EZA_OPT_NAMES:EZA_L_OPTIONS\x1eEZA_LA_OPTIONS\x1eEZA_LD_OPTIONS\x1eEZA_LI_OPTIONS\x1eEZA_LID_OPTIONS\x1eEZA_LAA_OPTIONS\x1eEZA_LAD_OPTIONS\x1eEZA_LAI_OPTIONS\x1eEZA_LAID_OPTIONS\x1eEZA_LAAD_OPTIONS\x1eEZA_LAAI_OPTIONS\x1eEZA_LAAID_OPTIONS\x1eEZA_LL_OPTIONS\x1eEZA_LG_OPTIONS\x1eEZA_LE_OPTIONS\x1eEZA_LT_OPTIONS\x1eEZA_LC_OPTIONS\x1eEZA_LO_OPTIONS -SETUVAR --export __FISH_EZA_SORT_OPTIONS:name\x1e\x2ename\x1esize\x1eext\x1emod\x1eold\x1eacc\x1ecr\x1einode -SETUVAR __fish_initialized:3400 -SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish -SETUVAR _fisher_kidonng_2F_zoxide_2E_fish_files:\x7e/\x2econfig/fish/functions/__zoxide_cd\x2efish\x1e\x7e/\x2econfig/fish/functions/__zoxide_pwd\x2efish\x1e\x7e/\x2econfig/fish/functions/__zoxide_z\x2efish\x1e\x7e/\x2econfig/fish/functions/__zoxide_z_complete\x2efish\x1e\x7e/\x2econfig/fish/functions/__zoxide_zi\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/zoxide\x2efish -SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_fzf_configure_bindings_help\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_extract_var_info\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_changed_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_diff_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_file_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_log\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_history\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_processes\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_wrapper\x2efish\x1e\x7e/\x2econfig/fish/functions/fzf_configure_bindings\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fzf\x2efish\x1e\x7e/\x2econfig/fish/completions/fzf_configure_bindings\x2efish -SETUVAR _fisher_plttn_2F_fish_2D_eza_files:\x7e/\x2econfig/fish/functions/eza_git\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fish\x2deza\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ekidonng/zoxide\x2efish\x1eplttn/fish\x2deza\x1epatrickf1/fzf\x2efish -SETUVAR _fisher_upgraded_to_4_4:\x1d -SETUVAR fish_color_autosuggestion:4c566a -SETUVAR fish_color_cancel:\x2d\x2dreverse -SETUVAR fish_color_command:88c0d0 -SETUVAR fish_color_comment:4c566a\x1e\x2d\x2ditalics -SETUVAR fish_color_cwd:5e81ac -SETUVAR fish_color_cwd_root:bf616a -SETUVAR fish_color_end:81a1c1 -SETUVAR fish_color_error:bf616a -SETUVAR fish_color_escape:ebcb8b -SETUVAR fish_color_history_current:e5e9f0\x1e\x2d\x2dbold -SETUVAR fish_color_host:a3be8c -SETUVAR fish_color_host_remote:ebcb8b -SETUVAR fish_color_keyword:81a1c1 -SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:81a1c1 -SETUVAR fish_color_option:8fbcbb -SETUVAR fish_color_param:d8dee9 -SETUVAR fish_color_quote:a3be8c -SETUVAR fish_color_redirection:b48ead\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:\x2d\x2dbold\x1e\x2d\x2dbackground\x3d434c5e -SETUVAR fish_color_selection:d8dee9\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3d434c5e -SETUVAR fish_color_status:bf616a -SETUVAR fish_color_user:a3be8c -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting:\x1d -SETUVAR fish_key_bindings:fish_vi_key_bindings -SETUVAR fish_pager_color_background:\x1d -SETUVAR fish_pager_color_completion:e5e9f0 -SETUVAR fish_pager_color_description:ebcb8b\x1e\x2d\x2ditalics -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:3b4252\x1e\x2d\x2dbackground\x3dd08770 -SETUVAR fish_pager_color_secondary_background:\x1d -SETUVAR fish_pager_color_secondary_completion:\x1d -SETUVAR fish_pager_color_secondary_description:\x1d -SETUVAR fish_pager_color_secondary_prefix:\x1d -SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d434c5e -SETUVAR fish_pager_color_selected_completion:\x1d -SETUVAR fish_pager_color_selected_description:\x1d -SETUVAR fish_pager_color_selected_prefix:\x1d diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua index 22dd17c..ec08493 100644 --- a/dot_config/nvim/lua/config/lazy.lua +++ b/dot_config/nvim/lua/config/lazy.lua @@ -11,14 +11,6 @@ require("lazy").setup({ -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extras modules here - { import = "lazyvim.plugins.extras.test.core" }, - { import = "lazyvim.plugins.extras.dap.core" }, - { import = "lazyvim.plugins.extras.lang.go" }, - { import = "lazyvim.plugins.extras.lang.rust" }, - { import = "lazyvim.plugins.extras.lang.json" }, - { import = "lazyvim.plugins.extras.lang.markdown" }, - { import = "lazyvim.plugins.extras.lang.clangd" }, - { import = "lazyvim.plugins.extras.lang.tex" }, -- import/override with your plugins { import = "plugins" }, }, diff --git a/dot_config/nvim/lua/plugins/test.lua b/dot_config/nvim/lua/plugins/test.lua deleted file mode 100644 index aef9b15..0000000 --- a/dot_config/nvim/lua/plugins/test.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - { - "nvim-neotest/neotest", - opts = { - adapters = { - ["neotest-go"] = { - -- Here we can set options for neotest-go, e.g. - -- args = { "-tags=integration" } - }, - }, - }, - }, -} diff --git a/dot_ssh/config.tmpl b/dot_ssh/config.tmpl index 7d84b01..d983d5d 100644 --- a/dot_ssh/config.tmpl +++ b/dot_ssh/config.tmpl @@ -41,8 +41,13 @@ HostName alex User unrz254 ProxyJump csnhr -Host meggie -HostName meggie +Host woody +HostName woody +User unrz254 +ProxyJump csnhr + +Host tinyx +HostName tinyx User unrz254 ProxyJump csnhr