Removed old config copy

README.md

@@ -1,2 +1,5 @@
 # ansible_playbooks
 
+#
+
+setxkbmap us -variant intl

arch_basics.yaml

@@ -1,111 +0,0 @@
-# ---
-# - hosts: localhost
-#   vars:
-#     - username: sammy
-#     - home: /home/sammy   
-#   tasks:
-#     - name: print variables
-#       debug:
-#         msg: "Username: {{ username }}, Home dir: {{ home }}"
-
----
-- hosts: localhost
-  vars: 
-    - hostname: 'test-vm'
-  tasks:
-    - name: Update and Upgrade all exisiting packages
-      community.general.pacman:
-        update_cache: yes
-        upgrade: yes
-
-    - name: Install basic packages
-      community.general.pacman:
-        name: sudo,zsh,htop,autoconf,automake,binutils,bison,file,findutils,flex,gawk,gcc,gettext,grep,groff,gzip,libtool,m4,make,patch,pkgconf,sed,texinfo,which,base-devel,ttf-font-awesome
-        state: present
-
-    - name: Make sure we have a 'wheel' group
-      group:
-        name: wheel
-        state: present
-
-    - name: Allow 'wheel' to be sudo
-      lineinfile:
-        dest: /etc/sudoers
-        state: present
-        regexp: '^%wheel'
-        line: '%wheel ALL=(ALL) ALL'
-
-    - name: Add the user tobi
-      ansible.builtin.user:
-        name: tobi
-        password: $6$9OnvBMN6Sxc.muW1$afASAJdoPZL/WxTp6.lh/SurRRiClaru2Pl19fEo6j1aDEQw99kdkfls6.DB8OBacBDnT3bpsLYD3JqrvXlE9/
-        comment: Tobias Maier
-        groups: wheel
-        shell: /bin/zsh
-
-    - name: Add name to git config
-      community.general.git_config:
-        name: user.name
-        scope: system
-        value: Tobias Maier
-
-    - name: Add email to git config
-      community.general.git_config:
-        name: user.email
-        scope: system
-        value: admin@maiertobi.de
-
-    - name: Create the `aur_builder` user
-      ansible.builtin.user:
-        name: aur_builder
-        create_home: yes
-        #group: wheel
-
-    - name: Allow the `aur_builder` user to run `sudo pacman` without a password
-      ansible.builtin.lineinfile:
-        path: /etc/sudoers.d/11-install-aur_builder
-        line: 'aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman'
-        create: yes
-        validate: 'visudo -cf %s'
-
-    - name: Install paru using makepkg if it isn't installed already
-      kewlfft.aur.aur:
-        name: paru
-        use: makepkg
-        state: present
-      become: yes
-      become_method: su
-      become_user: aur_builder
-
-    - name: Install packages from AUR
-      kewlfft.aur.aur:
-        use: paru
-        name: oh-my-zsh-git,zsh-theme-powerlevel10k-git,zsh-autosuggestions,zsh-syntax-highlighting,openssh
-        state: present
-      become: yes
-      become_user: aur_builder
-
-    - name: Clone dotfiles
-      ansible.builtin.git:
-        repo: https://gitea.maiertobi.de/tobimai/dotfiles.git
-        dest: /tmp/dotfiles
-
-    - name: Copy zshrc to home dir
-      ansible.builtin.copy:
-        src: //tmp/dotfiles/.zshrc
-        dest: /home/tobi/.zshrc
-        owner: tobi
-        group: tobi
-        mode: '0644'
-
-    - name: Copy p10k to home dir
-      ansible.builtin.copy:
-        src: //tmp/dotfiles/.p10k.zsh
-        dest: /home/tobi/.p10k.zsh
-        owner: tobi
-        group: tobi
-        mode: '0644'
-
-    - name: Set a hostname
-      hostname:
-        name: "{{ hostname }}"

arch_gnome.yml

@@ -1,123 +1,28 @@
-# ---
-# - hosts: localhost
-#   vars:
-#     - username: sammy
-#     - home: /home/sammy   
-#   tasks:
-#     - name: print variables
-#       debug:
-#         msg: "Username: {{ username }}, Home dir: {{ home }}"
-
 ---
 - hosts: localhost
   vars: 
-    - hostname: 'test-vm'
+    - hostname: 'stargazer'
   tasks:
