Merge remote-tracking branch 'upstream/main'

Fixes #159

Meta package was removed so use local PKGBUILD
Yay doesn't support building and installing local PKGBUILDs, so use paru

.gitignore

@@ -1,4 +1,5 @@
 /hypr/scheme/current.conf
+hypr/hyprland/custom-by-hostname.conf
 
 /spicetify/config-xpui.ini
 /spicetify/Themes/caelestia/color.ini
@@ -7,3 +8,7 @@
 /btop/themes/
 
 /fish/fish_variables
+
+/vscode/settings.json
+
+.SRCINFO

PKGBUILD

@@ -0,0 +1,26 @@
+# caelestia-meta
+
+# Maintainer: Soramane <soramane32 at gmail dot com>
+
+pkgname='caelestia-meta'
+pkgver=r151.cadf1e2
+pkgrel=1
+pkgdesc='A metapackage containing all dependencies for the Caelestia dotfiles'
+arch=('any')
+url='https://github.com/caelestia-dots/caelestia'
+license=('GPL-3.0-only')
+depends=('caelestia-cli' 'caelestia-shell'
+         'hyprland' 'xdg-desktop-portal-hyprland' 'xdg-desktop-portal-gtk' 'hyprpicker'
+         'wl-clipboard' 'cliphist' 'inotify-tools' 'app2unit' 'wireplumber' 'trash-cli'
+         'foot' 'fish' 'eza' 'fastfetch' 'starship' 'btop' 'jq' 'adw-gtk-theme'
+         'papirus-icon-theme' 'qt5ct-kde' 'qt6ct-kde' 'ttf-jetbrains-mono-nerd')
+optdepends=('thunar: file manager'
+            'spotify: music player'
+            'vscode: code editor'
+            'zen-browser: web browser'
+            'todoist-appimage: todo manager'
+            'uwsm: uwsm session'
+            'gnome-keyring: keyring daemon'
+            'polkit-gnome: gnome polkit client'
+            'direnv: isolated dev envs'
+            'zoxide: better cd')

README.md

@@ -46,10 +46,8 @@ Dependencies:
 -   xdg-desktop-portal-hyprland
 -   xdg-desktop-portal-gtk
 -   hyprpicker
--   hypridle
 -   wl-clipboard
 -   cliphist
--   bluez-utils
 -   inotify-tools
 -   app2unit
 -   wireplumber
@@ -60,9 +58,7 @@ Dependencies:
 -   starship
 -   btop
 -   jq
--   socat
--   imagemagick
--   curl
+-   eza
 -   adw-gtk-theme
 -   papirus-icon-theme
 -   qt5ct-kde

fish/config.fish

@@ -2,6 +2,31 @@ if status is-interactive
     # Starship custom prompt
     starship init fish | source
 
+    # Direnv + Zoxide
+    command -v direnv &> /dev/null && direnv hook fish | source
+    command -v zoxide &> /dev/null && zoxide init fish --cmd cd | source
+
+    # Better ls
+    alias ls='eza --icons --group-directories-first -1'
+
+    # Abbrs
+    abbr gd 'git diff'
+    abbr gc 'git commit -am'
+    abbr gl 'git log'
+    abbr gs 'git status'
+    abbr gst 'git stash'
+    abbr gsp 'git stash pop'
+    abbr gp 'git push'
+    abbr gpl 'git pull'
+    abbr gsw 'git switch'
+    abbr gsm 'git switch main'
+    abbr gb 'git branch'
+
+    abbr l 'ls'
+    abbr ll 'ls -l'
+    abbr la 'ls -a'
+    abbr lla 'ls -la'
+
     # Custom colours
     cat ~/.local/state/caelestia/sequences.txt 2> /dev/null
 

fish/functions/fish_greeting.fish

@@ -5,6 +5,6 @@ function fish_greeting
     echo '   / /   / __ `/ _ \/ / _ \/ ___/ __/ / __ `/ '
     echo '  / /___/ /_/ /  __/ /  __(__  ) /_/ / /_/ /  '
     echo '  \____/\__,_/\___/_/\___/____/\__/_/\__,_/   '
-    set_color normal
-    fastfetch --key-padding-left 5
+    echo ''
+    glafetch
 end

fish/functions/update.fish

