diff --git a/.config/backgrounds/better_shaded_landscape.jpg b/.config/backgrounds/better_shaded_landscape.jpg deleted file mode 100644 index 4c0a389..0000000 Binary files a/.config/backgrounds/better_shaded_landscape.jpg and /dev/null differ diff --git a/.config/backgrounds/shaded.png b/.config/backgrounds/shaded.png deleted file mode 100644 index 6c8a2aa..0000000 Binary files a/.config/backgrounds/shaded.png and /dev/null differ diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 1c4393c..e3858e5 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -122,6 +122,7 @@ misc { disable_hyprland_logo = 1 focus_on_activate = 1 } +# hyprlang noerror true plugin { virtual-desktops { @@ -146,6 +147,8 @@ plugin { } } +# hyprlang noerror false + # Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more @@ -194,6 +197,7 @@ bind = $mainMod ALT, 8, workspace, 8 bind = $mainMod ALT, 9, workspace, 9 bind = $mainMod ALT, 0, workspace, 10 +# hyprlang noerror true bind = $mainMod, 1, vdesk, 1 bind = $mainMod, 2, vdesk, 2 bind = $mainMod, 3, vdesk, 3 @@ -217,6 +221,8 @@ bind = $mainMod SHIFT, 8, movetodesk, 8 bind = $mainMod SHIFT, 9, movetodesk, 9 bind = $mainMod SHIFT, 0, movetodesk, 10 +# hyprlang noerror false + # Example special workspace (scratchpad) bind = $mainMod, S, togglespecialworkspace, magic bind = $mainMod CTRL, S, movetoworkspace, special:magic @@ -228,7 +234,9 @@ bind = $mainMod SHIFT, S, exec, hyprshot -m region # bind = $mainMod, mouse_down, workspace, e+1 # bind = $mainMod, mouse_up, workspace, e-1 -# Scroll through existing workspaces with mainMod + TAB and SHIFT + TAB + +# hyprlang noerror true + # Used to use overview:toggle, but that resises the windows # bind = $mainMod, TAB, overview:toggle # bind = CTRL ALT, TAB, overview:toggle @@ -237,6 +245,9 @@ bind = CTRL ALT, TAB, hyprexpo:expo, toggle bind = ALT, TAB, lastdesk + +# hyprlang noerror false + bind = ALT, SPACE, exec, ~/.config/hypr/scripts/search-windows.sh # bind = ALT SHIFT, TAB, workspace, e-1 # bind = ALT, TAB, exec, hyprswitch gui --mod-key alt --key tab --close mod-key-release --reverse-key=key=shift && hyprswitch dispatch diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index b72cdec..3d9cd0a 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -8,25 +8,10 @@ general { # BACKGROUND background { -# monitor = - path = $HOME/.config/backgrounds/rengoku2.png - # path = $HOME/.config/hypr/fireplace.mp4 + # path = $HOME/.config/backgrounds/rengoku2.png + path = $HOME/.config/backgrounds/jellyfish.png blur_passes = 0 -# color = $base } - -# Keyboard LAYOUT -# label { -# # monitor = -# text = Layout: $LAYOUT -# color = $text -# font_size = 25 -# font_family = $font -# position = 30, -30 -# halign = left -# valign = top -# } - # TIME label { # monitor = @@ -39,6 +24,18 @@ label { valign = top } +# Battery +label { +# monitor = + text = cmd[update:1000] echo "󰁹 $(cat /sys/class/power_supply/BAT0/capacity)%" + color = rgb(255, 255, 255) + font_size = 20 + font_family = $font + position = -25, 10 + halign = right + valign = bottom +} + # DATE # label { # # monitor = diff --git a/.config/hypr/hyprpanel.json b/.config/hypr/hyprpanel.json index 9d4372d..c3dd01b 100644 --- a/.config/hypr/hyprpanel.json +++ b/.config/hypr/hyprpanel.json @@ -4,9 +4,7 @@ "dashboard", "media" ], - "middle": [ - - ], + "middle": [], "right": [ "volume", "network", @@ -14,7 +12,8 @@ "battery", "systray", "clock", - "notifications" + "notifications", + "cputemp" ] }, "1": { @@ -22,9 +21,7 @@ "dashboard", "media" ], - "middle": [ - - ], + "middle": [], "right": [ "volume", "network", diff --git a/.config/hypr/scripts/exec-once.sh b/.config/hypr/scripts/exec-once.sh new file mode 100755 index 0000000..728df05 --- /dev/null +++ b/.config/hypr/scripts/exec-once.sh @@ -0,0 +1,8 @@ +#!/bin/bash +sleep 2 +clipse -listen & +alacritty --class alacritty-init & +/home/nathan/AppImages/Fingertip-0.0.4-beta2-linux-X64.AppImage & +/home/nathan/AppImages/nextcloud_desktop_sync_client.appimage --background & +discord --start-minimized & +slack -U & \ No newline at end of file diff --git a/.config/hypr/start-exec.conf b/.config/hypr/start-exec.conf index c22b36e..92e2e92 100644 --- a/.config/hypr/start-exec.conf +++ b/.config/hypr/start-exec.conf @@ -1,34 +1,7 @@ exec-once = hyprpm reload -n -exec-once = systemctl --user start hyprpolkitagent -exec-once = /usr/bin/kdeconnectd & -# exec-once = /usr/bin/swaync & -# exec-once = waybar - -# Start apps in .autostart -exec-once = /home/nathan/AppImages/Fingertip-0.0.4-beta2-linux-X64.AppImage & -exec-once = /home/nathan/AppImages/nextcloud_desktop_sync_client.appimage --background & -# exec-once = /usr/bin/solaar -w hide & - - -# Start windows -exec-once = alacritty --class alacritty-init -# exec-once = brave-browser # TODO after adding start workspace -exec-once = discord --start-minimized -exec-once = slack -U - - -exec-once = hyprpanel exec-once = hyprpaper +exec-once = hyprpanel exec-once = hypridle -exec-once = clipse -listen -# exec-once = hyprswitch init --show-title --custom-css ~/.config/hypr/hyprswitch.css & - - -# Proxy -# exec-once = gsettings set org.gnome.system.proxy mode 'auto' && gsettings set org.gnome.system.proxy autoconfig-url 'http://127.0.0.1:9590/proxy.pac' -# exec-once = kwriteconfig6 --file kioslaverc --group 'Proxy Settings' --key 'ProxyType' 2 && kwriteconfig6 --file kioslaverc --group 'Proxy Settings' --key 'AutoProxyURL' "http://127.0.0.1:9590/proxy.pac" -# exec-once = export PROXY_PAC_URL="http://127.0.0.1:9590/proxy.pac" -# exec-once = export http_proxy="http://127.0.0.1:9590" -# exec-once = export https_proxy="$http_proxy" -# exec-once = export no_proxy="localhost,127.0.0.1,::1" - +exec-once = /usr/bin/kdeconnectd +exec-once = systemctl --user start hyprpolkitagent +exec-once = ~/.config/hypr/scripts/exec-once.sh > ~/.logs/exec-once.log 2>&1 diff --git a/.config/hypr/windowrules.conf b/.config/hypr/windowrules.conf index e1a09d3..6be788b 100644 --- a/.config/hypr/windowrules.conf +++ b/.config/hypr/windowrules.conf @@ -1,3 +1,5 @@ +# hyprlang noerror true + # windowrulev2 = float,class:(clipse) # windowrulev2 = size 622 652,class:(clipse) # windowrulev2 = stayfocused,class:(clipse) @@ -6,6 +8,7 @@ windowrulev2 = float,class:(float) windowrulev2 = float,class:(swayimg) windowrulev2 = size 80%,class:(swayimg) windowrule = noblur 1 noanim 1 noshadow 1, class:(^$) +windowrulev2 = float,class:(mpv) # windowrule = opacity 0.2, class:(^$) # # Start windows @@ -25,4 +28,8 @@ windowrule = noblur, class:^(Gromit-mpx)$ windowrule = opacity 1 override, 1 override, class:^(Gromit-mpx)$ windowrule = noshadow, class:^(Gromit-mpx)$ windowrule = suppressevent fullscreen, class:^(Gromit-mpx)$ -windowrule = size 100% 100%, class:^(Gromit-mpx)$ \ No newline at end of file +windowrule = size 100% 100%, class:^(Gromit-mpx)$ + + + +# hyprlang noerror false \ No newline at end of file diff --git a/.zshrc b/.zshrc index 0225df5..e3b9edd 100644 --- a/.zshrc +++ b/.zshrc @@ -152,6 +152,7 @@ alias music='/home/$USER/scripts/music.sh' alias venv='source /home/$USER/scripts/venv.sh' alias copy='/home/$USER/scripts/copy.sh' alias upload='/home/$USER/scripts/upload.sh' +alias upload_latest_video='/home/$USER/scripts/upload_latest_video.py' alias ts='/home/$USER/scripts/ts.sh' alias hold='/home/$USER/scripts/hold.sh' alias message='/home/$USER/scripts/message.sh' @@ -159,6 +160,9 @@ alias dockerstart='/home/$USER/scripts/dockerstart.sh' alias dockerstop='/home/$USER/scripts/dockerstop.sh' alias domains='/home/$USER/scripts/domains.py' alias fix_touchpad='/home/$USER/scripts/fix_touchpad.sh' +alias wallpaper='/home/$USER/scripts/wallpaper.py' +alias reload='exec zsh' + alias open=xdg-open # Use gitkraken's cli tool