Fixed bugs

Added paru installation
Switchted to hyprlock

roles/hypr/files/env.conf

@@ -1,12 +1,8 @@
 # Environment
 env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
-env = HYPRCURSOR_THEME,rose-pine-hyprcursor
+env = HYPRCURSOR_THEME,breeze
 env = XDG_SESSION_TYPE,wayland
 env = WLR_NO_HARDWARE_CURSORS,1
 env = QT_QPA_PLATFORMTHEME,qt5ct
-#env = QT_QPA_PLATFORM,wayland
 env = QT_STYLE_OVERRIDE,kvantum
-
-# Minecraft
-env = __GL_THREADED_OPTIMIZATIONS,0

roles/hypr/files/hyprlock.conf

@@ -0,0 +1,80 @@
+source = $HOME/.config/hypr/themes/catppuccin/mocha.conf
+
+$accent = $sapphire
+$accentAlpha = 7dc4e4 # $sapphireAlpha Doesn't work???
+$font = CaskaydiaCove Nerd Font
+
+# GENERAL
+general {
+    disable_loading_bar = true
+    hide_cursor = true
+}
+
+# BACKGROUND
+background {
+    monitor = 
+    path = ~/.config/background
+    blur_passes = 0
+    color = $base
+}
+
+# DATE 
+label {
+    monitor =
+    text = cmd[update:30000] echo "$(date +"%R")"
+    color = $text
+    font_size = 90
+    font_family = $font
+    position = -30, 0
+    halign = right
+    valign = top
+}
+
+# TIME
+label {
+    monitor = 
+    text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"
+    color = $text
+    font_size = 25
+    font_family = $font
+    position = -30, -150
+    halign = right
+    valign = top
+}
+
+# USER AVATAR
+image {
+    monitor = 
+    path = /var/lib/AccountsService/icons/$USER
+    border_color = $accent
+    border_size = 2
+    rounding = -1
+    size = 200
+    position = 0, 150
+    halign = center
+    valign = center
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 300, 60
+    outline_thickness = 2
+    dots_size = 0.2
+    dots_spacing = 0.2
+    dots_center = true
+    outer_color = $accent
+    inner_color = $surface0
+    font_color = $text
+    fade_on_empty = false
+    placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
+    hide_input = false
+    check_color = $accent
+    fail_color = $red
+    fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
+    capslock_color = $peach
+    numlock_color = $green
+    position = 0, -35
+    halign = center
+    valign = center
+}

roles/hypr/files/keybinds.conf

@@ -11,7 +11,7 @@ bind = $mainMod, F4, exec, wlogout
 bind = $mainMod, F, togglefloating,
 bind = $mainMod, N, exec, swaync-client -t -sw 
 bind = $mainMod SHIFT, P, exec, hyprpicker -n -a -r
-bind = $mainMod, O, exec, ~/.config/hypr/scripts/lock.sh
+bind = $mainMod, O, exec, hyprlock
 bind = $mainMod, B, exec, ~/.config/hypr/scripts/game_mode.sh
 bind = $mainMod, V, exec, pkill rofi || ~/.config/hypr/scripts/clipboard.sh c
 bind = $mainMod, TAB, exec, pkill rofi || ~/.config/hypr/scripts/app_launcher.sh w
@@ -25,18 +25,19 @@ bind = , XF86AudioNext, exec, playerctl next
 bind = , XF86AudioPrev, exec, playerctl previous 
 bind = , XF86AudioPlay, exec, playerctl play
 bind = , XF86AudioPause, exec, playerctl pause
-bind = , XF86AudioMute, exec, ~/.config/eww/scripts/audio.sh mutesink @DEFAULT_SINK@
-bind = , XF86AudioMicMute, exec, ~/.config/eww/scripts/audio.sh mutesource @DEFAULT_SOURCE@
-binde = , XF86AudioRaiseVolume, exec, ~/.config/eww/scripts/audio.sh vol up
-binde = , XF86AudioLowerVolume, exec, ~/.config/eww/scripts/audio.sh vol down 
+bind = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
+bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
+binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 5%+
+binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 5%-
 binde = , XF86MonBrightnessDown, exec, brightnessctl set 5%-
 binde = , XF86MonBrightnessUp, exec, brightnessctl set 5%+
+#bind = , XF86PowerOff, exec, systemctl shutdown
 
 # Applications
 bind = $mainMod, T, exec, alacritty
 bind = $mainMod, E, exec, nemo
 bind = $mainMod, G, exec, ~/.config/hypr/scripts/app_launcher.sh c
