diff --git a/README.md b/README.md index e78b4aa..f3b3f16 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ ![](etc/rice_new.png) +![](etc/rice_gentoo.png) + # Keybind reference diff --git a/cachyos/README.md b/cachyos/README.md new file mode 100644 index 0000000..499b69e --- /dev/null +++ b/cachyos/README.md @@ -0,0 +1,14 @@ +# CachyOS Installation + +## ๐Ÿš€ Quick Start + +Run the master installation script to install everything: + +```bash +cd /home/ocbwoy3/config/cachyos +./install-all.sh +``` + +This will automatically run all installation steps in the correct order. + +**Note**: This installation is based on the currently written Nix configuration and should do it's best to recreate the same experience you'd get on NixOS, but on CachyOS. All the install scripts are written by Curor's AI, there might be some inaccuracies. Equivalent alternatives for Nix-specific stuff are provided wherever possible. diff --git a/cachyos/install-all.sh b/cachyos/install-all.sh new file mode 100755 index 0000000..1fa6fb7 --- /dev/null +++ b/cachyos/install-all.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +# Master Installation Script for Hyprland Rice on CachyOS +# Runs all installation and setup scripts in the correct order + +set -e + +echo "๐Ÿš€ OCbwoy3 Dotfiles - CachyOS" +echo "=============================" +echo "" + +# Get the directory where this script is located +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +echo "๐Ÿ“‹ This script will:" +echo " 1. Install all required packages for your Hyprland rice" +echo " 2. Install Ralsei cursors" +echo " 3. Set up configuration symlinks and final configuration" +echo "" +echo "โš ๏ธ This process may take a while and will require sudo privileges" +echo "" +read -p "Continue? (y/N): " -n 1 -r +echo +if [[ ! $REPLY =~ ^[Yy]$ ]]; then + echo "โŒ Installation cancelled" + exit 1 +fi + +echo "" +echo "๐Ÿ”ง CHModing +x install scripts" +chmod +x "$SCRIPT_DIR"/*.sh + +echo "" +echo "๐Ÿ“ฆ [1/3] Install packages" +"$SCRIPT_DIR/install-packages.sh" + +echo "" +echo "๐ŸŽฎ [2/3] Installing cursors" +"$SCRIPT_DIR/install-cursors.sh" + +echo "" +echo "โš™๏ธ [3/3] Installing Hyprland" +"$SCRIPT_DIR/setup.sh" + +echo "๐Ÿš€ Done!" \ No newline at end of file diff --git a/cachyos/install-cursors.sh b/cachyos/install-cursors.sh new file mode 100755 index 0000000..b029aa4 --- /dev/null +++ b/cachyos/install-cursors.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +# Ralsei Cursors Installation Script for CachyOS +# Installs custom Ralsei cursor theme + +set -e + +echo "๐ŸŽฎ Installing Ralsei cursors..." + +# Create cursor directory +CURSOR_DIR="$HOME/.local/share/icons/RalseiCursors" +mkdir -p "$CURSOR_DIR" + +# Copy cursor files from config directory +CONFIG_DIR="/home/ocbwoy3/config" +CURSOR_SOURCE="$CONFIG_DIR/hosts/default/packages/ralsei-cursors/cursors" + +if [ -d "$CURSOR_SOURCE" ]; then + echo "๐Ÿ“ Copying cursor files..." + cp -r "$CURSOR_SOURCE"/* "$CURSOR_DIR/" + + # Copy theme index file + if [ -f "$CONFIG_DIR/hosts/default/packages/ralsei-cursors/index.theme" ]; then + cp "$CONFIG_DIR/hosts/default/packages/ralsei-cursors/index.theme" "$CURSOR_DIR/" + fi + + echo "โœ… Ralsei cursors copied successfully!" +else + echo "โŒ Cursor source directory not found at: $CURSOR_SOURCE" + echo "Please ensure your config directory structure is correct." + exit 1 +fi + +# Update icon cache +echo "๐Ÿ”„ Updating icon cache..." +if command -v gtk-update-icon-cache &> /dev/null; then + gtk-update-icon-cache -f -t "$CURSOR_DIR" + echo "โœ… Icon cache updated!" +else + echo "โš ๏ธ gtk-update-icon-cache not found. You may need to install gtk-update-icon-cache" +fi + +# Set as default cursor theme (optional - user can do this manually) +echo "๐ŸŽฏ Setting Ralsei cursors as default..." +if command -v gsettings &> /dev/null; then + gsettings set org.gnome.desktop.interface cursor-theme "RalseiCursors" + echo "โœ… Cursor theme set as default!" +else + echo "โš ๏ธ gsettings not found. You may need to set the cursor theme manually." +fi + +# Alternative method using XDG +if command -v xdg-settings &> /dev/null; then + xdg-settings set cursor-theme "RalseiCursors" 2>/dev/null || true +fi diff --git a/cachyos/install-packages.sh b/cachyos/install-packages.sh new file mode 100755 index 0000000..dda0a9d --- /dev/null +++ b/cachyos/install-packages.sh @@ -0,0 +1,129 @@ +#!/bin/bash + +set -e + +echo "๐Ÿš€ Installing packages for Hyprland" + +# Update system first +# echo "๐Ÿ“ฆ Updating system" +# sudo pacman -Syu --noconfirm + +# Core Hyprland packages +echo "๐ŸŽจ Installing Hyprland apps" +sudo pacman -S --needed --noconfirm \ + hyprland \ + waybar \ + wofi \ + hyprpaper \ + dunst \ + hyprlock \ + hypridle \ + swww + +# Essential Wayland tools +echo "๐Ÿ”ง Installing Wayland apps" +sudo pacman -S --needed --noconfirm \ + grim \ + slurp \ + swappy \ + wl-clipboard \ + wayland-utils \ + cliphist \ + libnotify + +# Audio and media +echo "๐ŸŽต Installing media apps" +sudo pacman -S --needed --noconfirm \ + pavucontrol \ + playerctl \ + mpv \ + ffmpeg \ + gimp \ + imagemagick + +# Fonts +echo "๐Ÿ”ค Installing fonts" +sudo pacman -S --needed --noconfirm \ + noto-fonts \ + noto-fonts-cjk \ + noto-fonts-emoji \ + ttf-nerd-fonts-symbols \ + ttf-jetbrains-mono \ + ttf-fira-code + +# Development tools +echo "๐Ÿ’ป Installing dev tools" +sudo pacman -S --needed --noconfirm \ + npm \ + git \ + github-cli \ + nix \ + bun + +# System utilities +echo "๐Ÿ› ๏ธ Installing system tools" +sudo pacman -S --needed --noconfirm \ + htop \ + btop \ + fastfetch \ + wget \ + curl \ + unzip \ + jq \ + networkmanager \ + blueman \ + network-manager-applet \ + ghostty + +# Gaming +echo "๐ŸŽฎ Installing gaming stuff" +sudo pacman -S --needed --noconfirm \ + steam \ + gamescope \ + mangohud + +# DE +echo "๐Ÿ–ฅ๏ธ Installing DE components" +sudo pacman -S --needed --noconfirm \ + gnome-keyring \ + seahorse \ + polkit-gnome \ + xdg-desktop-portal \ + xdg-desktop-portal-gtk \ + xdg-desktop-portal-wlr \ + qt5ct \ + qt6ct \ + prismlauncher + +# File manager +echo "๐Ÿ“ Installing file manager" +sudo pacman -S --needed --noconfirm \ + nautilus + +echo "๐Ÿ” Installing more tools..." +sudo pacman -S --needed --noconfirm \ + vesktop \ + obs-studio \ + kitty + +# Install AUR packages +echo "๐Ÿ“ฆ Installing AUR packages" +if command -v yay &> /dev/null; then + echo "Using yay for AUR packages..." + yay -S --needed --noconfirm \ + hyprsysteminfo \ + catppuccin-gtk-theme-mocha \ + catppuccin-cursors-mocha-blue \ + catppuccin-kde \ + catppuccin-papirus-folders \ + catppuccin-waybar-hyprland \ + brave-bin +else + echo "โš ๏ธ Please install yay" + echo "sudo pacman -S cachyos/yay" +fi + +# Enable services +echo "๐Ÿ”ง Enabling services" +sudo systemctl enable NetworkManager +sudo systemctl enable bluetooth diff --git a/cachyos/setup.sh b/cachyos/setup.sh new file mode 100755 index 0000000..e76aa93 --- /dev/null +++ b/cachyos/setup.sh @@ -0,0 +1,172 @@ +#!/bin/bash + +# Setup Script for Hyprland Rice Configuration +# Creates symlinks and performs final setup + +set -e + +echo "๐Ÿ”ง Setting up Hyprland rice configuration..." + +CONFIG_DIR="/home/ocbwoy3/config" +USER_HOME="$HOME" +XDG_CONFIG_HOME="$USER_HOME/.config" + +# Function to create symlink +create_symlink() { + local source="$1" + local target="$2" + local description="$3" + + if [ -e "$source" ]; then + echo "๐Ÿ”— Creating symlink: $description" + # Remove existing file/directory if it exists + [ -e "$target" ] && rm -rf "$target" + # Create parent directory if it doesn't exist + mkdir -p "$(dirname "$target")" + # Create symlink + ln -sf "$source" "$target" + echo " โœ… $description configured" + else + echo " โš ๏ธ Source not found: $source" + fi +} + +# Create configuration symlinks +echo "๐Ÿ“ Setting up configuration symlinks..." + +# Hyprland configuration +create_symlink "$CONFIG_DIR/config/hypr" "$XDG_CONFIG_HOME/hypr" "Hyprland configuration" + +# Waybar configuration +create_symlink "$CONFIG_DIR/config/waybar" "$XDG_CONFIG_HOME/waybar" "Waybar configuration" + +# Wofi configuration +create_symlink "$CONFIG_DIR/config/wofi" "$XDG_CONFIG_HOME/wofi" "Wofi configuration" + +# Dunst configuration +create_symlink "$CONFIG_DIR/config/dunst" "$XDG_CONFIG_HOME/dunst" "Dunst notification daemon" + +# Ghostty configuration +create_symlink "$CONFIG_DIR/config/ghostty" "$XDG_CONFIG_HOME/ghostty" "Ghostty terminal configuration" + +# Wlogout configuration +create_symlink "$CONFIG_DIR/config/wlogout" "$XDG_CONFIG_HOME/wlogout" "Wlogout configuration" + +# Qt5CT configuration +create_symlink "$CONFIG_DIR/config/qt5ct" "$XDG_CONFIG_HOME/qt5ct" "Qt5CT configuration" + +# Fastfetch configuration +create_symlink "$CONFIG_DIR/config/fastfetch" "$XDG_CONFIG_HOME/fastfetch" "Fastfetch configuration" + +# XDG Desktop Portal configuration +create_symlink "$CONFIG_DIR/config/xdg-desktop-portal" "$XDG_CONFIG_HOME/xdg-desktop-portal" "XDG Desktop Portal configuration" + +# Create fonts directory and symlink custom font +echo "๐Ÿ”ค Setting up fonts..." +FONT_DIR="$USER_HOME/.local/share/fonts" +mkdir -p "$FONT_DIR" +create_symlink "$CONFIG_DIR/config/dotfile_deps/DotfilesFont.otf" "$FONT_DIR/DotfilesFont.otf" "Custom Dotfiles font" + +# Set up GTK configuration +echo "๐ŸŽจ Setting up GTK configuration..." +GTK_CONFIG_DIR="$XDG_CONFIG_HOME/gtk-3.0" +mkdir -p "$GTK_CONFIG_DIR" +create_symlink "$CONFIG_DIR/config/gtk-3.0/settings.ini" "$GTK_CONFIG_DIR/settings.ini" "GTK3 settings" + +# Install Arashi icon theme +echo "๐ŸŽฏ Installing Arashi icon theme..." +ARASHI_THEME_DIR="$USER_HOME/.local/share/icons/Arashi" +ARASHI_REPO="https://github.com/0hStormy/Arashi" + +if [ ! -d "$ARASHI_THEME_DIR" ]; then + mkdir -p "$USER_HOME/.local/share/icons/" + echo " ๐Ÿ“ฅ Cloning Arashi icon theme from GitHub..." + git clone "$ARASHI_REPO" "$ARASHI_THEME_DIR" + echo " โœ… Arashi icon theme installed from GitHub" +else + echo " โœ… Arashi icon theme already installed" +fi + +# Set up desktop environment +echo "๐Ÿ–ฅ๏ธ Configuring desktop environment..." + +# Set GTK theme +if command -v gsettings &> /dev/null; then + echo "๐ŸŽจ Setting GTK themes..." + gsettings set org.gnome.desktop.interface gtk-theme "Catppuccin-Mocha-Standard-Blue-Dark" + gsettings set org.gnome.desktop.interface icon-theme "Arashi" + gsettings set org.gnome.desktop.interface cursor-theme "RalseiCursors" + gsettings set org.gnome.desktop.interface font-name "Noto Sans 11" + gsettings set org.gnome.desktop.wm.preferences theme "Catppuccin-Mocha-Standard-Blue-Dark" + echo " โœ… GTK themes configured" +fi + +# Set Qt theme +echo "๐ŸŽจ Setting Qt themes..." +if command -v qt5ct &> /dev/null; then + echo " โœ… Qt5CT available for Qt5 theme configuration" +fi + +if command -v qt6ct &> /dev/null; then + echo " โœ… Qt6CT available for Qt6 theme configuration" +fi + +# Configure XDG directories +echo "๐Ÿ“‚ Setting up XDG directories..." +mkdir -p "$USER_HOME/.local/share/applications" +mkdir -p "$USER_HOME/.local/share/mime" +mkdir -p "$USER_HOME/.cache" + +# Set up environment variables +echo "๐ŸŒ Setting up environment variables..." +sudo tee -a /etc/environment << EOF + +# Hyprland rice environment variables +XDG_TERMINAL=ghostty +XDG_SYSTEM_MONITOR=htop +GTK_USE_PORTAL=1 +QT_QPA_PLATFORMTHEME=qt5ct +EOF +echo " โœ… Environment variables configured in /etc/environment" + +# Create useful scripts +echo "๐Ÿ“ Creating useful scripts..." +SCRIPTS_DIR="$USER_HOME/.local/bin" +mkdir -p "$SCRIPTS_DIR" + +# Roblox game scripts +cat > "$SCRIPTS_DIR/regretevator" << 'EOF' +#!/bin/bash +xdg-open roblox://placeId=4972273297 +EOF + +cat > "$SCRIPTS_DIR/kaijuparadise" << 'EOF' +#!/bin/bash +xdg-open roblox://placeId=6456351776 +EOF + +cat > "$SCRIPTS_DIR/sewh" << 'EOF' +#!/bin/bash +xdg-open roblox://placeId=16991287194 +EOF + +# Make scripts executable +chmod +x "$SCRIPTS_DIR/regretevator" +chmod +x "$SCRIPTS_DIR/kaijuparadise" +chmod +x "$SCRIPTS_DIR/sewh" + +echo " โœ… Roblox game scripts created" + +# Update font cache +echo "๐Ÿ”„ Updating font cache..." +if command -v fc-cache &> /dev/null; then + fc-cache -fv + echo " โœ… Font cache updated" +fi + +# Update icon cache +echo "๐Ÿ”„ Updating icon cache..." +if command -v gtk-update-icon-cache &> /dev/null; then + gtk-update-icon-cache -f -t "$USER_HOME/.local/share/icons" 2>/dev/null || true + echo " โœ… Icon cache updated" +fi diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index 8eefa10..3ff63ee 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -4,13 +4,15 @@ "source": "/home/ocbwoy3/.config/fastfetch/ralsei.png" }, "display": { - "color": "blue" + "color": "magenta" }, "modules": [ + "break", + { "type": "title", "keyColor": "blue", - "format": "๏Œ“ {user-name-colored}{at-symbol-colored}{host-name-colored} :3" + "format": "{user-name-colored}{at-symbol-colored}{host-name-colored}" }, "break", diff --git a/config/ghostty/config b/config/ghostty/config index 30d99ef..6252aab 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -1,5 +1,5 @@ font-family = "SF Mono" -theme = catppuccin-mocha +theme = Catppuccin Mocha background-opacity = 0.7 window-padding-x = 16 window-padding-y = 16 diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini index a932027..ff761b9 100644 --- a/config/gtk-3.0/settings.ini +++ b/config/gtk-3.0/settings.ini @@ -14,4 +14,4 @@ gtk-xft-antialias=1 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb -gtk-application-prefer-dark-theme=1 +gtk-application-prefer-dark-theme=0 diff --git a/config/hypr/config/autoexec.conf b/config/hypr/config/autoexec.conf index 800522e..6456318 100644 --- a/config/hypr/config/autoexec.conf +++ b/config/hypr/config/autoexec.conf @@ -10,6 +10,9 @@ exec-once = swww-daemon # Notification Manager exec-once = dunst +# Gentoo Stuff +exec-once = bash ~/config/scripts/gentoo-init.sh + # Clipboard Manager exec-once = wl-paste --watch cliphist store @@ -20,7 +23,10 @@ exec-once = bash ~/config/scripts/xdg.sh exec-once = bash ~/config/scripts/gtk.sh # Start Hot Reload -exec-once = "bash ~/config/scripts/hot-reload.sh" +exec-once = bash ~/config/scripts/hot-reload.sh + +# Hyprland polkit +exec-once = /usr/libexec/hyprpolkitagent # exec-once = arrpc diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf index 462014f..31c5e21 100644 --- a/config/hypr/config/display.conf +++ b/config/hypr/config/display.conf @@ -81,7 +81,8 @@ windowrule = tag +game, class:com.mojang.minecraft.java-edition windowrule = tag +discord, class:equibop windowrule = tag +code, class:code -windowrule = tag +music, class:Cider +windowrule = tag +music, class:cider +windowrule = tag +music, class:spotify # windowrule = opacity 0.7, tag:music diff --git a/config/hypr/config/keybindings/other.conf b/config/hypr/config/keybindings/other.conf index 6bc3edf..19b60fe 100644 --- a/config/hypr/config/keybindings/other.conf +++ b/config/hypr/config/keybindings/other.conf @@ -20,8 +20,8 @@ bind = $mainMod CTRL SHIFT, PRINT, exec, bash ~/config/scripts/edit-last-screens bind = ALT, F9, pass, class:^(com\.obsproject\.Studio)$ # Music volume control -bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+ -bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02- +bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+ +bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02- # Screen locker and logout keybinds bind = CTRL ALT, DELETE, exec, wlogout diff --git a/config/hypr/config/permissions.conf b/config/hypr/config/permissions.conf index 6ced441..3a3acee 100644 --- a/config/hypr/config/permissions.conf +++ b/config/hypr/config/permissions.conf @@ -3,6 +3,9 @@ ecosystem { } permission = /nix/store/[A-Za-z0-9]+\-(wrapped-)?(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker)\-.*, screencopy, allow +permission = /(usr/)?bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow +permission = /run/current-system/sw/bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow +permission = /usr/libexec/xdg-desktop-portal-hyprland, screencopy, allow # hyprlang noerror true @@ -13,4 +16,4 @@ source = ~/config/.hyprfail.conf # windowrulev2 = noscreenshare, class:^(equibop)$ -windowrulev2 = noscreenshare,title:.*(Swedbank|Checkout|Billing).* +windowrulev2 = noscreenshare,title:.*([S|s]wedbank|[Cc]heckout|[Bb]illing).* diff --git a/config/hypr/config/variables.conf b/config/hypr/config/variables.conf index 1dca1af..b0e5678 100644 --- a/config/hypr/config/variables.conf +++ b/config/hypr/config/variables.conf @@ -8,7 +8,7 @@ $mainMod = SUPER $terminal = ghostty $fileManager = nautilus $menu = wofi --show drun -$browser = zen +$browser = zen-browser # Cursor diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf index fecb2d0..883d33f 100644 --- a/config/hypr/hyprpaper.conf +++ b/config/hypr/hyprpaper.conf @@ -1,2 +1,5 @@ preload = ~/.config/hypr/wallpaper.png -wallpaper = ,~/.config/hypr/wallpaper.png \ No newline at end of file +wallpaper = ,~/.config/hypr/wallpaper.png + +# preload = ~/.cache/.wallpaper +# wallpaper = ,~/.cache/.wallpaper diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf index 7781825..b5782ff 100644 --- a/config/qt5ct/qt5ct.conf +++ b/config/qt5ct/qt5ct.conf @@ -1,9 +1,9 @@ [Appearance] color_scheme_path=/home/ocbwoy3/.config/qt5ct/colors/catppuccin-mocha-blue.conf -custom_palette=false -icon_theme=arashi -standard_dialogs=xdgdesktopportal -style=Fusion +custom_palette=true +icon_theme=Arashi +standard_dialogs=default +style=Windows [Fonts] fixed="Geist Mono,9,-1,5,50,0,0,0,0,0" @@ -25,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\aS\0\0\x3\xee\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x37\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\aS\0\0\x3\xee) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x16\0\0\0\x36\0\0\x3\xb8\0\0\x4!\0\0\0\x16\0\0\0\x36\0\0\x3\xb8\0\0\x4!\0\0\0\0\0\0\0\0\a\x80\0\0\0\x16\0\0\0\x36\0\0\x3\xb8\0\0\x4!) [Troubleshooting] force_raster_widgets=1 diff --git a/config/waybar/modules.json b/config/waybar/modules.json index c78dd7f..3fce895 100644 --- a/config/waybar/modules.json +++ b/config/waybar/modules.json @@ -15,14 +15,15 @@ }, "mpris": { - "players": ["cider", "OCbwoy3_s_iPhone"], + "players": ["chromium", "cmus", "elisa", "cider", "spotify", "OCbwoy3_s_iPhone"], "interval": 1, - "on-scroll-up": "playerctl -p cider,OCbwoy3_s_iPhone,cmus volume 0.05+", - "on-scroll-down": "playerctl -p cider,OCbwoy3_s_iPhone,cmus volume 0.05-", - "on-click": "playerctl -p cider,OCbwoy3_s_iPhone,cmus play-pause", - "on-click-right": "playerctl -p cider,OCbwoy3_s_iPhone,cmus next", - "on-click-middle": "playerctl -p cider,OCbwoy3_s_iPhone,cmus previous", + "on-scroll-up": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone volume 0.05+", + "on-scroll-down": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone volume 0.05-", + "on-click": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone play-pause", + "on-click-right": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone next", + "on-click-middle": "playerctl -p chromium,cmus,elisa,cider,spotify,OCbwoy3_s_iPhone previous", "format": "๏€ {artist} โ€” {title}", + // "format": "๏€ {title}", "tooltip-format": "{album}", "tooltip-format-stopped": "", "format-stopped": "", @@ -39,23 +40,20 @@ "hyprland/window": { "format": "{}", "rewrite": { - "(.*) (- Roblox )?(โ€” Mozilla Firefox( Private Browsing)?|(โ€”|-) Brave)": "$1", - "(.*) - Roblox": "$1", - "swappy": "Swappy", - "Support Hyprland": "Hyprland", - "MainPicker": "Hyprland", - "Hyprland Updated": "Hyprland", - "Cider": "Apple Music", - "SCPSL": "SCP: Secret Laboratory", + "(Support Hyprland|MainPicker|Hyprland Updated)": "Hyprland", + + "DELTARUNE Chapter ([0-9]+)": "DELTARUNE", "Sober": "Roblox", "vinegar": "Vinegar", "RobloxStudio": "Roblox Studio", - "gemini.google.com_/app": "Gemini", + "SCPSL": "SCP: Secret Laboratory", "PORTAL 2 - (OpenGL|Vulkan)": "Portal 2", "HALF-LIFE 2 - (OpenGL|Vulkan)": "Half-Life 2", - "(.*) โ€” (Firefox( Developer Edition)|Zen Browser)?": "$1", "(.*) - Google( Search| meklฤ“ลกana)?": "$1", - "Minecraft NeoForge%*(.+)": "Minecraft" + + "Cider": "Apple Music", + "swappy": "Swappy", + "(.*) โ€” (Firefox( Developer Edition)|Zen Browser)?": "$1" }, "separate-outputs": false }, @@ -83,7 +81,7 @@ "clock": { "timezone": "Europe/Riga", - "locale": "lv_LV.utf8", + // "locale": "lv_LV.utf8", "format": "{:%H:%M}", "tooltip-format": "{:L%Y. gada %B}{calendar}", "calendar": { diff --git a/flake.lock b/flake.lock index 03697da..5b33045 100644 --- a/flake.lock +++ b/flake.lock @@ -176,6 +176,20 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -1503,6 +1517,7 @@ }, "tangled": { "inputs": { + "flake-compat": "flake-compat_4", "gomod2nix": "gomod2nix", "htmx-src": "htmx-src", "htmx-ws-src": "htmx-ws-src", @@ -1514,11 +1529,11 @@ "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1757261479, - "narHash": "sha256-4tAkFymrv+tvWXE6Vi9wFQoOQvxTHi47vptPE+yos0Y=", + "lastModified": 1758695638, + "narHash": "sha256-2eQiyOEcTZERHrx4dz7Nd/rUOkIi8yChbcXe1nqw9qg=", "ref": "refs/heads/master", - "rev": "1ec70a31f26321b67ee3cdc0746950f8139d134f", - "revCount": 1326, + "rev": "3d80614e0984a4a9402960df85300718a8f1f2c9", + "revCount": 1424, "type": "git", "url": "https://tangled.sh/@tangled.sh/core" }, diff --git a/flake.nix b/flake.nix index 420cb8b..982d177 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ inputs.chaotic.nixosModules.nyx-overlay inputs.chaotic.nixosModules.nyx-registry # ./hosts/default/hardware-configuration.nix - + # lil hack to not use --impure when rebuilding nixos >:3 "/etc/nixos/hardware-configuration.nix" @@ -69,6 +69,10 @@ inputs.tangled.nixosModules.knot inputs.vscode-server.nixosModules.default + inputs.chaotic.nixosModules.nyx-cache + inputs.chaotic.nixosModules.nyx-overlay + inputs.chaotic.nixosModules.nyx-registry + # lil hack to not use --impure when rebuilding nixos >:3 "/etc/nixos/hardware-configuration.nix" diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index b416ae2..ba50a6c 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -14,6 +14,8 @@ services.displayManager.gdm.enable = true; + boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; # some guy in roblox told me to do this + programs.steam = { enable = true; # package = pkgs.steam-millennium; diff --git a/modules/nixos/bootloader.nix b/modules/nixos/bootloader.nix index 4645377..6f83864 100644 --- a/modules/nixos/bootloader.nix +++ b/modules/nixos/bootloader.nix @@ -24,8 +24,6 @@ "boot.shell_on_fail" ]; - boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; # some guy in roblox told me to do this - boot.loader = { efi = { # canTouchEfiVariables = true; diff --git a/scripts/dev/setup-gentoo-symlinks.sh b/scripts/dev/setup-gentoo-symlinks.sh new file mode 100644 index 0000000..e659158 --- /dev/null +++ b/scripts/dev/setup-gentoo-symlinks.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +DOTFILES_DIR="/home/ocbwoy3/config/config" + +# fastfetch +ln -sfn "${DOTFILES_DIR}/fastfetch" "${HOME}/.config/fastfetch" + +# dunst +ln -sfn "${DOTFILES_DIR}/dunst" "${HOME}/.config/dunst" + +# hypr +ln -sfn "${DOTFILES_DIR}/hypr" "${HOME}/.config/hypr" + +# xdg-desktop-portal +ln -sfn "${DOTFILES_DIR}/xdg-desktop-portal" "${HOME}/.config/xdg-desktop-portal" + +# ghostty +ln -sfn "${DOTFILES_DIR}/ghostty" "${HOME}/.config/ghostty" + +# wlogout +ln -sfn "${DOTFILES_DIR}/wlogout" "${HOME}/.config/wlogout" + +# qt5ct +ln -sfn "${DOTFILES_DIR}/qt5ct" "${HOME}/.config/qt5ct" + +# wofi +ln -sfn "${DOTFILES_DIR}/wofi" "${HOME}/.config/wofi" + +# dotfile font +ln -sfn "${DOTFILES_DIR}/dotfile_deps/DotfilesFont.otf" "${HOME}/.local/share/fonts/DotfilesFont.otf" + +echo "symlinked this that" \ No newline at end of file diff --git a/scripts/gentoo-init.sh b/scripts/gentoo-init.sh new file mode 100755 index 0000000..b9994ed --- /dev/null +++ b/scripts/gentoo-init.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +if [[ "$(hostname)" == "gentoo" ]]; then + notify-send "Hyprland" "Init gentoo stuff" + hyprctl dispatch exec hyprpaper + hyprctl dispatch exec pipewire + hyprctl dispatch exec pipewire-pulse + hyprctl dispatch exec wireplumber +fi \ No newline at end of file diff --git a/scripts/hot-reload.sh b/scripts/hot-reload.sh index b371658..c00bb29 100755 --- a/scripts/hot-reload.sh +++ b/scripts/hot-reload.sh @@ -2,13 +2,24 @@ pkill -9 waybar > /dev/null -hyprctl dispatch exec "GTK_THEME=Adwaita LC_TIME=lv_LV.UTF-8 waybar -c ~/config/config/waybar/config -s ~/config/config/waybar/style.css" > /dev/null & +hyprctl dispatch exec "GTK_THEME=Adwaita waybar -c ~/config/config/waybar/config -s ~/config/config/waybar/style.css" > /dev/null & hyprctl reload > /dev/null & ROBLOX_PID="$(pidof sober)" +HYPRPAPER_PID="$(pidof hyprpaper)" # echo ${#ROBLOX_PID} if [ ${#ROBLOX_PID} -lt 1 ]; then - trap "rm /tmp/.regretevator_state" EXIT > /dev/null + trap "rm /tmp/.regretevator_state" EXIT > /dev/null +fi + +# shit + +if [[ "$(hostname)" == "gentoo" ]]; then + if [ ${#HYPRPAPER_PID} -lt 1 ]; then + hyprctl dispatch exec hyprpaper + sleep 1 + bash ~/config/scripts/load-wallpaper.sh + fi fi diff --git a/scripts/load-wallpaper.sh b/scripts/load-wallpaper.sh old mode 100644 new mode 100755 index b6c91fa..a650979 --- a/scripts/load-wallpaper.sh +++ b/scripts/load-wallpaper.sh @@ -6,5 +6,14 @@ rm -r ~/.cache/wal # wal -stn -a 90 -i $HOME/wallpaper/$WALLPAPER -swww img $WALLPAPER --transition-fps 120 --transition-duration 2 -t wipe & -bash ~/dotfiles/scripts/hot-reload.sh +if [[ "$(hostname)" == "gentoo" ]]; then + hyprctl hyprpaper unload all + hyprctl hyprpaper preload $WALLPAPER + hyprctl hyprpaper wallpaper ,$WALLPAPER +fi + +if [[ "$(hostname)" != "gentoo" ]]; then + swww img $WALLPAPER --transition-fps 120 --transition-duration 2 -t wipe & +fi + +# bash ~/config/scripts/hot-reload.sh diff --git a/scripts/open-roblox-game.sh b/scripts/open-roblox-game.sh old mode 100644 new mode 100755 diff --git a/scripts/select-wallpaper.sh b/scripts/select-wallpaper.sh old mode 100644 new mode 100755 index 54b3771..e320231 --- a/scripts/select-wallpaper.sh +++ b/scripts/select-wallpaper.sh @@ -6,7 +6,7 @@ if [ ${#WALLPAPER} -gt 0 ] ; then rm -f $HOME/.cache/.wallpaper - echo "$HOME/Pictures/Wallpapers/$WALLPAPER" >> $HOME/.cache/.wallpaper + echo "$HOME/Pictures/Wallpapers/$WALLPAPER" > $HOME/.cache/.wallpaper rm -rf $HOME/.cache/wal @@ -14,7 +14,21 @@ if [ ${#WALLPAPER} -gt 0 ] ; then # wal -stn -a 90 -i $HOME/wallpaper/$WALLPAPER - swww img $HOME/Pictures/Wallpapers/$WALLPAPER --transition-fps 300 --transition-duration 2 --transition-type simple --transition-step 3 & + if [[ "$(hostname)" != "gentoo" ]]; then + swww img $HOME/Pictures/Wallpapers/$WALLPAPER --transition-fps 300 --transition-duration 2 --transition-type simple --transition-step 3 & + fi + + if [[ "$(hostname)" == "gentoo" ]]; then + HYPRPAPER_PID="$(pidof hyprpaper)" + if [ ${#HYPRPAPER_PID} -lt 1 ]; then + hyprctl dispatch exec hyprpaper + sleep 1 + fi + hyprctl hyprpaper unload all + hyprctl hyprpaper preload $HOME/Pictures/Wallpapers/$WALLPAPER + hyprctl hyprpaper wallpaper ,$HOME/Pictures/Wallpapers/$WALLPAPER + fi + # bash ~/dotfiles/scripts/hot-reload.sh else diff --git a/scripts/xdg.sh b/scripts/xdg.sh index e824937..3530b84 100755 --- a/scripts/xdg.sh +++ b/scripts/xdg.sh @@ -2,6 +2,8 @@ sleep 1 +# notify-send "ocbwoy3" "ran xdg setup" + # kill all possible running xdg-desktop-portals kill -9 $(pidof xdg-desktop-portal-hyprland) kill -9 $(pidof xdg-desktop-portal-gnome) @@ -13,9 +15,13 @@ kill -9 $(pidof xdg-desktop-portal) sleep 1 # start xdg-desktop-portal-hyprland -/usr/lib/xdg-desktop-portal-hyprland & +hyprctl dispatch exec /usr/lib/xdg-desktop-portal-hyprland & sleep 2 +# notify-send "ocbwoy3" "xdph" + # start xdg-desktop-portal -/usr/lib/xdg-desktop-portal & +hyprctl dispatch exec /usr/lib/xdg-desktop-portal & sleep 1 + +# notify-send "ocbwoy3" "xdp" \ No newline at end of file