diff --git a/.p10k.zsh b/.p10k.zsh old mode 100644 new mode 100755 diff --git a/.paths b/.paths old mode 100644 new mode 100755 diff --git a/.profile b/.profile old mode 100644 new mode 100755 diff --git a/.zshenv b/.zshenv old mode 100644 new mode 100755 diff --git a/.zshrc b/.zshrc old mode 100644 new mode 100755 index 69c65a6..c9fe1dc --- a/.zshrc +++ b/.zshrc @@ -5,23 +5,8 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH - # Path to your oh-my-zsh installation. -export ZSH="$HOME/.oh-my-zsh" - -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="powerlevel10k/powerlevel10k" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) +export ZSH="/usr/share/oh-my-zsh" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -41,9 +26,6 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # Uncomment the following line if pasting URLs and other text is messed up. # DISABLE_MAGIC_FUNCTIONS="true" -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - # Uncomment the following line to disable auto-setting terminal title. # DISABLE_AUTO_TITLE="true" @@ -54,7 +36,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # You can also set it to another string to have that shown instead of the default red dots. # e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" # Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# COMPLETION_WAITING_DOTS="true" +COMPLETION_WAITING_DOTS="true" # Uncomment the following line if you want to disable marking untracked files # under VCS as dirty. This makes repository status check for large repositories @@ -79,11 +61,15 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # Add wisely, as too many plugins slow down shell startup. plugins=( git - zsh-autosuggestions ) source $ZSH/oh-my-zsh.sh +source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh +source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + +source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme + # User configuration # export MANPATH="/usr/local/man:$MANPATH" @@ -101,52 +87,25 @@ source $ZSH/oh-my-zsh.sh # Compilation flags # export ARCHFLAGS="-arch x86_64" -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" +# Aliases alias cl="clear" alias md="mkdir" alias clip="xclip -selection clipboard" alias lg="lazygit" alias fuck="thefuck" -# alias ld="lazydocker" +alias ls="exa --icons" function zsh-stats() { fc -l 1 | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl | head -n25 } # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh -# Path to Haskell config -[ -f "/home/clxxiii/.ghcup/env" ] && source "/home/clxxiii/.ghcup/env" # ghcup-env # Path to spicetify export PATH=$PATH:~/.spicetify -# Path to clangd -export PATH=$PATH:~/.local/share/clangd_15.0.3/bin # nap settings # export NAP_HOME=~/.nap export NAP_CONFIG=~/.nap/config.yaml -alias keylogup="touch /tmp/keylogger.log && sudo logkeys --start --output /tmp/keylogger.log --no-timestamps" -alias keylogdown="sudo logkeys --kill && sudo rm /tmp/keylogger.log" - -PATH="/home/clxxiii/perl5/bin${PATH:+:${PATH}}"; export PATH; -PERL5LIB="/home/clxxiii/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB; -PERL_LOCAL_LIB_ROOT="/home/clxxiii/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT; -PERL_MB_OPT="--install_base \"/home/clxxiii/perl5\""; export PERL_MB_OPT; -PERL_MM_OPT="INSTALL_BASE=/home/clxxiii/perl5"; export PERL_MM_OPT; - export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion - -# bun completions -[ -s "/home/eli/.bun/_bun" ] && source "/home/eli/.bun/_bun" - -# bun -export BUN_INSTALL="$HOME/.bun" -export PATH="$BUN_INSTALL/bin:$PATH" diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf old mode 100644 new mode 100755 index 966b4c4..d539590 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -4,8 +4,6 @@ # For a full list, see the wiki # -autogenerated = 0 # remove this line to remove the warning - # See https://wiki.hyprland.org/Configuring/Monitors/ source = ~/.config/hypr/monitors.conf source = ~/.config/hypr/workspaces.conf @@ -13,16 +11,28 @@ source = ~/.config/hypr/workspaces.conf # See https://wiki.hyprland.org/Configuring/Keywords/ for more -# Execute your favorite apps at launch -exec-once = hyprpaper -exec-once = eww open wayland -exec-once = ~/.config/eww/cards.sh open +# Slow app launch fix +exec-once = systemctl --user import-environment & +exec-once = hash dbus-update-activation-environment 2>/dev/null & +exec-once = dbus-update-activation-environment --systemd & + +# Open utilities +exec-once = swaybg -o \* -i ~/Pictures/Wallpapers/wallpaper -m fill & # wallpaper +exec-once = waybar -c ~/.config/waybar/config-hypr # top bar +exec-once = mako & # notification service +exec-once = nm-applet --indicator & # network manager system tray +exec-once = bash -c "mkfifo /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob && tail -f /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob | wob & disown" & # wayland overlay bar +exec-once = /usr/bin/kwalletd5 & # keyring +exec-once = /usr/bin/mailspring --password-store="kwallet5" & +exec-once = /usr/lib/polkit-kde-authentication-agent-1 & +exec-once = /usr/bin/discord --start-minimized & # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf # Some default env vars. env = XCURSOR_SIZE,24 +env = GTK_THEME,Catppuccin-Mocha-Standard-Sky-Dark:dark # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { @@ -51,6 +61,8 @@ general { col.inactive_border = rgba(1e1e2eff) layout = dwindle + + apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) } decoration { @@ -59,11 +71,12 @@ decoration { rounding = 6 blur { enabled = true - size = 2 - passes = 4 + size = 15 + passes = 2 noise = 0 - ignore_opacity = true + new_optimizations = true xray = false + ignore_opacity = true } # blur = yes # blur_size = 3 @@ -102,6 +115,18 @@ master { new_is_master = true } +misc { + #disable_autoreload = true + disable_hyprland_logo = true + always_follow_on_dnd = true + layers_hog_keyboard_focus = true + animate_manual_resizes = false + enable_swallow = true + swallow_regex = + focus_on_activate = true + vfr = 1 +} + gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more workspace_swipe = off @@ -110,9 +135,11 @@ gestures { # Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more device:epic mouse V1 { - sensitivity = -0.5 + # sensitivity=-0.5 } +bindl =,switch:Lid Switch,exec,swaylock + # Example windowrule v1 # windowrule = float, ^(kitty)$ # Example windowrule v2 @@ -121,14 +148,22 @@ windowrulev2 = opacity 0.8,class:Spotify windowrulev2 = opacity 0.8,class:discord windowrulev2 = opacity 0.8,class:mailspring windowrulev2 = opacity 0.8,class:todoist -windowrulev2 = opacity 0.9,class:alacritty -windowrulev2 = opacity 0.9,class:obsidian -windowrulev2 = opacity 0.9,class:Code +windowrulev2 = opacity 0.8,class:obsidian +windowrulev2 = opacity 0.8,class:Nautilus +windowrulev2 = opacity 0.8,class:Code windowrulev2 = opacity 0.8,class:neovide windowrulev2 = opacity 0.8,class:Todoist windowrulev2 = opacity 0.8,class:chatterino -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +# Default Float +windowrulev2 = float,class:blueman +windowrulev2 = float,class:Calculator +windowrulev2 = float,class:Alacritty +windowrulev2 = float,class:warp + +windowrulev2 = forceinput,class:Celeste +windowrulev2 = forceinput,class:osu! + # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -139,6 +174,7 @@ bind = $mainMod, RETURN, exec, alacritty bind = ,Print, exec, grimblast copy area bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, E, exec, rofi -show p -modi 'p:~/.config/rofi/rofi-power-menu-hypr --choices shutdown/reboot/suspend/logout', +bind = $mainMod, PERIOD, exec, rofi -show emoji, bind = $mainMod SHIFT, SPACE, togglefloating, bind = $mainMod SHIFT, D, exec, ~/.config/eww/cards.sh toggle # cards toggle bind = $mainMod, D, exec, rofi -show drun @@ -170,11 +206,11 @@ bind = $mainMod, 2, workspace, 2 bind = $mainMod, 3, workspace, 3 bind = $mainMod, 4, workspace, 4 bind = $mainMod, 5, workspace, 5 -# bind = $mainMod, 6, workspace, 6 -# bind = $mainMod, 7, workspace, 7 -# bind = $mainMod, 8, workspace, 8 -# bind = $mainMod, 9, workspace, 9 -# bind = $mainMod, 0, workspace, 10 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 # Move active window to a workspace with mainMod + SHIFT + [0-9] bind = $mainMod SHIFT, 1, movetoworkspace, 1 @@ -191,6 +227,7 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 bind = $mainMod, mouse_up, workspace, e-1 + # Example special workspace (scratchpad) bind = $mainMod, T, togglespecialworkspace, magic bind = $mainMod SHIFT, T, movetoworkspace, special:magic @@ -198,3 +235,13 @@ bind = $mainMod SHIFT, T, movetoworkspace, special:magic # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow + +# Media Keys +bind=,XF86AudioLowerVolume,exec,pamixer -ud 3 && pamixer --get-volume > /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob +bind=,XF86AudioRaiseVolume,exec,pamixer -ui 3 && pamixer --get-volume > /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob +# mute sound +bind=,XF86AudioMute,exec,amixer sset Master toggle | sed -En '/\[on\]/ s/.*\[([0-9]+)%\].*/\1/ p; /\[off\]/ s/.*/0/p' | head -1 > /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob + +bind=,XF86AudioPlay,exec, playerctl play-pause +bind=,XF86AudioNext,exec, playerctl next +bind=,XF86AudioPrev,exec, playerctl previous diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf deleted file mode 100644 index 60f54cd..0000000 --- a/hypr/hyprpaper.conf +++ /dev/null @@ -1,3 +0,0 @@ -preload = /home/eli/Pictures/Wallpapers/forest.png -wallpaper = eDP-1, /home/eli/Pictures/Wallpapers/forest.png -wallpaper = HDMI-A-1, /home/eli/Pictures/Wallpapers/forest.png diff --git a/hypr/monitors.conf b/hypr/monitors.conf old mode 100644 new mode 100755 index 90471f9..41a6210 --- a/hypr/monitors.conf +++ b/hypr/monitors.conf @@ -1,3 +1,4 @@ -# Generated by nwg-displays on 2023-11-17 at 15:12:04. Do not edit manually. +# Generated by nwg-displays on 2024-02-29 at 19:05:53. Do not edit manually. monitor=eDP-1,1920x1080@60.004002,0x0,1.0 +monitor=HDMI-A-2,1920x1200@59.950001,1920x0,1.0,mirror,eDP-1 diff --git a/hypr/scripts/screenshot b/hypr/scripts/screenshot new file mode 100755 index 0000000..ecc11b9 --- /dev/null +++ b/hypr/scripts/screenshot @@ -0,0 +1,3 @@ +#!/usr/bin/bash +grim -g "$(slurp)" - | wl-copy -t image/png +notify-send "Screenshot copied to clipboard" diff --git a/hypr/scripts/screenshot_area b/hypr/scripts/screenshot_area new file mode 100755 index 0000000..52218e2 --- /dev/null +++ b/hypr/scripts/screenshot_area @@ -0,0 +1,3 @@ +#!/usr/bin/bash +grimblast copy area || exit +notify-send "Screenshot copied to clipboard" diff --git a/hypr/scripts/screenshot_full b/hypr/scripts/screenshot_full new file mode 100755 index 0000000..0608891 --- /dev/null +++ b/hypr/scripts/screenshot_full @@ -0,0 +1,3 @@ +#!/usr/bin/bash +grimblast copy output || exit +notify-send "Screenshot copied to clipboard" diff --git a/hypr/workspaces.conf b/hypr/workspaces.conf old mode 100644 new mode 100755