-bind = CTRL SHIFT, ESCAPE, exec, gnome-system-monitor
+bind = CTRL SHIFT, ESCAPE, exec, alacritty -e btop
 
 # Move focus
 bind = $mainMod, left, movefocus, l

roles/hypr/files/scripts/idle.sh

@@ -1,21 +1,8 @@
 #!/bin/bash
 
-isplayingvideo(){
-if pactl list | grep -q RUNNING; then
-        exit 1 
-else
-        exit 0 
-fi
-}
-
-if ! [ -z $1 ]; then
-        isplayingvideo
-fi
-
 timeout_lock=900
 timeout_DPMS=1080
 
 swayidle -w \
-        timeout ${timeout_lock} "$0 isplayinfvideo || ~/.config/hypr/scripts/lock.sh" \
-        #timeout ${timeout_DPMS} 'hyprctl dispatch dpms off'
-        #resume 'hyprctl dispatch dpms on' # Crashes all apps -> Hyprland config set misc/mouse_move_enables_dpms=true
+        timeout ${timeout_lock} "hyprlock & disown" \
+        timeout ${timeout_DPMS} "hyprctl dispatch dpms off"

roles/hypr/files/scripts/wait_for_tray.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-program_name="ags"
-
-check_program_running() {
-    pgrep -x "$program_name" > /dev/null
-}
-
-while ! check_program_running; do
-    sleep 1
-done
-
-sleep 1

roles/hypr/files/themes/catppuccin/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Catppuccin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

roles/hypr/files/themes/catppuccin/frappe.conf

@@ -0,0 +1,78 @@
+
+$rosewater = rgb(f2d5cf)
+$rosewaterAlpha = f2d5cf
+
+$flamingo = rgb(eebebe)
+$flamingoAlpha = eebebe
+
+$pink = rgb(f4b8e4)
+$pinkAlpha = f4b8e4
+
+$mauve = rgb(ca9ee6)
+$mauveAlpha = ca9ee6
+
+$red = rgb(e78284)
+$redAlpha = e78284
+
+$maroon = rgb(ea999c)
+$maroonAlpha = ea999c
+
+$peach = rgb(ef9f76)
+$peachAlpha = ef9f76
+
+$yellow = rgb(e5c890)
+$yellowAlpha = e5c890
+
+$green = rgb(a6d189)
+$greenAlpha = a6d189
+
+$teal = rgb(81c8be)
+$tealAlpha = 81c8be
+
+$sky = rgb(99d1db)
+$skyAlpha = 99d1db
+
+$sapphire = rgb(85c1dc)
+$sapphireAlpha = 85c1dc
+
+$blue = rgb(8caaee)
+$blueAlpha = 8caaee
+
+$lavender = rgb(babbf1)
+$lavenderAlpha = babbf1
+
+$text = rgb(c6d0f5)
+$textAlpha = c6d0f5
+
+$subtext1 = rgb(b5bfe2)
+$subtext1Alpha = b5bfe2
+
+$subtext0 = rgb(a5adce)
+$subtext0Alpha = a5adce
+
+$overlay2 = rgb(949cbb)
+$overlay2Alpha = 949cbb
+
+$overlay1 = rgb(838ba7)
+$overlay1Alpha = 838ba7
+
+$overlay0 = rgb(737994)
+$overlay0Alpha = 737994
+
+$surface2 = rgb(626880)
+$surface2Alpha = 626880
+
+$surface1 = rgb(51576d)
+$surface1Alpha = 51576d
+
+$surface0 = rgb(414559)
+$surface0Alpha = 414559
+
+$base = rgb(303446)
+$baseAlpha = 303446
+
+$mantle = rgb(292c3c)
+$mantleAlpha = 292c3c
+
+$crust = rgb(232634)
+$crustAlpha = 232634

roles/hypr/files/themes/catppuccin/latte.conf

