Added packages, fixed hypr conf

roles/bash/files/.bashrc

@@ -1,6 +1,10 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+# Env vars
+export EDITOR=nvim
+export VISUAL=nvim
+
 # Load starship prompt if starship is installed
 if [ -f /usr/bin/starship ]; then
   eval "$(starship init bash)"

roles/hypr/files/hyprland.conf

@@ -18,7 +18,7 @@ source = ~/.config/hypr/devices.conf
 
 # Input
 input {
-    kb_layout = de
+    kb_layout = us
     numlock_by_default = 1
 
     follow_mouse = 1
@@ -81,11 +81,6 @@ dwindle {
     preserve_split = yes
 }
 
-# Master
-master {
-    new_is_master = true
-}
-
 # Gestures
 gestures {
     workspace_swipe = on

roles/hypr/files/scripts/app_launcher.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-rofi_conf="~/.config/rofi/main.rasi"
-
-# Rofi action
-case $1 in
-    d)  mode="drun" ;; 
-    w)  mode="window" ;;
-    f)  mode="filebrowser" ;;
-    e)  mode="emoji"
-        action=(-a copy)
-        ;;
-    c)  mode="calc" 
-        action=(-calc-command "wl-copy {result}")
-        children="\"message\", "
-        ;;
-    h)  echo -e "$0 [action]"
-        echo "d :  drun mode"
-        echo "w :  window mode"
-        echo "f :  filebrowser mode"
-        exit 0 ;;
-    *)  mode="drun" ;;
-esac
-
-# Get font 
-font=`gsettings get org.gnome.desktop.interface font-name`
-fnt_override="configuration {font: \"${font//\'}\";}"
-
-# Get icon theme
-icon_override=`gsettings get org.gnome.desktop.interface icon-theme | sed "s/'//g"`
-icon_override="configuration {icon-theme: \"${icon_override}\";}"
-
-# Children
-children_ovr="mainbox {children: [\"inputbar\", $children \"listbox\"];}"
-
-# Launch rofi
-rofi -show $mode ${action[0]} "${action[1]}" -theme-str "$children_ovr" -theme-str "$fnt_override" -theme-str "$icon_override" -config "$rofi_conf"

roles/hypr/files/scripts/clipboard.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-roconf="~/.config/rofi/clipboard.rasi"
-
-# Read font
-font=`gsettings get org.gnome.desktop.interface font-name`
-fnt_override="configuration {font: \"${font//\'}\";}"
-
-# Clipboard action
-case $1 in
-    c)  cliphist list | rofi -dmenu -theme-str "entry { placeholder: \"Copy...\";}" -theme-str "$fnt_override" -config $roconf | cliphist decode | wl-copy
-        ;; 
-    d)  cliphist list | rofi -dmenu -theme-str "entry { placeholder: \"Delete...\";}" -theme-str "$fnt_override" -config $roconf | cliphist delete
-        ;;
-    w)  if [ `echo -e "Yes\nNo" | rofi -dmenu -theme-str "entry { placeholder: \"Clear Clipboard History?\";}" -theme-str "$fnt_override" -config $roconf` == "Yes" ] ; then
-            cliphist wipe
-        fi
-        ;;
-    *)  echo -e "$0 [action]"
-        echo "c :  cliphist list and copy selected"
-        echo "d :  cliphist list and delete selected"
-        echo "w :  cliphist wipe database"
-        exit 1
-        ;;
-esac

roles/hypr/files/scripts/close_apps.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-HYPRCMDS=$(hyprctl -j clients | jq -j '.[] | "dispatch closewindow address:\(.address); "')
-
-hyprctl --batch "$HYPRCMDS" >> /tmp/hypr/cexit.log 2>&1

roles/hypr/files/scripts/logout.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-HYPRCMDS=$(hyprctl -j clients | jq -j '.[] | "dispatch closewindow address:\(.address); "')
-
-hyprctl --batch "$HYPRCMDS" >> /tmp/hypr/cexit.log 2>&1
-hyprctl dispatch exit >> /tmp/hypr/cexit.log 2>&1

roles/hypr/files/themes/catppuccin/LICENSE

@@ -1,21 +0,0 @@
-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

@@ -1,78 +0,0 @@
-
-$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

@@ -1,78 +0,0 @@
-
-$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

@@ -1,78 +0,0 @@
-
-$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

@@ -1,77 +0,0 @@
-$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

@@ -12,8 +12,15 @@
     path: "{{ ansible_user_dir }}/.config/hypr"
     state: directory
 
+- name: "[Hyprland] Create screenshot folder"
+  ansible.builtin.file:
+    mode: 0755
+    path: "{{ ansible_user_dir }}/Pictures/Screenshots"
+    state: directory
+
 - name: "[Hyprland] Configure"
   ansible.builtin.copy:
+    mode: 0755
     src: "./"
     dest: "{{ ansible_user_dir }}/.config/hypr"
 

roles/hypr/templates/startup.conf

@@ -5,7 +5,6 @@ exec-once = ags
 {% if system == "desktop_full" %}
 exec-once = armcord
 exec-once = youtube-music
-exec-once = element-desktop
 exec-once = nextcloud
 {% endif %}
 exec-once = nm-applet

roles/nvim/files/init.lua

@@ -27,20 +27,24 @@ require("lazy").setup({
     name = "catppuccin.vim",
     priority = 1000,
     config = function()
-      vim.cmd.colorscheme("catppuccin")
+      vim.cmd.colorscheme("catppuccin-macchiato")
     end,
   },
 
   -- Syntax highlighting support
-  "elkowar/yuck.vim",
+  -- "fladson/vim-kitty",
-  "fladson/vim-kitty",
-  -- Use "gc" to comment visual regions/lines
-  { "numToStr/Comment.nvim", opts = {} },
 
-  -- Detect tabstop and shiftwidth automatically
+  -- Comment visual regions/lines
-  -- "tpope/vim-sleuth",
+  "numToStr/Comment.nvim",
 
-  -- Add indentation guides even on blank lines ???
+  -- Autoclose brackets
+  { "m4xshen/autoclose.nvim", opts = {} },
+  { "windwp/nvim-ts-autotag", opts = {},   lazy = false }, -- Doesn't work?
+
+  -- Surround selection
+  "tpope/vim-surround",
+
+  -- Add indentation guides
   {
     "lukas-reineke/indent-blankline.nvim",
     main = "ibl",
@@ -60,7 +64,7 @@ require("lazy").setup({
     },
   },
 
-  -- LSP (Configuration under "lspconfig")
+  -- LSP
   {
     "neovim/nvim-lspconfig",
     dependencies = {

roles/system/tasks/Archlinux.yml

@@ -22,13 +22,16 @@
     name:
       - networkmanager
       - networkmanager-openvpn
-      - network-manager-applet
+      - wireguard-tools
       - inotify-tools
+      - libqalculate
       - cifs-utils
       - reflector
+      - os-prober
       - ntfs-3g
       - openssh
       - upower
+      - expac
       - unzip
       - less
       - curl
@@ -38,6 +41,8 @@
       - tar
       - eza
       - bat
+      - fzf
+      - fd
       - jq
     state: present
   tags:
@@ -50,6 +55,7 @@
       - maven
       - rustup
       - npm
+      - go
     state: present
   tags:
     - programming_pkgs
@@ -78,15 +84,18 @@
       - pipewire-jack
       - pipewire-pulse
       - gst-plugin-pipewire
+      # Network
+      - network-manager-applet
       # Bluetooth
       - bluez
       - bluez-utils
       - blueman
+      - gnome-bluetooth-3.0
       # Printing
       - cups
       - cups-pdf
       # Theming
-      #- qt5ct 
+      - qt5ct 
       # Icon Themes
       - papirus-icon-theme
       # Cursor Themes
@@ -104,6 +113,7 @@
       - mediainfo
       - hyprpicker
       - swww
+      - sddm
       - swayidle
       - grimblast-git
       - cliphist
@@ -121,6 +131,8 @@
     name: 
       - libreoffice-fresh
       - nextcloud-client
+      - appimagelauncher
+      - feishin-appimage
       - element-desktop
       - youtube-music
       - vscodium-bin
@@ -132,6 +144,8 @@
       - yt-dlp
       - nvtop
       - nemo
+      - nemo-fileroller
+      - gvfs-smb
       - mpv
       # Device configuration
       #- openrazer-daemon