From 5b5903788ce03e42218390f1aa3936c4b0cc6ec6 Mon Sep 17 00:00:00 2001 From: simponic Date: Fri, 5 Jan 2024 23:26:12 -0700 Subject: [PATCH] alacritty.yml -> alacritty.toml, update install emacs script --- .config/alacritty/alacritty.toml | 447 +++++++++++++++++++++++++ .config/alacritty/alacritty.yml | 161 --------- scripts/install_emacs.sh | 19 +- scripts/machine-specific-zsh/winry.zsh | 15 + 4 files changed, 478 insertions(+), 164 deletions(-) create mode 100644 .config/alacritty/alacritty.toml delete mode 100644 .config/alacritty/alacritty.yml create mode 100644 scripts/machine-specific-zsh/winry.zsh diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..f9a39d6 --- /dev/null +++ b/.config/alacritty/alacritty.toml @@ -0,0 +1,447 @@ +[[colors.indexed_colors]] +color = "0xaf3a03" +index = 16 + +[[colors.indexed_colors]] +color = "0xd65d0e" +index = 17 + +[[colors.indexed_colors]] +color = "0xebdbb2" +index = 18 + +[[colors.indexed_colors]] +color = "0xd5c4a1" +index = 19 + +[[colors.indexed_colors]] +color = "0x665c54" +index = 20 + +[[colors.indexed_colors]] +color = "0x3c3836" +index = 21 + +[colors.bright] +black = "0xbdae93" +blue = "0x076678" +cyan = "0x427b58" +green = "0x79740e" +magenta = "0x8f3f71" +red = "0x9d0006" +white = "0x282828" +yellow = "0xb57614" + +[colors.cursor] +cursor = "0x504945" +text = "0xfbf1c7" + +[colors.normal] +black = "0xfbf1c7" +blue = "0x076678" +cyan = "0x427b58" +green = "0x79740e" +magenta = "0x8f3f71" +red = "0x9d0006" +white = "0x504945" +yellow = "0xb57614" + +[colors.primary] +background = "0xfbf1c7" +foreground = "0x504945" + +[cursor] +style = "Block" +unfocused_hollow = false + +[font] +size = 10.0 + +[font.bold] +family = "JetBrains Mono" + +[font.glyph_offset] +x = 0 +y = 0 + +[font.italic] +family = "JetBrains Mono" + +[font.normal] +family = "JetBrains Mono" + +[font.offset] +x = 0 +y = 0 + +[[keyboard.bindings]] +chars = "\u001Ba" +key = "A" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bb" +key = "B" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bc" +key = "C" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bd" +key = "D" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Be" +key = "E" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bf" +key = "F" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bg" +key = "G" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bh" +key = "H" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bi" +key = "I" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bj" +key = "J" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bk" +key = "K" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bl" +key = "L" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bm" +key = "M" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bn" +key = "N" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bo" +key = "O" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bp" +key = "P" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bq" +key = "Q" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Br" +key = "R" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bs" +key = "S" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bt" +key = "T" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bu" +key = "U" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bv" +key = "V" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bw" +key = "W" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bx" +key = "X" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001By" +key = "Y" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bz" +key = "Z" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001BA" +key = "A" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BB" +key = "B" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BC" +key = "C" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BD" +key = "D" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BE" +key = "E" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BF" +key = "F" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BG" +key = "G" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BH" +key = "H" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BI" +key = "I" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BJ" +key = "J" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BK" +key = "K" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BL" +key = "L" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BM" +key = "M" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BN" +key = "N" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BO" +key = "O" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BP" +key = "P" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BQ" +key = "Q" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BR" +key = "R" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BS" +key = "S" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BT" +key = "T" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BU" +key = "U" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BV" +key = "V" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BW" +key = "W" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BX" +key = "X" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BY" +key = "Y" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001BZ" +key = "Z" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001B1" +key = "Key1" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B2" +key = "Key2" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B3" +key = "Key3" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B4" +key = "Key4" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B5" +key = "Key5" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B6" +key = "Key6" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B7" +key = "Key7" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B8" +key = "Key8" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B9" +key = "Key9" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B0" +key = "Key0" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u0000" +key = "Space" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B." +key = "Period" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B*" +key = "Key8" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001B#" +key = "Key3" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001B>" +key = "Period" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001B<" +key = "Comma" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001B_" +key = "Minus" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001B%" +key = "Key5" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001B^" +key = "Key6" +mods = "Alt|Shift" + +[[keyboard.bindings]] +chars = "\u001B\\" +key = "Backslash" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B|" +key = "Backslash" +mods = "Alt|Shift" + +[window] +dynamic_padding = true + +[window.padding] +x = 12 +y = 12 diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml deleted file mode 100644 index bd8bb92..0000000 --- a/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,161 +0,0 @@ -font: - normal: - family: "CozetteVector" - options: - antialias: on - - bold: - family: "CozetteVector" - - italic: - family: "CozetteVector" - - size: 13.0 - - offset: - x: 0 - y: 0 - - glyph_offset: - x: 0 - y: 0 - - - - -window: - padding: - x: 12 - y: 12 - dynamic_padding: true -# decorations: none - - -cursor: - style: Block - unfocused_hollow: false -# thickness: 0.33 - - -# Base16 Gruvbox light, medium 256 - alacritty color config -# Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) -colors: - # Default colors - primary: - background: '0xfbf1c7' - foreground: '0x504945' - - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '0xfbf1c7' - cursor: '0x504945' - - # Normal colors - normal: - black: '0xfbf1c7' - red: '0x9d0006' - green: '0x79740e' - yellow: '0xb57614' - blue: '0x076678' - magenta: '0x8f3f71' - cyan: '0x427b58' - white: '0x504945' - - # Bright colors - bright: - black: '0xbdae93' - red: '0x9d0006' - green: '0x79740e' - yellow: '0xb57614' - blue: '0x076678' - magenta: '0x8f3f71' - cyan: '0x427b58' - white: '0x282828' - - indexed_colors: - - { index: 16, color: '0xaf3a03' } - - { index: 17, color: '0xd65d0e' } - - { index: 18, color: '0xebdbb2' } - - { index: 19, color: '0xd5c4a1' } - - { index: 20, color: '0x665c54' } - - { index: 21, color: '0x3c3836' } - -key_bindings: - - { key: A, mods: Alt, chars: "\x1ba" } - - { key: B, mods: Alt, chars: "\x1bb" } - - { key: C, mods: Alt, chars: "\x1bc" } - - { key: D, mods: Alt, chars: "\x1bd" } - - { key: E, mods: Alt, chars: "\x1be" } - - { key: F, mods: Alt, chars: "\x1bf" } - - { key: G, mods: Alt, chars: "\x1bg" } - - { key: H, mods: Alt, chars: "\x1bh" } - - { key: I, mods: Alt, chars: "\x1bi" } - - { key: J, mods: Alt, chars: "\x1bj" } - - { key: K, mods: Alt, chars: "\x1bk" } - - { key: L, mods: Alt, chars: "\x1bl" } - - { key: M, mods: Alt, chars: "\x1bm" } - - { key: N, mods: Alt, chars: "\x1bn" } - - { key: O, mods: Alt, chars: "\x1bo" } - - { key: P, mods: Alt, chars: "\x1bp" } - - { key: Q, mods: Alt, chars: "\x1bq" } - - { key: R, mods: Alt, chars: "\x1br" } - - { key: S, mods: Alt, chars: "\x1bs" } - - { key: T, mods: Alt, chars: "\x1bt" } - - { key: U, mods: Alt, chars: "\x1bu" } - - { key: V, mods: Alt, chars: "\x1bv" } - - { key: W, mods: Alt, chars: "\x1bw" } - - { key: X, mods: Alt, chars: "\x1bx" } - - { key: Y, mods: Alt, chars: "\x1by" } - - { key: Z, mods: Alt, chars: "\x1bz" } - - { key: A, mods: Alt|Shift, chars: "\x1bA" } - - { key: B, mods: Alt|Shift, chars: "\x1bB" } - - { key: C, mods: Alt|Shift, chars: "\x1bC" } - - { key: D, mods: Alt|Shift, chars: "\x1bD" } - - { key: E, mods: Alt|Shift, chars: "\x1bE" } - - { key: F, mods: Alt|Shift, chars: "\x1bF" } - - { key: G, mods: Alt|Shift, chars: "\x1bG" } - - { key: H, mods: Alt|Shift, chars: "\x1bH" } - - { key: I, mods: Alt|Shift, chars: "\x1bI" } - - { key: J, mods: Alt|Shift, chars: "\x1bJ" } - - { key: K, mods: Alt|Shift, chars: "\x1bK" } - - { key: L, mods: Alt|Shift, chars: "\x1bL" } - - { key: M, mods: Alt|Shift, chars: "\x1bM" } - - { key: N, mods: Alt|Shift, chars: "\x1bN" } - - { key: O, mods: Alt|Shift, chars: "\x1bO" } - - { key: P, mods: Alt|Shift, chars: "\x1bP" } - - { key: Q, mods: Alt|Shift, chars: "\x1bQ" } - - { key: R, mods: Alt|Shift, chars: "\x1bR" } - - { key: S, mods: Alt|Shift, chars: "\x1bS" } - - { key: T, mods: Alt|Shift, chars: "\x1bT" } - - { key: U, mods: Alt|Shift, chars: "\x1bU" } - - { key: V, mods: Alt|Shift, chars: "\x1bV" } - - { key: W, mods: Alt|Shift, chars: "\x1bW" } - - { key: X, mods: Alt|Shift, chars: "\x1bX" } - - { key: Y, mods: Alt|Shift, chars: "\x1bY" } - - { key: Z, mods: Alt|Shift, chars: "\x1bZ" } - - { key: Key1, mods: Alt, chars: "\x1b1" } - - { key: Key2, mods: Alt, chars: "\x1b2" } - - { key: Key3, mods: Alt, chars: "\x1b3" } - - { key: Key4, mods: Alt, chars: "\x1b4" } - - { key: Key5, mods: Alt, chars: "\x1b5" } - - { key: Key6, mods: Alt, chars: "\x1b6" } - - { key: Key7, mods: Alt, chars: "\x1b7" } - - { key: Key8, mods: Alt, chars: "\x1b8" } - - { key: Key9, mods: Alt, chars: "\x1b9" } - - { key: Key0, mods: Alt, chars: "\x1b0" } - - { key: Space, mods: Control, chars: "\x00" } # Ctrl + Space - - { key: Grave, mods: Alt, chars: "\x1b`" } # Alt + ` - - { key: Grave, mods: Alt|Shift, chars: "\x1b~" } # Alt + ~ - - { key: Period, mods: Alt, chars: "\x1b." } # Alt + . - - { key: Key8, mods: Alt|Shift, chars: "\x1b*" } # Alt + * - - { key: Key3, mods: Alt|Shift, chars: "\x1b#" } # Alt + # - - { key: Period, mods: Alt|Shift, chars: "\x1b>" } # Alt + > - - { key: Comma, mods: Alt|Shift, chars: "\x1b<" } # Alt + < - - { key: Minus, mods: Alt|Shift, chars: "\x1b_" } # Alt + _ - - { key: Key5, mods: Alt|Shift, chars: "\x1b%" } # Alt + % - - { key: Key6, mods: Alt|Shift, chars: "\x1b^" } # Alt + ^ - - { key: Backslash, mods: Alt, chars: "\x1b\\" } # Alt + \ - - { key: Backslash, mods: Alt|Shift, chars: "\x1b|" } # Alt + | - - -#colors: *gruvbox_material_medium_light diff --git a/scripts/install_emacs.sh b/scripts/install_emacs.sh index 041ead1..b0f1e96 100755 --- a/scripts/install_emacs.sh +++ b/scripts/install_emacs.sh @@ -1,6 +1,6 @@ #!/bin/sh [ -z "$EMACS_VERSION" ] && echo "Usage: EMACS_VERSION=25.1 install-emacs.sh or EMACS_VERSION=snapshot install-emacs.sh" && exit 1 -[ -z "$EMACS_URL" ] && EMACS_URL="http://mirror.aarnet.edu.au/pub/gnu/emacs/" +[ -z "$EMACS_URL" ] && EMACS_URL="http://mirror.aarnet.edu.au/pub/gnu/emacs" [ -z "$EMACS_TMP" ] && EMACS_TMP="/tmp" if [ "$EMACS_VERSION" != "snapshot" ]; then @@ -12,8 +12,21 @@ echo "Installing Emacs ..." if [ "$EMACS_VERSION" = "snapshot" ]; then cd $HOME/projs/emacs && mkdir -p $HOME/myemacs/snapshot && rm -rf $HOME/myemacs/snapshot/* && ./autogen.sh && ./configure CFLAGS=-no-pie --prefix=$HOME/myemacs/snapshot --without-x --without-dbus --without-sound --with-gnutls=no && make -j6 && make install echo "Emacs snapshot was installed!" -elif [ "$EMACS_VERSION" = "28.1" ]; then - cd $EMACS_TMP/emacs-$EMACS_VERSION && mkdir -p $HOME/myemacs/$EMACS_VERSION && rm -rf $HOME/myemacs/$EMACS_VERSION/* && ./configure CFLAGS=-no-pie --prefix=$HOME/myemacs/$EMACS_VERSION --without-x --without-sound --with-gnutls=no --with-modules --with-native-compilation --without-compress-install && make -j6 && make install +elif [ "$EMACS_VERSION" = "29.1" ]; then + cd $EMACS_TMP/emacs-$EMACS_VERSION + mkdir -p $HOME/myemacs/$EMACS_VERSION + rm -rf $HOME/myemacs/$EMACS_VERSION/* + ./configure CFLAGS=-no-pie --prefix=$HOME/myemacs/$EMACS_VERSION \ + --with-x-toolkit=gtk3 \ + --with-json \ + --with-native-compilation=aot \ + --without-compress-install \ + --with-modules \ + --with-imagemagick \ + --with-tree-sitter \ + --with-xpm=ifavailable --with-gif=ifavailable --with-gnutls=ifavailable + make -j $(nproc) + make install else cd $EMACS_TMP/emacs-$EMACS_VERSION && mkdir -p $HOME/myemacs/$EMACS_VERSION && rm -rf $HOME/myemacs/$EMACS_VERSION/* && ./configure CFLAGS=-no-pie --prefix=$HOME/myemacs/$EMACS_VERSION --without-x --without-sound --with-gnutls=no --with-modules && make -j6 && make install rm -rf $EMACS_TMP/emacs-$EMACS_VERSION diff --git a/scripts/machine-specific-zsh/winry.zsh b/scripts/machine-specific-zsh/winry.zsh new file mode 100644 index 0000000..870f24b --- /dev/null +++ b/scripts/machine-specific-zsh/winry.zsh @@ -0,0 +1,15 @@ +export PATH="/home/lizzy/.roswell/bin:/home/lizzy/.local/bin$PATH" + +# asdf +[ -f /opt/asdf-vm/asdf.sh ] && . /opt/asdf-vm/asdf.sh + + # ghcup-env +[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" + +export XDG_CURRENT_DESKTOP=sway +export XDG_SESSION_DESKTOP=sway +export QT_QPA_PLATFORM=wayland +export QT_QPA_PLATFORMTHEME=qt5ct +export QT_QPA_PLATFORM=wayland +#export GDK_BACKEND=wayland +export MOZ_ENABLE_WAYLAND=1