wip

4 files changed, 38 insertions, 22 deletions

diff --git a/src/config/tasks/main.yaml b/src/config/tasks/main.yaml
index 00f83b4..2eda1c5 100644
--- a/src/config/tasks/main.yaml
+++ b/src/config/tasks/main.yaml
@@ -7,31 +7,31 @@
 
     - name: Setup oh-my-zsh
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.shell: 'sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended'
       ignore_errors: true
 
     - name: Setup zsh-autosuggestions
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.shell: 'git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions'
       ignore_errors: true
 
     - name: Setup zsh-syntax-highlighting
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.shell: 'git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting'
       ignore_errors: true
 
     - name: Setup powerlevel10k
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.shell: 'git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k'
       ignore_errors: true
 
     - name: Setup p10k, tmux and zshrc
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.copy:
         src: shell/{{ item }}
         dest: "/home/{{ config.username }}"
@@ -43,7 +43,7 @@
 
     - name: Setup vimrc and vim bundles
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.copy:
         src: shell/{{ item }}
         dest: "/home/{{ config.username }}"
@@ -53,13 +53,13 @@
 
     - name: Setup vundle
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.shell: 'git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim && vim +PluginInstall +qall'
       ignore_errors: true
 
     - name: Install autoload in right directory
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.copy:
         src: "/home/{{ config.username }}/.vim/bundle/gruvbox-material/autoload/gruvbox_material.vim"
         dest: "/home/{{ config.username }}/.vim/autoload/"
@@ -67,7 +67,7 @@
 
     - name: Install colors in right directory
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.copy:
         src: "/home/{{ config.username }}/.vim/bundle/gruvbox-material/colors/gruvbox-material.vim"
         dest: "/home/{{ config.username }}/.vim/colors/"
@@ -75,7 +75,7 @@
 
     - name: Setup vim/neovim directories
       become: true
-      become_user: {{ config.username }}
+      become_user: "{{ config.username }}"
       ansible.builtin.copy:
         src: "{{ item }}"
         dest: "/home/{{ config.username }}/.config"
@@ -87,7 +87,7 @@
 
 - name: Install Dotfiles (Wayland)
   become: true
-  become_user: {{ config.username }}
+  become_user: "{{ config.username }}"
   ansible.builtin.copy:
     src: "{{ item }}"
     dest: "/home/{{ config.username }}/.config/"
@@ -97,7 +97,7 @@
 
 - name: Install Dotfiles (Xorg)
   become: true
-  become_user: {{ config.username }}
+  become_user: "{{ config.username }}"
   ansible.builtin.copy:
     src: "{{ item }}"
     dest: "/home/{{ config.username }}/.config/"
@@ -107,7 +107,7 @@
 
 - name: Install Dotfiles (All)
   become: true
-  become_user: {{ config.username }}
+  become_user: "{{ config.username }}"
   ansible.builtin.copy:
     src: "{{ item }}"
     dest: "/home/{{ config.username }}/.config/"
diff --git a/src/packages/files/kubernetes.repo b/src/packages/files/kubernetes.repo
new file mode 100644
index 0000000..0c596ef
--- /dev/null
+++ b/src/packages/files/kubernetes.repo
@@ -0,0 +1,6 @@
+[kubernetes]
+name=Kubernetes
+baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch
+enabled=1
+gpgcheck=1
+gpgkey=https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
diff --git a/src/packages/tasks/main.yaml b/src/packages/tasks/main.yaml
index 384f52f..27d8451 100644
--- a/src/packages/tasks/main.yaml
+++ b/src/packages/tasks/main.yaml
@@ -1,9 +1,25 @@
+- name: Setup Repositories
+  block:
+  - name: Setup Free RPM Repository
+    ansible.builtin.shell: 'dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm'
+  - name: Setup Non-Free RPM Repository
+    ansible.builtin.shell: 'dnf install -y   https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm'
+  - name: Setup K8S Repository
+    ansible.builtin.copy:
+      src: kubernetes.repo
+      dest: /etc/yum.repos.d/kubernetes.repo
+      owner: root
+      group: root
+      mode: '0644'
+
 - name: Installing DNF Packages
   ansible.builtin.dnf:
     name: "{{ packages[item].dnf }}"
     state: latest
   loop: "{{ config.packages }}"
 
+- name: Setup Flathub
+  ansible.builtin.shell: 'flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo'
 - name: Installing Flatpaks
   community.general.flatpak:
     name: "{{ packages[item].flatpak }}"
diff --git a/src/packages/vars/main.yaml b/src/packages/vars/main.yaml
index 1be4b88..d6b5d94 100644
--- a/src/packages/vars/main.yaml
+++ b/src/packages/vars/main.yaml
@@ -14,7 +14,6 @@ packages:
       - yt-dlp-bash-completion
       - yt-dlp-zsh-completion
     flatpak:
-      - com.discordapp.Discord
       - com.valvesoftware.Steam
       - com.valvesoftware.SteamLink
       - net.rpcs3.RPCS3
@@ -30,6 +29,7 @@ packages:
       - alacritty
       - git
       - neovim
+      - vim
       - bat
       - fzf
       - cmake
@@ -52,7 +52,6 @@ packages:
       - ruby-devel
       - flatpak
     flatpak:
-      - rest.insomnia.Insomnia
 
   tools:
     dnf:
@@ -67,21 +66,16 @@ packages:
       - pipewire 
       - lm_sensors
     flatpak:
-      - im.riot.Riot
       - org.mozilla.Thunderbird
-      - md.obsidian.Obsidian
-      - com.github.GradienceTeam.Gradience
       - com.github.jeromerobert.pdfarranger
       - net.ankiweb.Anki
-      - org.signal.Signal
-      - sh.cider.Cider
 
   libraries:
     dnf:
       - SDL2-devel
       - ncurses-devel
-      - mesa-va-drivers-freeworld
-      - mesa-vdpau-drivers-freeworld
+        #      - mesa-va-drivers-freeworld
+        #      - mesa-vdpau-drivers-freeworld
     flatpak:
 
   xorg: