From 166e3869a30693d07d0cb23d414d38d676e6ed78 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 5 Aug 2023 18:44:44 +0100 Subject: Configure git and mercurial --- git/.gitconfig | 3 ++ hg/.hgrc | 25 ++++++++++ kitty/.config/kitty/current-theme.conf | 90 +++++++++++++++++++++------------- kitty/.config/kitty/kitty.conf | 6 +-- zsh-fish/.zprofile | 7 ++- 5 files changed, 91 insertions(+), 40 deletions(-) create mode 100644 hg/.hgrc diff --git a/git/.gitconfig b/git/.gitconfig index 060f7b4..308f163 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -38,3 +38,6 @@ [status] submoduleSummary = true + +[core] + excludesfile = ~/.gitignore diff --git a/hg/.hgrc b/hg/.hgrc new file mode 100644 index 0000000..5be3cd3 --- /dev/null +++ b/hg/.hgrc @@ -0,0 +1,25 @@ +# example user config (see 'hg help config' for more info) +[ui] +username = Yann Herklotz + +[extensions] +patchbomb = +gpg = +absorb = +convert = +evolve = +topic = +hggit = + +[email] +from = Yann Herklotz +cc = + +[diff] +git = 1 + +[patchbomb] +intro = never + +[subrepos] +git:allowed = true diff --git a/kitty/.config/kitty/current-theme.conf b/kitty/.config/kitty/current-theme.conf index eaa3e06..2533db7 100644 --- a/kitty/.config/kitty/current-theme.conf +++ b/kitty/.config/kitty/current-theme.conf @@ -1,60 +1,80 @@ # vim:ft=kitty -## name: Modus Vivendi Tinted -## author: Protesilaos Stavrou -## license: GNU GPLv3 -## blurb: Highly accessible themes made for GNU Emacs, conforming with the highest -## standard for colour contrast between background and foreground values (WCAG AAA) +## name: Catppuccin-Mocha +## author: Pocco81 (https://github.com/Pocco81) +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + # The basic colors -foreground #ffffff -background #0d0e1c -selection_foreground #ffffff -selection_background #5c5c5c +foreground #CDD6F4 +background #1E1E2E +selection_foreground #1E1E2E +selection_background #F5E0DC # Cursor colors -cursor #ffffff -cursor_text_color #0d0e1c +cursor #F5E0DC +cursor_text_color #1E1E2E + +# URL underline color when hovering with mouse +url_color #F5E0DC -# kitty window border colors -active_border_color #c6daff -inactive_border_color #595959 +# Kitty window border colors +active_border_color #B4BEFE +inactive_border_color #6C7086 +bell_border_color #F9E2AF + +# OS Window titlebar colors +wayland_titlebar_color system +macos_titlebar_color system # Tab bar colors -active_tab_foreground #ffffff -active_tab_background #4a4f6a -inactive_tab_foreground #969696 -inactive_tab_background #2b3046 +active_tab_foreground #11111B +active_tab_background #CBA6F7 +inactive_tab_foreground #CDD6F4 +inactive_tab_background #181825 +tab_bar_background #11111B + +# Colors for marks (marked text in the terminal) +mark1_foreground #1E1E2E +mark1_background #B4BEFE +mark2_foreground #1E1E2E +mark2_background #CBA6F7 +mark3_foreground #1E1E2E +mark3_background #74C7EC + +# The 16 terminal colors -# The basic 16 colors # black -color0 #0d0e1c -color8 #595959 +color0 #45475A +color8 #585B70 # red -color1 #ff5f59 -color9 #ff7f9f +color1 #F38BA8 +color9 #F38BA8 # green -color2 #44bc44 -color10 #70b900 +color2 #A6E3A1 +color10 #A6E3A1 # yellow -color3 #d0bc00 -color11 #fec43f +color3 #F9E2AF +color11 #F9E2AF # blue -color4 #2fafff -color12 #79a8ff +color4 #89B4FA +color12 #89B4FA # magenta -color5 #feacd0 -color13 #b6a0ff +color5 #F5C2E7 +color13 #F5C2E7 # cyan -color6 #00d3d0 -color14 #6ae4b9 +color6 #94E2D5 +color14 #94E2D5 # white -color7 #989898 -color15 #ffffff +color7 #BAC2DE +color15 #A6ADC8 diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index cc72d50..08fc244 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -1456,7 +1456,7 @@ shell_integration no-cursor #: background_opacity. If you want to use both, you are probably #: better off just hiding the titlebar with hide_window_decorations. -# macos_option_as_alt no +macos_option_as_alt left #: Use the Option key as an Alt key on macOS. With this set to no, #: kitty will use the macOS native Option+Key to enter Unicode @@ -2289,6 +2289,6 @@ shell_integration no-cursor #: }}} # BEGIN_KITTY_THEME -# Modus Vivendi Tinted +# Catppuccin-Mocha include current-theme.conf -# END_KITTY_THEME \ No newline at end of file +# END_KITTY_THEME diff --git a/zsh-fish/.zprofile b/zsh-fish/.zprofile index adac3a5..be5dd5d 100644 --- a/zsh-fish/.zprofile +++ b/zsh-fish/.zprofile @@ -1,8 +1,8 @@ export _JAVA_AWT_WM_NONREPARENTING=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 -export EDITOR=nvim -export VISUAL=emacs +export EDITOR="emacsclient -nw" +export VISUAL="emacsclient -c" export CLICOLOR=1 export LEDGER_FILE=$HOME/Dropbox/ledger/main.ledger @@ -33,6 +33,9 @@ PATH=$HOME/.ghcup/bin:$PATH PATH=$HOME/.local/bin:$PATH PATH=$HOME/Library/ConTeXt/tex/texmf-osx-64/bin:$PATH PATH=/opt/context/tex/texmf-linux-64/bin:$PATH +PATH="/usr/local/opt/openjdk/bin:$PATH" +PATH="/usr/local/opt/m4/bin:$PATH" +PATH="/usr/local/opt/llvm/bin:$PATH" export PATH -- cgit