From 8f043e33fcb09af173ab2d469a083ea75c704a86 Mon Sep 17 00:00:00 2001 From: dabruh <11458706-dabruh@users.noreply.gitlab.com> Date: Tue, 29 Aug 2023 13:53:53 +0200 Subject: [PATCH] Replace Alacritty with Kitty --- .config/alacritty/alacritty.yml | 51 ---------------------- .config/i3/layers/config.post-main-10-misc | 6 +-- .config/i3/layers/config.pre-main-00-vars | 6 +-- .config/kitty/kitty.conf | 8 ++++ .config/kitty/user.conf | 41 +++++++++++++++++ .config/picom/picom.conf | 8 ++-- .config/shell/profile | 2 +- .installer/packages | 4 +- .local/bin/dmenubible | 2 +- .local/bin/dmenugtranslate | 2 +- .local/bin/randverse | 2 +- .local/share/applications/file.desktop | 2 +- .local/share/applications/mail.desktop | 2 +- .local/share/applications/text.desktop | 2 +- setup_system.sh | 14 ------ 15 files changed, 68 insertions(+), 84 deletions(-) delete mode 100644 .config/alacritty/alacritty.yml create mode 100644 .config/kitty/kitty.conf create mode 100644 .config/kitty/user.conf diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml deleted file mode 100644 index c8e798d..0000000 --- a/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,51 +0,0 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator. -# -# Reference: https://raw.githubusercontent.com/alacritty/alacritty/master/alacritty.yml - -env: - TERM: xterm-256color - -window: - dynamic_padding: true - decorations: none - opacity: 0.75 - padding: - x: 5 - y: 5 - -scrolling: - history: 100000 - -font: - size: 10.0 - normal: - family: Hack - -# Colors (One Half Dark) -colors: - primary: - background: "#000000" - foreground: "0xdcdfe4" - - normal: - black: "0x282c34" - red: "0xe06c75" - green: "0x98c379" - yellow: "0xe5c07b" - blue: "0x61afef" - magenta: "0xc678dd" - cyan: "0x56b6c2" - white: "0xdcdfe4" - - bright: - black: "#636e72" - red: "0xe06c75" - green: "0x98c379" - yellow: "0xe5c07b" - blue: "0x61afef" - magenta: "0xc678dd" - cyan: "0x56b6c2" - white: "0xdcdfe4" - -bell: - duration: 500 diff --git a/.config/i3/layers/config.post-main-10-misc b/.config/i3/layers/config.post-main-10-misc index a134639..4446613 100644 --- a/.config/i3/layers/config.post-main-10-misc +++ b/.config/i3/layers/config.post-main-10-misc @@ -1,6 +1,6 @@ # Float the following windows for_window [class="Tor Browser"] floating enable -for_window [class="Alacritty"][title="calculator"] floating enable +for_window [class="kitty"][title="calculator"] floating enable # Start screenshot capture bindsym $mod+Ctrl+s exec "$screenshot_cmd" @@ -13,11 +13,11 @@ bindsym $mod+Ctrl+Return exec "$file_cmd" # gtranslate through dmenu bindsym $mod+Ctrl+t exec dmenugtranslate -for_window [class="Alacritty"][title="translation"] floating enable +for_window [class="kitty"][title="translation"] floating enable # emoji selection through dmenu bindsym $mod+Ctrl+e exec dmenuunicode # Random Bible verse bindsym $mod+Ctrl+Shift+b exec randverse -for_window [class="Alacritty"][title="bible"] floating enable +for_window [class="kitty"][title="bible"] floating enable diff --git a/.config/i3/layers/config.pre-main-00-vars b/.config/i3/layers/config.pre-main-00-vars index 2f56156..f6762f3 100644 --- a/.config/i3/layers/config.pre-main-00-vars +++ b/.config/i3/layers/config.pre-main-00-vars @@ -8,8 +8,8 @@ set $file $FILE set $lock_after_min 1 set $lock_notify_sec 10 set $screenshot_cmd flameshot gui -set $file_cmd alacritty -e ranger -set $calc_cmd alacritty --title calculator -e bc -l +set $file_cmd kitty ranger +set $calc_cmd kitty --title calculator bc -l set $browser firefox -set $terminal alacritty +set $terminal kitty diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf new file mode 100644 index 0000000..8fbedd7 --- /dev/null +++ b/.config/kitty/kitty.conf @@ -0,0 +1,8 @@ +# Reference: https://sw.kovidgoyal.net/kitty/conf/ + +font_family hack +scrollback_lines 100000 +mouse_hide_wait 3.0 +url_color #e5c07b + +include user.conf diff --git a/.config/kitty/user.conf b/.config/kitty/user.conf new file mode 100644 index 0000000..e5ed76e --- /dev/null +++ b/.config/kitty/user.conf @@ -0,0 +1,41 @@ +font_size 12.0 + +hide_window_decorations yes +window_padding_width 5 + +background_opacity 0.75 + +background #000000 +foreground #dcdfe4 + +# black +color0 #282c34 +color8 #636e72 + +# red +color1 #e06c75 +color9 #e06c75 + +# green +color2 #98c379 +color10 #98c379 + +# yellow +color3 #e5c07b +color11 #e5c07b + +# blue +color4 #61afef +color12 #61afef + +# magenta +color5 #c678dd +color13 #c678dd + +# cyan +color6 #56b6c2 +color14 #56b6c2 + +# white +color7 #dcdfe4 +color15 #dcdfe4 diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 8d925a9..43f51e4 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -59,9 +59,9 @@ frame-opacity = 1 inactive-opacity-override = false opacity-rule = [ - # terminal (Alacritty) - "100:class_g = 'Alacritty' && focused", - "85:class_g = 'Alacritty' && !focused", + # terminal (kitty) + "100:class_g = 'kitty' && focused", + "85:class_g = 'kitty' && !focused", # Flashfocus "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'" @@ -100,7 +100,7 @@ fade-out-step = 0.03 # Specify a list of conditions of windows that should not be faded. fade-exclude = [ - # "class_g = 'Alacritty'", + # "class_g = 'kitty'", ] ################################# diff --git a/.config/shell/profile b/.config/shell/profile index 8f834b6..9e514af 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -6,7 +6,7 @@ export EDITOR=vim export FILE=ranger export IMAGES=feh export PAGER=less -export TERMINAL=alacritty +export TERMINAL=kitty export VISUAL=code # Clean home: diff --git a/.installer/packages b/.installer/packages index 4f48502..9e91eda 100644 --- a/.installer/packages +++ b/.installer/packages @@ -1,6 +1,6 @@ pacman-base:acpi wget curl # Required for setup_system.sh pacman-any:i3-gaps feh i3status network-manager-applet pasystray xautolock inotify-tools xss-lock noto-fonts-emoji -pacman-any:zsh tmux code vim ufw scrot dunst arandr ranger thunar flameshot +pacman-any:arandr code dunst flameshot kitty ranger scrot thunar tmux ufw vim zsh pacman-any:gst-libav phonon-qt5-gstreamer gst-plugins-good qt5-quickcontrols qt5-graphicaleffects qt5-multimedia pacman-type-hasbattery:brightnessctl aur-any:picom-git sddm-theme-aerial-git @@ -8,7 +8,7 @@ aur-any:picom-git sddm-theme-aerial-git apt-base:acpi wget curl ca-certificates gnupg lsb-release # Required for setup_system.sh apt-any:i3 feh i3status nm-tray pasystray xautolock inotify-tools xss-lock fonts-noto-color-emoji fonts-hack-ttf xclip apt-any:docker-ce docker-ce-cli containerd.io docker-compose-plugin -apt-any:chromium-browser zsh tmux codium vim ufw scrot dunst arandr ranger thunar flameshot +apt-any:arandr chromium-browser codium dunst flameshot kitty ranger scrot thunar tmux ufw vim zsh apt-any:libxext-dev libxcb1-dev libxcb-damage0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-randr0-dev libxcb-composite0-dev libxcb-image0-dev libxcb-present-dev libxcb-xinerama0-dev libxcb-glx0-dev libpixman-1-dev libdbus-1-dev libconfig-dev libgl1-mesa-dev libpcre2-dev libpcre3-dev libevdev-dev uthash-dev libev-dev libx11-xcb-dev meson apt-any:python3 python3-pip apt-any:sddm gstreamer1.0-libav phonon4qt5-backend-gstreamer gstreamer1.0-plugins-good qml-module-qtquick-controls qml-module-qtgraphicaleffects qml-module-qtmultimedia diff --git a/.local/bin/dmenubible b/.local/bin/dmenubible index fe0c91a..ffdfd20 100755 --- a/.local/bin/dmenubible +++ b/.local/bin/dmenubible @@ -11,4 +11,4 @@ CHAPTERS="$(cut -d' ' -f1 $BIBLE | grep -o "^${BOOK}[[:digit:]]*" | uniq)" CHAPTER="$(xargs -n 1 <<<"$CHAPTERS" | dmenu -i -l 30 -p "$BOOK chapter")" echo "Chose chapter: '$CHAPTER'." -alacritty --title bible -e bash -c "vim <(grep '^${CHAPTER}:' $BIBLE)" +kitty --title bible bash -c "vim <(grep '^${CHAPTER}:' $BIBLE)" diff --git a/.local/bin/dmenugtranslate b/.local/bin/dmenugtranslate index 8d0321f..09b59b1 100755 --- a/.local/bin/dmenugtranslate +++ b/.local/bin/dmenugtranslate @@ -46,4 +46,4 @@ fi echo "$translation" printf '%s' "$translation" | xclip -selection clipboard notify-send "Translation from $from_code to $to_code copied to clipboard." & -alacritty --title translation -e bash -c "echo '$translation' | less" & +kitty --title translation bash -c "echo '$translation' | less" & diff --git a/.local/bin/randverse b/.local/bin/randverse index f22dccd..f1d2b8b 100755 --- a/.local/bin/randverse +++ b/.local/bin/randverse @@ -12,4 +12,4 @@ VERSE="$(sed -n "${LINE}p" "$BIBLE")" echo "$VERSE" printf '%s' "$VERSE" | xclip -selection clipboard notify-send "Bible verse copied to clipboard." & -alacritty --title bible -e bash -c "echo '$VERSE' | less" & +kitty --title bible bash -c "echo '$VERSE' | less" & diff --git a/.local/share/applications/file.desktop b/.local/share/applications/file.desktop index a139fb8..5067122 100644 --- a/.local/share/applications/file.desktop +++ b/.local/share/applications/file.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application Name=File Manager -Exec=/usr/bin/alacritty -e ranger %u +Exec=/usr/bin/kitty ranger %u diff --git a/.local/share/applications/mail.desktop b/.local/share/applications/mail.desktop index 27ff82d..2df6a7f 100644 --- a/.local/share/applications/mail.desktop +++ b/.local/share/applications/mail.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application Name=Mail -Exec=/usr/bin/alacritty -e neomutt %u +Exec=/usr/bin/kitty neomutt %u diff --git a/.local/share/applications/text.desktop b/.local/share/applications/text.desktop index 3557d20..b85f376 100644 --- a/.local/share/applications/text.desktop +++ b/.local/share/applications/text.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application Name=Text editor -Exec=/usr/bin/alacritty -e vim %u +Exec=/usr/bin/kitty vim %u diff --git a/setup_system.sh b/setup_system.sh index be35c7e..cad93a5 100755 --- a/setup_system.sh +++ b/setup_system.sh @@ -220,19 +220,6 @@ function setup_krew_plugins() { done } -function build_alacritty() { - local tmp_dir="/tmp/alacritty" - - echo "Installing Alacritty." - git clone https://github.com/alacritty/alacritty.git $tmp_dir - sudo cargo build --release --manifest-path=$tmp_dir/Cargo.toml - sudo cp $tmp_dir/target/release/alacritty /usr/local/bin - sudo cp $tmp_dir/extra/logo/alacritty-term.svg /usr/share/pixmaps/Alacritty.svg - sudo desktop-file-install $tmp_dir/extra/linux/Alacritty.desktop - sudo update-desktop-database - sudo rm -Rf /tmp/alacritty -} - function change_shell() { sudo chsh -s "$(which zsh)" "$USER" } @@ -324,7 +311,6 @@ function setup_debian_with_apt() { function setup_debian_with_git() { install_picom || return 1 install_sddm_aerial_theme || return 2 - build_alacritty || return 3 } function setup_debian() {