@@ -0,0 +1,78 @@
+
+$rosewater = rgb(dc8a78)
+$rosewaterAlpha = dc8a78
+
+$flamingo = rgb(dd7878)
+$flamingoAlpha = dd7878
+
+$pink = rgb(ea76cb)
+$pinkAlpha = ea76cb
+
+$mauve = rgb(8839ef)
+$mauveAlpha = 8839ef
+
+$red = rgb(d20f39)
+$redAlpha = d20f39
+
+$maroon = rgb(e64553)
+$maroonAlpha = e64553
+
+$peach = rgb(fe640b)
+$peachAlpha = fe640b
+
+$yellow = rgb(df8e1d)
+$yellowAlpha = df8e1d
+
+$green = rgb(40a02b)
+$greenAlpha = 40a02b
+
+$teal = rgb(179299)
+$tealAlpha = 179299
+
+$sky = rgb(04a5e5)
+$skyAlpha = 04a5e5
+
+$sapphire = rgb(209fb5)
+$sapphireAlpha = 209fb5
+
+$blue = rgb(1e66f5)
+$blueAlpha = 1e66f5
+
+$lavender = rgb(7287fd)
+$lavenderAlpha = 7287fd
+
+$text = rgb(4c4f69)
+$textAlpha = 4c4f69
+
+$subtext1 = rgb(5c5f77)
+$subtext1Alpha = 5c5f77
+
+$subtext0 = rgb(6c6f85)
+$subtext0Alpha = 6c6f85
+
+$overlay2 = rgb(7c7f93)
+$overlay2Alpha = 7c7f93
+
+$overlay1 = rgb(8c8fa1)
+$overlay1Alpha = 8c8fa1
+
+$overlay0 = rgb(9ca0b0)
+$overlay0Alpha = 9ca0b0
+
+$surface2 = rgb(acb0be)
+$surface2Alpha = acb0be
+
+$surface1 = rgb(bcc0cc)
+$surface1Alpha = bcc0cc
+
+$surface0 = rgb(ccd0da)
+$surface0Alpha = ccd0da
+
+$base = rgb(eff1f5)
+$baseAlpha = eff1f5
+
+$mantle = rgb(e6e9ef)
+$mantleAlpha = e6e9ef
+
+$crust = rgb(dce0e8)
+$crustAlpha = dce0e8

roles/hypr/files/themes/catppuccin/macchiato.conf

@@ -0,0 +1,78 @@
+
+$rosewater = rgb(f4dbd6)
+$rosewaterAlpha = f4dbd6
+
+$flamingo = rgb(f0c6c6)
+$flamingoAlpha = f0c6c6
+
+$pink = rgb(f5bde6)
+$pinkAlpha = f5bde6
+
+$mauve = rgb(c6a0f6)
+$mauveAlpha = c6a0f6
+
+$red = rgb(ed8796)
+$redAlpha = ed8796
+
+$maroon = rgb(ee99a0)
+$maroonAlpha = ee99a0
+
+$peach = rgb(f5a97f)
+$peachAlpha = f5a97f
+
+$yellow = rgb(eed49f)
+$yellowAlpha = eed49f
+
+$green = rgb(a6da95)
+$greenAlpha = a6da95
+
+$teal = rgb(8bd5ca)
+$tealAlpha = 8bd5ca
+
+$sky = rgb(91d7e3)
+$skyAlpha = 91d7e3
+
+$sapphire = rgb(7dc4e4)
+$sapphireAlpha = 7dc4e4
+
+$blue = rgb(8aadf4)
+$blueAlpha = 8aadf4
+
+$lavender = rgb(b7bdf8)
+$lavenderAlpha = b7bdf8
+
+$text = rgb(cad3f5)
+$textAlpha = cad3f5
+
+$subtext1 = rgb(b8c0e0)
+$subtext1Alpha = b8c0e0
+
+$subtext0 = rgb(a5adcb)
+$subtext0Alpha = a5adcb
+
+$overlay2 = rgb(939ab7)
+$overlay2Alpha = 939ab7
+
+$overlay1 = rgb(8087a2)
+$overlay1Alpha = 8087a2
+
+$overlay0 = rgb(6e738d)
+$overlay0Alpha = 6e738d
+
+$surface2 = rgb(5b6078)
+$surface2Alpha = 5b6078
+
+$surface1 = rgb(494d64)
+$surface1Alpha = 494d64
+
+$surface0 = rgb(363a4f)
+$surface0Alpha = 363a4f
+
+$base = rgb(24273a)
+$baseAlpha = 24273a
+
+$mantle = rgb(1e2030)
+$mantleAlpha = 1e2030
+
+$crust = rgb(181926)
+$crustAlpha = 181926

roles/hypr/files/themes/catppuccin/mocha.conf

