diff --git a/fish/config.fish b/fish/config.fish index 7aa99bc..1e8b41d 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -11,6 +11,7 @@ if status is-interactive # Abbrs abbr gd 'git diff' + abbr ga 'git add .' abbr gc 'git commit -am' abbr gl 'git log' abbr gs 'git status' @@ -21,6 +22,9 @@ if status is-interactive abbr gsw 'git switch' abbr gsm 'git switch main' abbr gb 'git branch' + abbr gbd 'git branch -d' + abbr gco 'git checkout' + abbr gsh 'git show' abbr l 'ls' abbr ll 'ls -l' diff --git a/ghostty/config b/ghostty/config new file mode 100644 index 0000000..fc9e51d --- /dev/null +++ b/ghostty/config @@ -0,0 +1,37 @@ +# This is the configuration file for Ghostty. +# +# This template file has been automatically created at the following +# path since Ghostty couldn't find any existing config files on your system: +# +# /home/ceres/.config/ghostty/config +# +# The template does not set any default options, since Ghostty ships +# with sensible defaults for all options. Users should only need to set +# options that they want to change from the default. +# +# Run `ghostty +show-config --default --docs` to view a list of +# all available config options and their default values. +# +# Additionally, each config option is also explained in detail +# on Ghostty's website, at https://ghostty.org/docs/config. +# +# Ghostty can reload the configuration while running by using the menu +# # All of these are identical: +# key=value +# key= value +# key =value +# key = value +# +# # Any line beginning with a # is a comment. It's not possible to put +# # a comment after a config option, since it would be interpreted as a +# # part of the value. For example, this will have a value of "#123abc": +# background = #123abc +# +# # Empty values are used to reset config keys to default. +# key = +# +# # Some config options have unique syntaxes for their value, +# # which is explained in the docs for that config option. +# # Just for example: +# resize-overlay-duration = 4s 200ms +font-family = Maple Mono NF diff --git a/hypr/hyprland/custom-labob.conf b/hypr/hyprland/custom-labob.conf index 2303b32..5b7aba8 100644 --- a/hypr/hyprland/custom-labob.conf +++ b/hypr/hyprland/custom-labob.conf @@ -2,6 +2,9 @@ exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" # exec = gsettings set org.gnome.desktop.interface gtk-theme "adw-gtk3" # for GTK3 apps env = QT_QPA_PLATFORMTHEME,qt6ct +$terminal = foot +$fileExplorer = foot fish -C yazi + input { kb_layout = gb } \ No newline at end of file diff --git a/hypr/hyprland/custom-peecee.conf b/hypr/hyprland/custom-peecee.conf index 2ecf1f2..824cf59 100644 --- a/hypr/hyprland/custom-peecee.conf +++ b/hypr/hyprland/custom-peecee.conf @@ -2,6 +2,9 @@ monitor = HDMI-A-2, 1920x1080@60, 0x0, 1 monitor = HDMI-A-1, 1920x1080@60, 1920x0, 1 +$terminal = ghostty +$fileExplorer = ghostty -e fish -C yazi + workspace= name:1, monitor:HDMI-A-2 input { diff --git a/hypr/hyprland/keybinds.conf b/hypr/hyprland/keybinds.conf index 8d7af5f..6e8a1af 100644 --- a/hypr/hyprland/keybinds.conf +++ b/hypr/hyprland/keybinds.conf @@ -114,7 +114,7 @@ bind = Super+Alt, S, movetoworkspace, special:special # Window groups binde = $kbWindowGroupCycleNext, cyclenext, activewindow -binde = $kbWindowGroupCycleNext, cyclenext, prev, activewindow +binde = $kbWindowGroupCyclePrev, cyclenext, prev, activewindow binde = Ctrl+Alt, Tab, changegroupactive, f binde = Ctrl+Shift+Alt, Tab, changegroupactive, b bind = $kbToggleGroup, togglegroup diff --git a/hypr/variables.conf b/hypr/variables.conf index f612152..cf4a755 100644 --- a/hypr/variables.conf +++ b/hypr/variables.conf @@ -1,8 +1,6 @@ # ### Hyprland ### # Apps -$terminal = foot $editor = code -$fileExplorer = foot fish -C yazi $browser = zen # Touchpad diff --git a/install.fish b/install.fish index 2500d2c..106724a 100755 --- a/install.fish +++ b/install.fish @@ -118,30 +118,27 @@ if ! set -q _flag_noconfirm end -if test $(lsb_release -is) = Gentoo - emerge -v gui-wm/caelestia-meta -else - # Install AUR helper if not already installed - if ! pacman -Q $aur_helper &> /dev/null - log "$aur_helper not installed. Installing..." +# Install AUR helper if not already installed +#if ! pacman -Q $aur_helper &> /dev/null +# log "$aur_helper not installed. Installing..." - # Install - sudo pacman -S --needed git base-devel $noconfirm - cd /tmp - git clone https://aur.archlinux.org/$aur_helper.git - cd $aur_helper - makepkg -si - cd .. - rm -rf $aur_helper + # Install +# sudo pacman -S --needed git base-devel $noconfirm +# cd /tmp +# git clone https://aur.archlinux.org/$aur_helper.git +# cd $aur_helper +# makepkg -si +# cd .. +# rm -rf $aur_helper + +# Setup +#if $aur_helper = yay +# $aur_helper -Y --gendb +# $aur_helper -Y --devel --save +#else +# $aur_helper --gendb +#end - # Setup - if $aur_helper = yay - $aur_helper -Y --gendb - $aur_helper -Y --devel --save - else - $aur_helper --gendb - end -end # Cd into dir cd (dirname (status filename)) || exit 1 diff --git a/zen/userChrome.css b/zen/userChrome.css index c18078a..355ea56 100644 --- a/zen/userChrome.css +++ b/zen/userChrome.css @@ -30,6 +30,7 @@ --in-content-primary-button-text-color: var(--c-text) !important; --in-content-primary-button-background: var(--toolbarbutton-hover-background) !important; --in-content-primary-button-background-hover: var(--toolbarbutton-active-background) !important; + font-family: Maple Mono NF !important; font-size: 16pt } tooltip {