-    - name: Update and Upgrade all exisiting packages
+    - name: Install Base stuff
-      community.general.pacman:
+      import_tasks: modules/base.yml
-        update_cache: yes
-        upgrade: yes
-
-    - name: Install basic packages
-      community.general.pacman:
-        name: sudo,zsh,htop,autoconf,automake,binutils,bison,file,findutils,flex,gawk,gcc,gettext,grep,groff,gzip,libtool,m4,make,patch,pkgconf,sed,texinfo,which,base-devel,ttf-font-awesome
-        state: present
-
-    - name: Make sure we have a 'wheel' group
-      group:
-        name: wheel
-        state: present
-
-    - name: Allow 'wheel' to be sudo
-      lineinfile:
-        dest: /etc/sudoers
-        state: present
-        regexp: '^%wheel'
-        line: '%wheel ALL=(ALL) ALL'
-
-    - name: Add the user tobi
-      ansible.builtin.user:
-        name: tobi
-        password: $6$9OnvBMN6Sxc.muW1$afASAJdoPZL/WxTp6.lh/SurRRiClaru2Pl19fEo6j1aDEQw99kdkfls6.DB8OBacBDnT3bpsLYD3JqrvXlE9/
-        comment: Tobias Maier
-        groups: wheel
-        shell: /bin/zsh
-
-    - name: Add name to git config
-      community.general.git_config:
-        name: user.name
-        scope: system
-        value: Tobias Maier
-
-    - name: Add email to git config
-      community.general.git_config:
-        name: user.email
-        scope: system
-        value: admin@maiertobi.de
-
-    - name: Create the `aur_builder` user
-      ansible.builtin.user:
-        name: aur_builder
-        create_home: yes
-        #group: wheel
-
-    - name: Allow the `aur_builder` user to run `sudo pacman` without a password
-      ansible.builtin.lineinfile:
-        path: /etc/sudoers.d/11-install-aur_builder
-        line: 'aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman'
-        create: yes
-        validate: 'visudo -cf %s'
-
-    - name: Install paru using makepkg if it isn't installed already
-      kewlfft.aur.aur:
-        name: paru
-        use: makepkg
-        state: present
-      become: yes
-      become_method: su
-      become_user: aur_builder
-
-    - name: Install packages from AUR
-      kewlfft.aur.aur:
-        use: paru
-        name: oh-my-zsh-git,zsh-theme-powerlevel10k-git,zsh-autosuggestions,zsh-syntax-highlighting,openssh
-        state: present
-      become: yes
-      become_user: aur_builder
-
-    - name: Clone dotfiles
-      ansible.builtin.git:
-        repo: https://gitea.maiertobi.de/tobimai/dotfiles.git
-        dest: /tmp/dotfiles
-
-    - name: Copy zshrc to home dir
-      ansible.builtin.copy:
-        src: //tmp/dotfiles/.zshrc
-        dest: /home/tobi/.zshrc
-        owner: tobi
-        group: tobi
-        mode: '0644'
-
-    - name: Copy p10k to home dir
-      ansible.builtin.copy:
-        src: //tmp/dotfiles/.p10k.zsh
-        dest: /home/tobi/.p10k.zsh
-        owner: tobi
-        group: tobi
-        mode: '0644'
 
     - name: Set a hostname
       hostname:
         name: "{{ hostname }}"
 
-    - name: Install packages from AUR
+    - name: Install Gnome
       kewlfft.aur.aur:
         use: paru
-        name: gnome,gnome-extra,orchis-theme-git,python-pip,gnome-shell-extension-dash-to-panel,papirus-icon-theme
+        name: gnome,gnome-extra,orchis-theme-git,python-pip,papirus-icon-theme,gnome-console
-        state: present
+        state: latest
       become: yes
       become_user: aur_builder
 
+    - name: Remove Gnome Terminal
+      pacman:
+        name: gnome-terminal
+        state: absent
+
     - name: Enable service gdm
       ansible.builtin.service:
         name: gdm
@@ -130,7 +35,69 @@
     - name: Set Gnome theme
       dconf:
         key: /org/gnome/desktop/interface/gtk-theme
-        value: "'Orchis-orange-dark'"
+        value: "'Orchis-Orange-Light'"
         state: present
       become: yes
       become_user: tobi
