diff --git a/group_vars/all.yml b/group_vars/all.yml index 04fd67c..cf42bf8 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -11,6 +11,7 @@ default_roles: # - ssh - hyprland - ghostty + - quickshell temp: - docker # Container platform @@ -67,4 +68,5 @@ aur_packages: - pgformatter-git # - jetbrains-toolbox +home_dir: "/home/johannes" config_dir: "/home/johannes/.config" diff --git a/playbook.yml b/playbook.yml index 6077d35..3586918 100644 --- a/playbook.yml +++ b/playbook.yml @@ -2,7 +2,8 @@ - name: Setup dotfiles configuration hosts: localhost connection: local - become: false + become: true + become_user: johannes vars: dotfiles_dir: "{{ ansible_env.HOME }}/dotfiles" # roles: diff --git a/roles/hyprland/files/hypr/hyprland.conf b/roles/hyprland/files/hypr/hyprland.conf index 75f1f3d..54f61bc 100644 --- a/roles/hyprland/files/hypr/hyprland.conf +++ b/roles/hyprland/files/hypr/hyprland.conf @@ -25,7 +25,8 @@ $menu = env XDG_CURRENT_DESKTOP=Hyprland wofi --show drun # Or execute your favorite apps at launch like this: # exec-once = waybar exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent -exec-once = hyprpanel +# exec-once = hyprpanel +exec-once = quickshell exec-once = dunst exec-once = firefox exec-once = hyprpaper @@ -45,7 +46,7 @@ debug:disable_logs = false # See https://wiki.hypr.land/Configuring/Environment-variables/ env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 -env = QT_QPA_PLATFORM,waylandl;xcb +env = QT_QPA_PLATFORM,wayland env = QT_QPA_PLATFORMTHEME,qt5ct env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 env = QT_AUTO_SCREEN_SCALE_FACTOR,1 @@ -90,18 +91,13 @@ env = _JAVA_AWT_WM_NONREPARENTING, 1 # https://wiki.hypr.land/Configuring/Variables/#general general { gaps_in = 5 - gaps_out = 20 + gaps_out = 10 - border_size = 2 + border_size = 3 # https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.active_border = rgba(9b1a1aee) rgba(c94040ee) 45deg col.inactive_border = rgba(595959aa) - # Active: cosmic purple -> neon cyan gradient - # col.active_border = rgba(7f5af0ee) rgba(00d1ffee) 45deg - # - # # Inactive: deep space slate - # col.inactive_border = rgba(0c0e14aa) # Set to true enable resizing windows by clicking and dragging on borders and gaps resize_on_border = false diff --git a/roles/hyprland/files/hypr/hyprpaper.conf b/roles/hyprland/files/hypr/hyprpaper.conf index 502ce1c..35fa412 100644 --- a/roles/hyprland/files/hypr/hyprpaper.conf +++ b/roles/hyprland/files/hypr/hyprpaper.conf @@ -1,23 +1,23 @@ -preload = /home/johannes/Pictures/Wallpapers/wallhaven-5g22q5.png +preload = /home/johannes/Pictures/Wallpapers/japan-artistic-3840x2160-25406.jpg wallpaper { monitor = DP-1 - path =/home/johannes/Pictures/Wallpapers/wallhaven-5g22q5.png + path =/home/johannes/Pictures/Wallpapers/japan-artistic-3840x2160-25406.jpg # fitmode = cover } wallpaper { monitor = DP-2 - path =/home/johannes/Pictures/Wallpapers/wallhaven-5g22q5.png + path =/home/johannes/Pictures/Wallpapers/japan-artistic-3840x2160-25406.jpg # fitmode = cover } wallpaper { monitor = HDMI-A-1 - path =/home/johannes/Pictures/Wallpapers/wallhaven-5g22q5.png + path =/home/johannes/Pictures/Wallpapers/japan-artistic-3840x2160-25406.jpg # fitmode = cover } wallpaper { monitor = HDMI-A-2 - path =/home/johannes/Pictures/Wallpapers/wallhaven-5g22q5.png + path =/home/johannes/Pictures/Wallpapers/japan-artistic-3840x2160-25406.jpg # fitmode = cover } diff --git a/roles/hyprland/tasks/main.yml b/roles/hyprland/tasks/main.yml index 7e496c3..e61d0b1 100644 --- a/roles/hyprland/tasks/main.yml +++ b/roles/hyprland/tasks/main.yml @@ -15,32 +15,31 @@ path: "{{ config_dir }}/hypr" state: directory mode: '0755' - owner: johannes - group: johannes - name: Symlink hyprland config files file: - src: "{{ role_path }}/files/hypr/{{ item }}" - dest: "{{ config_dir }}/hypr/{{ item }}" + src: "{{ role_path }}/files/hypr/{{ conf_file }}" + dest: "{{ config_dir }}/hypr/{{ conf_file }}" state: link force: true loop: - hyprland.conf - hyprlock.conf - hyprpaper.conf - # - workspaces.conf - scripts + loop_control: + loop_var: conf_file - name: Symlink host-specific monitors.conf file: - src: "{{ role_path }}/files/hypr/monitors_{{ ansible_hostname }}.conf" + src: "{{ role_path }}/files/hypr/monitors_{{ ansible_facts['hostname'] }}.conf" dest: "{{ config_dir }}/hypr/monitors.conf" state: link force: true - name: Symlink host-specific workspaces.conf file: - src: "{{ role_path }}/files/hypr/workspaces_{{ ansible_hostname }}.conf" + src: "{{ role_path }}/files/hypr/workspaces_{{ ansible_facts['hostname'] }}.conf" dest: "{{ config_dir }}/hypr/workspaces.conf" state: link force: true diff --git a/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua b/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua index 7d03f8f..25f2f01 100644 --- a/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua +++ b/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua @@ -96,5 +96,11 @@ return { end, }) vim.lsp.enable('hyprls') + + vim.lsp.config('qmlls', { + cmd = { 'qmlls6' }, + }) + vim.lsp.enable('qmlls') + end, } diff --git a/roles/nvim/tasks/main.yml b/roles/nvim/tasks/main.yml index bad1f3b..b80f043 100644 --- a/roles/nvim/tasks/main.yml +++ b/roles/nvim/tasks/main.yml @@ -1,11 +1,13 @@ --- - name: Install neovim - package: + package: name: neovim state: present + become: yes + become_user: root - name: Symlink neovim - file: + file: src: "{{ role_path }}/files" dest: "{{ config_dir }}/nvim" state: link diff --git a/roles/system/tasks/main.yml b/roles/system/tasks/main.yml index b09bb7e..b84ce6b 100644 --- a/roles/system/tasks/main.yml +++ b/roles/system/tasks/main.yml @@ -4,12 +4,14 @@ update_cache: yes when: ansible_facts.os_family == "Archlinux" become: yes + become_user: root - name: Install system packages package: name: "{{ system_packages }}" state: present become: yes + become_user: root - name: Ensure .config directory exists file: diff --git a/roles/zsh/tasks/main.yaml b/roles/zsh/tasks/main.yaml index 4939744..adeefae 100644 --- a/roles/zsh/tasks/main.yaml +++ b/roles/zsh/tasks/main.yaml @@ -3,12 +3,14 @@ package: name: zsh state: present + become: yes + become_user: root - name: Install oh-my-zsh shell: | sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" --unattended args: - creates: "{{ ansible_facts.env.HOME }}/.oh-my-zsh" + creates: "{{ home_dir }}/.oh-my-zsh" - name: Check for custom zshrc stat: @@ -18,7 +20,7 @@ - name: Symlink custom zshrc file: src: "{{ role_path }}/files/.zshrc" - dest: "{{ ansible_facts.env.HOME }}/.zshrc" + dest: "{{ home_dir }}/.zshrc" state: link force: yes when: custom_zshrc.stat.exists