@@ -0,0 +1,77 @@
+$rosewater = rgb(f5e0dc)
+$rosewaterAlpha = f5e0dc
+
+$flamingo = rgb(f2cdcd)
+$flamingoAlpha = f2cdcd
+
+$pink = rgb(f5c2e7)
+$pinkAlpha = f5c2e7
+
+$mauve = rgb(cba6f7)
+$mauveAlpha = cba6f7
+
+$red = rgb(f38ba8)
+$redAlpha = f38ba8
+
+$maroon = rgb(eba0ac)
+$maroonAlpha = eba0ac
+
+$peach = rgb(fab387)
+$peachAlpha = fab387
+
+$yellow = rgb(f9e2af)
+$yellowAlpha = f9e2af
+
+$green = rgb(a6e3a1)
+$greenAlpha = a6e3a1
+
+$teal = rgb(94e2d5)
+$tealAlpha = 94e2d5
+
+$sky = rgb(89dceb)
+$skyAlpha = 89dceb
+
+$sapphire = rgb(74c7ec)
+$sapphireAlpha = 74c7ec
+
+$blue = rgb(89b4fa)
+$blueAlpha = 89b4fa
+
+$lavender = rgb(b4befe)
+$lavenderAlpha = b4befe
+
+$text = rgb(cdd6f4)
+$textAlpha = cdd6f4
+
+$subtext1 = rgb(bac2de)
+$subtext1Alpha = bac2de
+
+$subtext0 = rgb(a6adc8)
+$subtext0Alpha = a6adc8
+
+$overlay2 = rgb(9399b2)
+$overlay2Alpha = 9399b2
+
+$overlay1 = rgb(7f849c)
+$overlay1Alpha = 7f849c
+
+$overlay0 = rgb(6c7086)
+$overlay0Alpha = 6c7086
+
+$surface2 = rgb(585b70)
+$surface2Alpha = 585b70
+
+$surface1 = rgb(45475a)
+$surface1Alpha = 45475a
+
+$surface0 = rgb(313244)
+$surface0Alpha = 313244
+
+$base = rgb(1e1e2e)
+$baseAlpha = 1e1e2e
+
+$mantle = rgb(181825)
+$mantleAlpha = 181825
+
+$crust = rgb(11111b)
+$crustAlpha = 11111b

roles/hypr/tasks/main.yml

@@ -1,14 +1,14 @@
 ---
 - name: "[Hyprland] Install"
-  ansible.builtin.package:
+  kewlfft.aur.aur:
     name:
       - hyprland
-    state: latest
-  become: true
+      - hyprlock-git
+    state: present
 
 - name: "[Hyprland] Create config folder"
   ansible.builtin.file:
-    mode: "0755"
+    mode: 0755
     path: "{{ ansible_user_dir }}/.config/hypr"
     state: directory
 
@@ -16,3 +16,13 @@
   ansible.builtin.copy:
     src: "./"
     dest: "{{ ansible_user_dir }}/.config/hypr"
+
+- name: "[Hyprland] Configure startup"
+  ansible.builtin.template:
+    src: startup.conf
+    dest: "{{ ansible_user_dir }}/.config/hypr"
+
+- name: "[Hyprland] Configure windowrules"
+  ansible.builtin.template:
+    src: windowrule.conf
+    dest: "{{ ansible_user_dir }}/.config/hypr"

roles/hypr/templates/startup.conf

@@ -1,11 +1,13 @@
 # First for systray
-exec-once = ags -c /home/keule/test/config.js
+exec-once = ags
 
 # Programms
+{% if system == "desktop_full" %}
 exec-once = armcord
-exec-once = nextcloud
 exec-once = youtube-music
 exec-once = element-desktop
+exec-once = nextcloud
+{% endif %}
 exec-once = nm-applet
 exec-once = blueman-applet
 exec-once = playerctld daemon

roles/hypr/templates/windowrule.conf

@@ -1,4 +1,5 @@
 # Monitors
+{% if system == "desktop_full" %}
 $monitorOne = HDMI-A-1
 $monitorTwo = DP-2
 $monitorThree = HDMI-A-2
@@ -6,6 +7,7 @@ $monitorThree = HDMI-A-2
 monitor = $monitorOne,1920x1080@144.001007,0x0,1
 monitor = $monitorTwo,2560x1440@143.912003,1920x0,1
 monitor = $monitorThree,1920x1080@60.000000,4480x0,1
+{% endif %}
 monitor = ,preferred,auto,1
 
 
@@ -14,6 +16,7 @@ windowrule = workspace 2,^(YouTube Music)$
 windowrule = workspace 4,^(explorer.exe)$
 windowrule = workspace 4,^(lutris)$
 windowrule = workspace 5,^(discord)$
+windowrule = workspace 5,^(ArmCord)$
 windowrule = workspace 5,^(WebCord)$
 windowrule = workspace 5,^(Element)$
 windowrule = workspace 5,^(de.keule.client.ui.JavaFX)$
@@ -24,6 +27,7 @@ windowrule = float,title:^.*culator.*$
 
 
 # Workspace
+{% if system == "desktop_full" %}
 workspace = 1, monitor:$monitorOne, default:true
 workspace = 2, monitor:$monitorOne
 
@@ -32,3 +36,4 @@ workspace = 4, monitor:$monitorTwo
 
 workspace = 5, monitor:$monitorThree, default:true
 workspace = 6, monitor:$monitorThree
+{% endif %}