+
+    - name: Set Gnome icon theme
+      dconf:
+        key: /org/gnome/desktop/interface/icon-theme
+        value: "'Papirus-Light'"
+        state: present
+      become: yes
+      become_user: tobi
+    - name: Set Gnome color scheme
+      dconf:
+        key: /org/gnome/desktop/interface/color-scheme
+        value: "'prefer-dark'"
+        state: present
+      become: yes
+      become_user: tobi
+    - name: Set Gnome color scheme
+      dconf:
+        key: /org/gnome/desktop/peripherals/mouse/accel-profile
+        value: "'flat'"
+        state: present
+      become: yes
+      become_user: tobi
+    - name: Set Gnome Title bar middle click action
+      dconf:
+        key: /org/gnome/desktop/wm/preferences/action-middle-click-titlebar
+        value: "'minimize'"
+        state: present
+      become: yes
+      become_user: tobi
+    - name: Set Gnome Dash pins
+      dconf:
+        key: /org/gnome/shell/favorite-apps
+        value: "['org.gnome.Calendar.desktop', 'org.gnome.Nautilus.desktop', 'firefox.desktop', 'org.gnome.Console.desktop', 'org.gnome.Settings.desktop', 'gnome-system-monitor.desktop', 'visual-studio-code.desktop', 'org.gnome.Geary.desktop']"
+        state: present
+      become: yes
+      become_user: tobi
+    - name: Install some more user-packages
+      kewlfft.aur.aur:
+        use: paru
+        name: syncthing,hashcat,hcxtools,prusa-slicer,onlyoffice-bin,kicad,kicad-library,kicad-library-3d,firefox,visual-studio-code-bin,cargo,rust,docker,docker-compose,nerd-fonts-dejavu-complete,qbittorrent,freecad,vlc,gparted,stl-thumb
+        state: present
+      become: yes
+      become_user: aur_builder
+    
+    - name: Enable service Syncthing
+      ansible.builtin.service:
+        name: syncthing@tobi
+        enabled: yes
+        state: started
+
+    - name: Enable service Docker
+      ansible.builtin.service:
+        name: docker
+        enabled: yes
+        state: stopped
+    - name: Install laptop tools
+      kewlfft.aur.aur:
+        use: paru
+        name: gnome-bluetooth
+        state: present
+      become: yes
+      become_user: aur_builder

arch_river.yml

@@ -0,0 +1,72 @@
+---
+- name: Initial installation of WSL arch
+  hosts: localhost,all
+  become: yes
+  
+  pre_tasks:
+    - name: Install Base stuff for Wayland/River
+      import_tasks: modules/base.yml
+    - name: Install packages from AUR
+      kewlfft.aur.aur:
+        use: paru
+        name: rofi-lbonn-wayland,ttf-roboto-mono,ly,foot,foot-terminfo,waybar,pipewire,pipewire-pulse,bluez,bluez-utils,iwd,light,udiskie,man,wdisplays,pamixer,river
+        state: latest
+      become: yes
+      become_user: aur_builder
+      
+    - name: Add WLR_RENDERER_ALLOW_SOFTWARE to /etc/environment, needed for testing in VM
+      ansible.builtin.lineinfile:
+        path: /etc/environment
+        regexp: '^WLR_RENDERER_ALLOW_SOFTWARE='
+        line: WLR_RENDERER_ALLOW_SOFTWARE=1
+    - name: Clone dotfiles
+      ansible.builtin.git:
+        repo: https://gitea.maiertobi.de/tobimai/dotfiles.git
+        dest: /home/tobi/git/dotfiles
+       
+            
+    - name: Ensures directories exist
+      ansible.builtin.file:
+        path: /home/tobi/{{ item }}
+        state: directory
+        group: tobi
+        owner: tobi
+        mode: '0744'
+      loop:
+        - .config/river
+        - .config/foot
+        - .config/waybar
+        - .config/mako
+        - git
+        
+    - name: Copy config files
+      copy: 
+        src: //home/tobi/git/dotfiles/{{ item.src }} 
+        dest: /home/tobi/.config/{{ item.dest }}
+        remote_src: yes
+        owner: tobi
+        group: tobi
+        mode: '0744'
+      with_items:
+      - { src: 'river/init', dest: 'river/init' }
+      - { src: 'foot.ini', dest: 'foot/foot.ini' }
+      - { src: 'waybar/waybar.config', dest: 'waybar/config' }
+      - { src: 'waybar/style.css', dest: 'waybar/style.css' }
+      - { src: 'mako.config', dest: 'mako/config' }
+      - { src: 'waybar/modules', dest: 'waybar/' }
+        
+    - name: Enable services
+      ansible.builtin.service:
+        name: "{{ item }}"
+        enabled: yes
+      with_items:
+        - ly
+        - iwd
+
+    - name: Install some additional programs
+      kewlfft.aur.aur:
+        use: paru
+        name: firefox,visual-studio-code-bin,syncthing
+        state: latest
+      become: yes
+      become_user: aur_builder

