Merge branch 'master' of git.mvl.sh:vleeuwenmenno/dotfiles

config/ansible/tasks/global/docker.yml

@@ -14,6 +14,7 @@
 - name: Install Docker CE
   ansible.builtin.shell: bash -c 'set -o pipefail && sh /tmp/get-docker.sh'
   args:
+    executable: /bin/bash
     creates: /usr/bin/docker
   when: docker_check.rc != 0
 

config/ansible/tasks/global/global.yml

@@ -31,7 +31,6 @@
     name:
       - git
       - vim
-      - pipx
       - trash-cli
       - curl
       - wget
@@ -39,9 +38,5 @@
       - python3
       - python3-pip
       - python3-venv
-      - lastlog2 # Used for displaying last login information
     state: present
   become: true
-
-- name: Include pipx tasks
-  ansible.builtin.import_tasks: tasks/global/pipx.yml

config/ansible/tasks/global/openssh-server.yml

@@ -12,7 +12,6 @@
     group: root
     mode: '0644'
     validate: '/usr/sbin/sshd -t -f %s'
-  notify: Restart SSH service
   register: ssh_config
 
 - name: Ensure SSH service is enabled and running

config/ansible/tasks/global/pipx.yml

@@ -1,23 +0,0 @@
-- name: List installed pipx packages
-  ansible.builtin.shell: set -o pipefail && pipx list --short | awk '{print $1}'
-  register: installed_pipx_packages
-  changed_when: false
-
-- name: Define desired pipx packages
-  ansible.builtin.set_fact:
-    desired_pipx_packages:
-      - ansible
-      - ansible-lint
-      - shyaml
-
-- name: Install/Upgrade pipx packages
-  community.general.pipx:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ desired_pipx_packages }}"
-
-- name: Remove undesired pipx packages
-  community.general.pipx:
-    name: "{{ item }}"
-    state: absent
-  loop: "{{ installed_pipx_packages.stdout_lines | difference(desired_pipx_packages) }}"

config/ansible/tasks/global/symlinks.yml

@@ -14,6 +14,7 @@
     - { src: "$DOTFILES_PATH/config/ssh/config", dest: "~/.ssh/config" }
     - { src: "$DOTFILES_PATH/config/ssh/config.d", dest: "~/.ssh/config.d" }
     - { src: "$DOTFILES_PATH/config/starship.toml", dest: "~/.config/starship.toml" }
+    - { src: "$DOTFILES_PATH/.bashrc", dest: "~/.bashrc.extra" }
 
 - name: Create gitconfig symlink
   ansible.builtin.file:

config/ansible/tasks/servers/server.yml

@@ -1,6 +1,56 @@
-- name: Ensure common packages are installed
+- name: Ensure server common packages are installed
   ansible.builtin.package:
     name:
       - openssh-server
     state: present
   become: true
+
+- name: Check if /mnt/services is a mount point
+  ansible.builtin.shell: mountpoint -q /mnt/services || echo "not_mounted"
+  register: mnt_services_check
+  changed_when: false
+  ignore_errors: true
+  become: true
+
+- name: Check if services git repo already exists
+  ansible.builtin.stat:
+    path: "/mnt/services/.git"
+  register: git_dir_check
+  become: true
+  when: mnt_services_check.rc == 0
+
+- name: Clean /mnt/services directory
+  ansible.builtin.shell: find /mnt/services -mindepth 1 -maxdepth 1 -exec rm -rf {} \;
+  become: true
+  when: mnt_services_check.rc == 0 and not git_dir_check.stat.exists|default(false)
+
+- name: Clone /mnt/services repository (initial clone)
+  ansible.builtin.git:
+    repo: "https://git.mvl.sh/vleeuwenmenno/services.git"
+    dest: "/mnt/services"
+    version: "main"
+  become: true
+  register: git_result
+  changed_when: git_result.changed
+  when: mnt_services_check.rc == 0 and not git_dir_check.stat.exists|default(false)
+
+- name: Update /mnt/services repository (if already exists)
+  ansible.builtin.git:
+    repo: "https://git.mvl.sh/vleeuwenmenno/services.git"
+    dest: "/mnt/services"
+    update: true
+    version: "main"
+    force: true
+  become: true
+  register: git_result
+  changed_when: git_result.changed
+  when: mnt_services_check.rc == 0 and git_dir_check.stat.exists|default(false)
+
+- name: Ensure /mnt/services ownership to users
+  ansible.builtin.file:
+    path: "/mnt/services"
+    group: "users"
+    recurse: true
+    state: directory
+  become: true
+  when: mnt_services_check.rc == 0

config/ansible/tasks/workstations/workstation.yml

@@ -32,7 +32,7 @@
 - name: Include MegaSync tasks
   ansible.builtin.import_tasks: tasks/workstations/megasync.yml
 
-- name: Ensure common packages are installed
+- name: Ensure workstation common packages are installed
   ansible.builtin.package:
     name:
       ###### THE FOLLOWING PACKAGES ARE DISABLED DUE TO MISSING ON UBUNTU REPOS ######
@@ -43,6 +43,15 @@
       # Statistics HUD for gaming
       - mangohud
       # Used for VSCode Extensions
-      - nodejs
+      - nodejs      
+      # File Manager
+      - nemo
+      # File Manager Extensions
+      - nemo-compare
+      - nemo-data
+      - nemo-fileroller
+      - nemo-font-manager
+      - nemo-gtkhash
+      - nemo-python
     state: present
   become: true

config/home-manager/packages/common/bash.nix

@@ -4,8 +4,6 @@ let
   dotfilesPath = builtins.getEnv "DOTFILES_PATH";
 in
 {
-  home.file.".bashrc.extra".source = "${dotfilesPath}/.bashrc";
-
   programs.bash = {
     enable = true;
     enableCompletion = true;

config/home-manager/packages/common/packages.nix

@@ -28,8 +28,7 @@
       wget
       fastfetch
 
-      # Package management
-      pipx
+      # Package management      
       devbox
 
       # Development SDKs/Toolkits
@@ -49,7 +48,6 @@
       # File and directory operations
       eza # Modern ls
       bat # Modern cat
-      zoxide # Smarter cd command
       broot # Interactive directory navigator
       du-dust # Modern du
       duf # Modern df

config/ssh/config

@@ -1,5 +1,5 @@
 Host *
-    IdentityFile $DOTFILES_PATH/secrets/ssh_keys/mennos-2025.pem
+    IdentityFile ~/.dotfiles/secrets/ssh_keys/mennos-2025.pem
     IdentityAgent ~/.1password/agent.sock
     AddKeysToAgent yes
     ForwardAgent yes