diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | autostart.sh | 9 | ||||
| -rw-r--r-- | hypr/hyprland.conf | 63 | ||||
| -rw-r--r-- | hypr/hyprpaper.conf | 2 | ||||
| -rw-r--r-- | mako/config | 37 | ||||
| -rw-r--r-- | waybar/config-Hyprland | 2 | ||||
| -rw-r--r-- | zsh/.zshenv | 1 | ||||
| -rw-r--r-- | zsh/.zshrc | 1 |
8 files changed, 46 insertions, 70 deletions
@@ -61,6 +61,7 @@ poezio/ pmbootstrap.cfg pipewire/media-session.d/ PCSX2/ +pcmanfm-qt/ pcmanfm/ pavucontrol.ini openrazer/ diff --git a/autostart.sh b/autostart.sh index 031f520..dbf7bed 100755 --- a/autostart.sh +++ b/autostart.sh @@ -19,16 +19,20 @@ killandrun () { if [ -n "${WAYLAND_DISPLAY}${DISPLAY}" ]; then notify-sound.sh off & - runifnot caffeine if [ -n "$WAYLAND_DISPLAY" ]; then runifnot swayidle - runifnot waybar -c ~/.config/waybar/config-"$(basename "$(crcparse WC)")" killandrun hyprpaper + #launch_waybar.sh "$(crcparse WC)" + runifnot waybar -c ~/.config/waybar/config-"$(basename "$(crcparse WC)")" + gsettings set $gnome-schema gtk-theme 'Plata-Noir-Compact' + gsettings set $gnome-schema icon-theme 'Mint-Y-Dark-Blue' + gsettings set $gnome-schema cursor-theme 'Adwaita' if [ "$(crcparse WC | xargs basename)" = "Hyprland" ]; then xrdb ~/.Xresources fi else #runifnot picom + runifnot caffeine runifnot xss-lock slockd runifnot sxhkd if "$(type xmonad >/dev/null 2>&1)"; then @@ -39,6 +43,7 @@ if [ -n "${WAYLAND_DISPLAY}${DISPLAY}" ]; then xwallpaper --zoom ~/background.jpg setxkbmap -option "caps:escape" fi + runifnot portmaster-start --data=/opt/safing/portmaster notifier fi [ -x "$XDG_CONFIG_HOME/computerrc.sh" ] && "$XDG_CONFIG_HOME/computerrc.sh" diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index d613c3a..d131fde 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -11,6 +11,7 @@ monitor = DP-1, 1920x1080@60, 1920x0, 1 # Execute your favorite apps at launch # exec-once = waybar & hyprpaper & firefox exec-once = ~/.config/autostart.sh +exec-once = /usr/lib/polkit-kde-authentication-agent-1 #}}} # Source a file (multi-file configs) @@ -100,10 +101,11 @@ dwindle { #{{{ Master layout options master { special_scale_factor = 0.55 + mfact = 0.69 # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true - new_on_top = false - no_gaps_when_only = false + new_is_master = false + new_on_top = true + no_gaps_when_only = true orientation = left inherit_fullscreen = true } @@ -147,39 +149,42 @@ $secdMod = SUPER #{{{ Layout toggle bind # Layout toggle -bind = $mainMod $secdMod, A, exec, hypr-layout -t +#bind = $mainMod $secdMod, A, exec, hypr-layout -t #}}} #{{{ Master layout binds # Master layout binds -#bind = $mainMod+SHIFT, Return, layoutmsg, swapwithmaster auto #MASTER -#bind = $mainMod+SHIFT, J, layoutmsg, swapnext #MASTER -#bind = $mainMod+SHIFT, K, layoutmsg, swapprev #MASTER -#bind = $mainMod, H, layoutmsg, addmaster #MASTER -#bind = $mainMod, L, layoutmsg, removemaster #MASTER -#bind = $mainMod, J, movefocus, d #MASTER -#bind = $mainMod, K, movefocus, u #MASTER +bind = $mainMod+SHIFT, Return, layoutmsg, swapwithmaster master #MASTER +bind = $mainMod+SHIFT, J, layoutmsg, swapnext #MASTER +bind = $mainMod+SHIFT, K, layoutmsg, swapprev #MASTER +bind = $mainMod+SHIFT, H, layoutmsg, addmaster #MASTER +bind = $mainMod+SHIFT, L, layoutmsg, removemaster #MASTER +bindr = $mainMod, H, splitratio, -0.01 #MASTER +bindr = $mainMod, L, splitratio, +0.01 #MASTER +bind = $mainMod, O, splitratio, exact 0.69 #MASTER +bind = $mainMod, J, movefocus, d #MASTER +bind = $mainMod, K, movefocus, u #MASTER #}}} #{{{ Dwindle layout binds -# Dwindle layout binds -bind = $mainMod, P, pseudo, #DWINDLE -bind = $mainMod $secdMod, S, togglesplit, #DWINDLE -# Move focus with mainMod + HJKL -bind = $mainMod, H, movefocus, l #DWINDLE -bind = $mainMod, L, movefocus, r #DWINDLE -bind = $mainMod, K, movefocus, u #DWINDLE -bind = $mainMod, J, movefocus, d #DWINDLE -# Move window with mainMod + HJKL -bind = $mainMod SHIFT, L, movewindow, r #DWINDLE -bind = $mainMod SHIFT, H, movewindow, l #DWINDLE -bind = $mainMod SHIFT, J, movewindow, d #DWINDLE -bind = $mainMod SHIFT, K, movewindow, u #DWINDLE -# Resize clients with mainMod + secdMod + HJKL -binde = $mainMod $secdMod, L, resizeactive, 10 0 #DWINDLE -binde = $mainMod $secdMod, H, resizeactive, -10 0 #DWINDLE -binde = $mainMod $secdMod, K, resizeactive, 0 -10 #DWINDLE -binde = $mainMod $secdMod, J, resizeactive, 0 10 #DWINDLE +## Dwindle layout binds +#bind = $mainMod, P, pseudo, #DWINDLE +#bind = $mainMod $secdMod, S, togglesplit, #DWINDLE +## Move focus with mainMod + HJKL +#bind = $mainMod, H, movefocus, l #DWINDLE +#bind = $mainMod, L, movefocus, r #DWINDLE +#bind = $mainMod, K, movefocus, u #DWINDLE +#bind = $mainMod, J, movefocus, d #DWINDLE +## Move window with mainMod + HJKL +#bind = $mainMod SHIFT, L, movewindow, r #DWINDLE +#bind = $mainMod SHIFT, H, movewindow, l #DWINDLE +#bind = $mainMod SHIFT, J, movewindow, d #DWINDLE +#bind = $mainMod SHIFT, K, movewindow, u #DWINDLE +## Resize clients with mainMod + secdMod + HJKL +#binde = $mainMod $secdMod, L, resizeactive, 10 0 #DWINDLE +#binde = $mainMod $secdMod, H, resizeactive, -10 0 #DWINDLE +#binde = $mainMod $secdMod, K, resizeactive, 0 -10 #DWINDLE +#binde = $mainMod $secdMod, J, resizeactive, 0 10 #DWINDLE #}}} #{{{ Group binds diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf index a85a08a..1b8480c 100644 --- a/hypr/hyprpaper.conf +++ b/hypr/hyprpaper.conf @@ -5,8 +5,8 @@ preload = ~/background.jpg #set the default wallpaper(s) seen on inital workspace(s) --depending on the number of monitors used wallpaper = eDP-1,~/background.jpg -wallpaper = DP-1,~/background.jpg wallpaper = HDMI-A-1,~/background.jpg +wallpaper = DP-1,~/background.jpg #if more than one monitor in use, can load a 2nd image #wallpaper = monitor2,~/background.jpg # .. more monitors diff --git a/mako/config b/mako/config deleted file mode 100644 index 426a0c2..0000000 --- a/mako/config +++ /dev/null @@ -1,37 +0,0 @@ -max-history=5 -sort=-time - -on-button-left=dismiss -on-button-middle=none -on-button-right=invoke-default-action -on-touch=dismiss -on-notify=exec notify-sound.sh - -font=mononoki Nerd Font Mono 12 -background-color=#000000FF -text-color=#FFFFFFFF -width=300 -height=100 -outer-margin=0 -margin=10 -padding=5 -border-size=2 -border-color=#999999FF -border-radius=3 -progress-color=over #5588AAFF -icons=1 -max-icon-size=64 -icon-path= -icon-location=left -markup=1 -actions=1 -history=0 -text-alignment=left -default-timeout=5000 -ignore-timeout=0 -group-by=none -max-visible=5 -output= -layer=top -anchor=top-right - diff --git a/waybar/config-Hyprland b/waybar/config-Hyprland index bfe0175..8325c86 100644 --- a/waybar/config-Hyprland +++ b/waybar/config-Hyprland @@ -74,7 +74,7 @@ // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", "critical-threshold": 80, // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C", "format-icons": ["", "", ""] }, "backlight": { diff --git a/zsh/.zshenv b/zsh/.zshenv index 2fe0467..45d92ad 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -95,6 +95,7 @@ export PATH="$PATH:$GOPATH/bin" export PATH="$PATH:/opt/REAPER" export PATH="$PATH:/usr/local/bin" export PATH="$PATH:/usr/local/sbin" +export PATH="$PATH:/opt/safing/portmaster" export PATH="$PATH:/var/lib/flatpak/exports/bin" export PATH="$PATH:/usr/bin" export PATH="$PATH:/usr/sbin" @@ -96,3 +96,4 @@ bindkey -- '^[[B' down-line-or-beg [[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}" delete-char #eval "$(starship init zsh)" +eval "$(portmaster-start --data=/opt/safing/portmaster completion zsh)" |