@@ -0,0 +1,4 @@
+function update --wraps='sudo emerge --sync && sudo emerge -avDNu && sudo smart-live-rebuild' --description 'alias update=sudo emerge --sync && sudo emerge -avDNu && sudo smart-live-rebuild'
+  sudo emerge --sync && sudo emerge -avuDN @world && sudo smart-live-rebuild $argv
+        
+end

hypr/hyprland.conf

@@ -2,6 +2,9 @@ $hypr = ~/.config/hypr
 $hl = $hypr/hyprland
 $cConf = ~/.config/caelestia
 
+exec-once = ln -s "./custom-$HOSTNAME.conf" ~/caelestia/hypr/hyprland/custom-by-hostname.conf &> /dev/null
+source = $hl/custom-by-hostname.conf
+
 # Variables (colours + other vars)
 exec = cp -L --no-preserve=mode --update=none $hypr/scheme/default.conf $hypr/scheme/current.conf
 source = $hypr/scheme/current.conf
@@ -11,9 +14,6 @@ source = $hypr/variables.conf
 exec = mkdir -p $cConf && touch -a $cConf/hypr-vars.conf
 source = $cConf/hypr-vars.conf
 
-# Default monitor conf
-monitor = , preferred, auto, 1
-
 # Configs
 source = $hl/env.conf
 source = $hl/general.conf

hypr/hyprland/custom-labob.conf

@@ -0,0 +1,3 @@
+input {
+    kb_layout = gb
+}

hypr/hyprland/custom-peecee.conf

@@ -0,0 +1,13 @@
+# Default monitor conf
+monitor = HDMI-A-2, 1920x1080@60, 0x0, 1
+monitor = HDMI-A-1, 1920x1080@60, 1920x0, 1
+
+workspace= name:1, monitor:HDMI-A-2
+
+input {
+    kb_layout = us
+    tablet {
+        output = HDMI-A-2 
+        region_size = 1920, 1080
+    }
+}

hypr/hyprland/env.conf

@@ -19,3 +19,4 @@ env = XDG_SESSION_DESKTOP, Hyprland
 
 # ############# Others #############
 env = _JAVA_AWT_WM_NONREPARENTING, 1
+env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket

hypr/hyprland/execs.conf

@@ -26,3 +26,6 @@ exec-once = caelestia resizer -d
 
 # Start shell
 exec-once = caelestia shell -d
+
+# Random Wallpaper
+exec-once = caelestia wallpaper -r

hypr/hyprland/gestures.conf

@@ -7,7 +7,7 @@ gestures {
     workspace_swipe_create_new = true
 }
 
-gesture = $workspaceSwipeFingers, horizontal, workspace
-gesture = $gestureFingers, up, special, special
-gesture = $gestureFingers, down, dispatcher, exec, caelestia toggle specialws
-gesture = $gestureFingersMore, down, dispatcher, exec, systemctl suspend-then-hibernate
+# gesture = $workspaceSwipeFingers, horizontal, workspace
+# gesture = $gestureFingers, up, special, special
+# gesture = $gestureFingers, down, dispatcher, exec, caelestia toggle specialws
+# gesture = $gestureFingersMore, down, dispatcher, exec, systemctl suspend-then-hibernate

hypr/hyprland/input.conf