arch_sway.yml

@@ -0,0 +1,71 @@
+---
+- name: Initial installation of WSL arch
+  hosts: localhost,all
+  become: yes
+  
+  pre_tasks:
+    - name: Install Base stuff
+      import_tasks: modules/base.yml
+    - name: Install packages from AUR
+      kewlfft.aur.aur:
+        use: paru
+        name: ly,openssh,sway,foot,foot-terminfo,waybar,ttf-font-awesome,sway-launcher-desktop,pipewire,pipewire-pulse,bluez,bluez-utils,firefox,archlinux-wallpaper,iwd,btop,light,wob,udiskie,ranger,mako,micro,man,wdisplays,swayidle,swaylock-effects-git,pamixer,qt5-wayland
+        state: latest
+      become: yes
+      become_user: aur_builder
+      
+    - name: Add WLR_RENDERER_ALLOW_SOFTWARE to /etc/environment, needed for testing in VM
+      ansible.builtin.lineinfile:
+        path: /etc/environment
+        regexp: '^WLR_RENDERER_ALLOW_SOFTWARE='
+        line: WLR_RENDERER_ALLOW_SOFTWARE=1
+    - name: Clone dotfiles
+      ansible.builtin.git:
+        repo: https://gitea.maiertobi.de/tobimai/dotfiles.git
+        dest: /home/tobi/git/dotfiles
+       
+            
+    - name: Ensures directories exist
+      ansible.builtin.file:
+        path: /home/tobi/{{ item }}
+        state: directory
+        group: tobi
+        owner: tobi
+        mode: '0744'
+      loop:
+        - .config/sway
+        - .config/foot
+        - .config/waybar
+        - .config/mako
+        - git
+        
+    - name: Copy config files
+      copy: 
+        src: //home/tobi/git/dotfiles/{{ item.src }} 
+        dest: /home/tobi/.config/{{ item.dest }}
+        remote_src: yes
+        owner: tobi
+        group: tobi
+      with_items:
+      - { src: 'sway_config', dest: 'sway/config' }
+      - { src: 'foot.ini', dest: 'foot/foot.ini' }
+      - { src: 'waybar/waybar.config', dest: 'waybar/config' }
+      - { src: 'waybar/style.css', dest: 'waybar/style.css' }
+      - { src: 'mako.config', dest: 'mako/config' }
+        
+        
+    - name: Enable services
+      ansible.builtin.service:
+        name: "{{ item }}"
+        enabled: yes
+      with_items:
+        - ly
+        - iwd
+
+    - name: Install More apps
+      kewlfft.aur.aur:
+        name: visual-studio-code-bin,cargo,python,nextcloud-client
+        state: latest
+        use: paru
+      become: yes
+      become_user: aur_builder

arch_wsl.yaml

@@ -0,0 +1,45 @@
+---
+- hosts: localhost
+  tasks:
+    - name: Update and Upgrade all exisiting packages
+      community.general.pacman:
+        update_cache: yes
+        upgrade: yes
+
+    - name: Install archlinux-keyring
+      community.general.pacman:
+        name: archlinux-keyring
+        state: latest
+
+    - name: Install basic packages (Need to install base-devel manually due to wsl not supporting fakeroot)
+      community.general.pacman:
+        name: sudo,zsh,autoconf,automake,binutils,bison,file,findutils,flex,gawk,gcc,gettext,grep,groff,gzip,libtool,m4,make,patch,pkgconf,sed,texinfo,which
+        state: present
+
+    - name: Create User etc. 
+      import_tasks: modules/userstuff.yml
+
+    - name: Install Paru
+      import_tasks: modules/paru.yml
+
+    - name: Install zsh stuff
+      import_tasks: modules/zsh.yml
+
+    - name: Install base packages
+      import_tasks: modules/base_packages.yml
+
+    - name: Install Some work software
+      kewlfft.aur.aur:
+        use: paru
+        name: tfenv,azure-cli
+        state: latest
+      become: yes
+      become_user: aur_builder
+
+    - name: Add ssh-rsa to ssh config as this seems to be disabled by default
+      blockinfile:
+        path: /etc/ssh/ssh_config
+        block: |
+          Host *
+            HostKeyAlgorithms ssh-rsa
+            PubkeyAcceptedKeyTypes ssh-rsa   

inventory

@@ -1,2 +0,0 @@
-[mainhost]
-localhost new_hostname=test

modules/base.yml