@@ -1,5 +1,4 @@
 input {
-    kb_layout = us
     numlock_by_default = false
     repeat_delay = 250
     repeat_rate = 35

hypr/hyprland/keybinds.conf

@@ -145,6 +145,7 @@ bind = $kbWindowFullscreen, fullscreen, 0
 bind = $kbWindowBorderedFullscreen, fullscreen, 1  # Fullscreen with borders
 bind = $kbToggleWindowFloating, togglefloating,
 bind = $kbCloseWindow, killactive,
+bind = Super, J, togglesplit
 
 # Special workspace toggles
 bind = $kbSystemMonitor, exec, caelestia toggle sysmon

hypr/hyprland/rules.conf

@@ -36,7 +36,7 @@ windowrule = center 1, class:nwg-look
 windowrule = workspace special:sysmon, class:btop
 windowrule = workspace special:music, class:feishin|Spotify|Supersonic
 windowrule = workspace special:music, initialTitle:Spotify( Free)?  # Spotify wayland, it has no class for some reason
-windowrule = workspace special:communication, class:discord|equibop|vesktop|whatsapp
+windowrule = workspace special:communication, class:discord|equibop|vesktop|whatsapp|org.gnome.Fractal
 windowrule = workspace special:todo, class:Todoist
 
 # Dialogs

hypr/variables.conf

@@ -1,9 +1,9 @@
 # ### Hyprland ###
 # Apps
 $terminal = foot
-$browser = zen-browser
-$editor = codium
-$fileExplorer = thunar
+$editor = code
+$fileExplorer = foot fish -C yazi
+$browser = zen
 
 # Touchpad
 $touchpadDisableTyping = true
@@ -83,7 +83,7 @@ $kbTodo = Super, R
 
 # Apps
 $kbTerminal = Super, T
-$kbBrowser = Super, W
+$kbBrowser = Super, B
 $kbEditor = Super, C
 $kbFileExplorer = Super, E
 

install.fish

@@ -7,13 +7,13 @@ argparse -n 'install.fish' -X 0 \
     'vscode=?!contains -- "$_flag_value" codium code' \
     'discord' \
     'zen' \
-    'paru' \
+    'aur-helper=!contains -- "$_flag_value" yay paru' \
     -- $argv
 or exit
 
 # Print help
 if set -q _flag_h
-    echo 'usage: ./install.sh [-h] [--noconfirm] [--spotify] [--vscode] [--discord] [--paru]'
+    echo 'usage: ./install.sh [-h] [--noconfirm] [--spotify] [--vscode] [--discord] [--aur-helper]'
     echo
     echo 'options:'
     echo '  -h, --help                  show this help message and exit'
@@ -22,7 +22,7 @@ if set -q _flag_h
     echo '  --vscode=[codium|code]      install VSCodium (or VSCode)'
     echo '  --discord                   install Discord (OpenAsar + Equicord)'
     echo '  --zen                       install Zen browser'
-    echo '  --paru                      use paru instead of yay as AUR helper'
+    echo '  --aur-helper=[yay|paru]     the AUR helper to use'
 
     exit
 end
@@ -71,7 +71,7 @@ end
 
 # Variables
 set -q _flag_noconfirm && set noconfirm '--noconfirm'
-set -q _flag_paru && set -l aur_helper paru || set -l aur_helper yay
+set -q _flag_aur_helper && set -l aur_helper $_flag_aur_helper || set -l aur_helper paru
 set -q XDG_CONFIG_HOME && set -l config $XDG_CONFIG_HOME || set -l config $HOME/.config
 set -q XDG_STATE_HOME && set -l state $XDG_STATE_HOME || set -l state $HOME/.local/state
 
@@ -118,31 +118,43 @@ if ! set -q _flag_noconfirm
 end
 
 
-# Install AUR helper if not already installed
-if ! pacman -Q $aur_helper &> /dev/null
-    log "$aur_helper not installed. Installing..."
+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
-    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
-    $aur_helper -Y --gendb
-    $aur_helper -Y --devel --save
+    if $aur_helper = yay
+        $aur_helper -Y --gendb
+        $aur_helper -Y --devel --save
+    else
+        $aur_helper --gendb
+    end
 end
 
-# Install metapackage for deps
-log 'Installing metapackage...'
-$aur_helper -S --needed caelestia-meta $noconfirm
-
 # Cd into dir
 cd (dirname (status filename)) || exit 1
 
+# Install metapackage for deps
+log 'Installing metapackage...'
+if $aur_helper = yay
+    $aur_helper -Bi . $noconfirm
+else
+    $aur_helper -Ui $noconfirm
+end
+rm -f caelestia-meta-*.pkg.tar.zst 2> /dev/null
+
 # Install hypr* configs
 if confirm-overwrite $config/hypr
     log 'Installing hypr* configs...'

uwsm/default-id

@@ -0,0 +1 @@
+hyprland-uwsm.desktop

vscode/settings.json

@@ -4,7 +4,7 @@
     "editor.cursorSmoothCaretAnimation": "on",
     "editor.fontLigatures": true,
     "prettier.tabWidth": 4,
-    "editor.minimap.autohide": true,
+    "editor.minimap.autohide": "mouseover",
     "security.workspace.trust.startupPrompt": "always",
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true,
@@ -40,5 +40,7 @@
         "editor.defaultFormatter": "charliermarsh.ruff"
     },
     "ruff.lineLength": 120,
-    "python.languageServer": "Pylance"
+    "python.languageServer": "Pylance",
+    "git.confirmSync": false,
+    "git.autofetch": true
 }