@@ -0,0 +1,26 @@
+- name: Update and Upgrade all exisiting packages
+  community.general.pacman:
+    update_cache: yes
+    upgrade: yes
+
+- name: Install archlinux-keyring
+  community.general.pacman:
+    name: archlinux-keyring
+    state: latest
+
+- name: Install basic packages
+  community.general.pacman:
+    name: sudo,zsh,base-devel,ttf-font-awesome,openssh
+    state: present
+
+- name: Create User etc. 
+  import_tasks: modules/userstuff.yml
+
+- name: Install Paru
+  import_tasks: modules/paru.yml
+
+- name: Install zsh stuff
+  import_tasks: modules/zsh.yml
+
+- name: Install base packages
+  import_tasks: modules/base_packages.yml

modules/base_packages.yml

@@ -0,0 +1,7 @@
+- name: Install Basic programs
+  kewlfft.aur.aur:
+    use: paru
+    name: bat,zoxide,exa,fzf,vim,fd,tmux,nano,btop,htop
+    state: latest
+  become: yes
+  become_user: aur_builder

modules/paru.yml

@@ -0,0 +1,37 @@
+- name: Create the `aur_builder` user
+  ansible.builtin.user:
+    name: aur_builder
+    create_home: yes
+
+- name: Allow the `aur_builder` user to run `sudo pacman` without a password
+  ansible.builtin.lineinfile:
+    path: /etc/sudoers.d/11-install-aur_builder
+    line: 'aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman'
+    create: yes
+    validate: 'visudo -cf %s'
+
+- name: Install paru using makepkg if it isn't installed already
+  kewlfft.aur.aur:
+    name: paru
+    use: makepkg
+    state: present
+  become: yes
+  become_method: su
+  become_user: aur_builder
+
+- name: Add number of CPUs to MAKEPKG
+  ansible.builtin.lineinfile:
+    path: /etc/makepkg.conf
+    line: 'MAKEFLAGS="-j$(nproc)"'
+    create: yes
+
+- name: Install Basic programs
+  kewlfft.aur.aur:
+    use: paru
+    name: reflector
+    state: latest
+  become: yes
+  become_user: aur_builder
+
+# - name: Run reflector to update mirrorlist
+#   ansible.builtin.command: reflector --latest 20 --sort rate --save /etc/pacman.d/mirrorlist

modules/userstuff.yml

@@ -0,0 +1,36 @@
+- name: Make sure we have a 'wheel' group
+  group:
+    name: wheel
+    state: present
+
+- name: Make sure we have a 'docker' group
+  group:
+    name: docker
+    state: present
+
+- name: Allow 'wheel' to be sudo
+  lineinfile:
+    dest: /etc/sudoers
+    state: present
+    regexp: '^%wheel'
+    line: '%wheel ALL=(ALL) ALL'
+
+- name: Add the user tobi
+  ansible.builtin.user:
+    name: tobi
+    password: $6$9OnvBMN6Sxc.muW1$afASAJdoPZL/WxTp6.lh/SurRRiClaru2Pl19fEo6j1aDEQw99kdkfls6.DB8OBacBDnT3bpsLYD3JqrvXlE9/
+    comment: Tobias Maier
+    groups: wheel,docker
+    shell: /bin/zsh
+
+- name: Add name to git config
+  community.general.git_config:
+    name: user.name
+    scope: system
+    value: Tobias Maier
+
+- name: Add email to git config
+  community.general.git_config:
+    name: user.email
+    scope: system
+    value: admin@maiertobi.de

modules/zsh.yml

@@ -0,0 +1,29 @@
+- name: Install ZSH stuff
+  kewlfft.aur.aur:
+    use: paru
+    name: zsh-theme-powerlevel10k-git,zsh-autosuggestions,zsh-syntax-highlighting,zsh-sudo-git
+    state: present
+  become: yes
+  become_user: aur_builder
+
+#- name: Clone dotfiles
+#  ansible.builtin.git:
+#    repo: https://gitea.maiertobi.de/tobimai/dotfiles.git
+#    dest: /tmp/dotfiles
+#    force: yes
+
+#- name: Copy zshrc to home dir
+#  ansible.builtin.copy:
+#    src: //tmp/dotfiles/.zshrc
+#    dest: /home/tobi/.zshrc
+#    owner: tobi
+#    group: tobi
+#    mode: '0644'
+
+#- name: Copy p10k to home dir
+#  ansible.builtin.copy:
+#    src: //tmp/dotfiles/.p10k.zsh
+#    dest: /home/tobi/.p10k.zsh
+#    owner: tobi
+#    group: tobi
+#    mode: '0644'