updated nix to 25.05 and fixed setup.sh

Signed-off-by: Menno van Leeuwen <menno@vleeuwen.me>

config/ansible/tasks/global/global.yml

@@ -27,10 +27,6 @@
   ansible.builtin.import_tasks: tasks/global/openssh-server.yml
   become: true
 
-- name: Include Utils tasks
-  ansible.builtin.import_tasks: tasks/global/utils.yml
-  become: true
-
 - name: Ensure common packages are installed
   ansible.builtin.package:
     name:
@@ -45,6 +41,7 @@
       - python3-venv
       - pylint
       - black
+      - pipx
       # Package manager wrapper
       - nala
       # Go
@@ -52,6 +49,10 @@
     state: present
   become: true
 
+- name: Include Utils tasks
+  ansible.builtin.import_tasks: tasks/global/utils.yml
+  become: true
+
 - name: Ensure ~/.hushlogin exists
   ansible.builtin.stat:
     path: ~/.hushlogin

config/ansible/tasks/global/utils.yml

@@ -2,18 +2,21 @@
 - name: Load DOTFILES_PATH environment variable
   ansible.builtin.set_fact:
     dotfiles_path: "{{ lookup('env', 'DOTFILES_PATH') }}"
+  become: false
 
 - name: Ensure ~/.local/bin exists
   ansible.builtin.file:
     path: "{{ ansible_env.HOME }}/.local/bin"
     state: directory
     mode: "0755"
+  become: false
 
 - name: Scan utils folder and create symlinks in ~/.local/bin
   ansible.builtin.find:
     paths: "{{ dotfiles_path }}/config/ansible/tasks/global/utils"
     file_type: file
   register: utils_files
+  become: false
 
 - name: Create symlinks for utils scripts
   ansible.builtin.file:

config/ansible/tasks/global/utils/helloworld.go

@@ -1,7 +0,0 @@
-package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("Hello, World!")
-}

config/ansible/tasks/servers/juicefs.yml

@@ -68,6 +68,7 @@
 
 - name: Include JuiceFS Redis tasks
   ansible.builtin.include_tasks: services/redis/redis.yml
+  when: inventory_hostname == 'mennos-cloud-server'
 
 - name: Enable and start JuiceFS service
   ansible.builtin.systemd:

config/ansible/tasks/servers/server.yml

@@ -17,31 +17,61 @@
         services:
           - name: caddy
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: karakeep
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: golink
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: immich
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: gitea
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: jellyfin
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: seafile
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: uptime-kuma
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: factorio
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: dozzle
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: beszel
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: downloaders
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: wireguard
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: echoip
             enabled: true
+            hosts:
+              - mennos-cloud-server
           - name: arr-stack
             enabled: false
+            hosts:
+              - mennos-cloud-server

config/ansible/tasks/servers/services/services.yml

@@ -5,7 +5,7 @@
 - name: Include service tasks
   ansible.builtin.include_tasks: "{{ item.name }}/{{ item.name }}.yml"
   loop: "{{ services }}"
-  when: item.enabled|bool
+  when: item.enabled|bool and (inventory_hostname in item.hosts)
   loop_control:
       label: "{{ item.name }}"
   tags:

config/ansible/templates/juicefs.service.j2

@@ -5,7 +5,7 @@ Before=docker.service
 
 [Service]
 Type=simple
-ExecStart=/usr/local/bin/juicefs mount redis://:{{ redis_password }}@localhost:6379/0 /mnt/object_storage \
+ExecStart=/usr/local/bin/juicefs mount redis://:{{ redis_password }}@mennos-cloud-server:6379/0 /mnt/object_storage \
   --cache-dir=/var/jfsCache \
   --buffer-size=4096 \
   --prefetch=16 \

config/home-manager/flake.lock

@@ -7,43 +7,43 @@
         ]
       },
       "locked": {
-        "lastModified": 1747688870,
-        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
+        "lastModified": 1752175309,
+        "narHash": "sha256-g/f7sW8EH5qRRJF95+hwWj+AzOMlw4zs04Ei5DWSRlU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d5f1f641b289553927b3801580598d200a501863",
+        "rev": "524da5f6c0bf11bb0d5590046276423a28b9453e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750151854,
-        "narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=",
+        "lastModified": 1751943650,
+        "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244",
+        "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1750134718,
-        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
+        "lastModified": 1751984180,
+        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
         "type": "github"
       },
       "original": {

config/home-manager/flake.nix

@@ -2,11 +2,11 @@
   description = "menno's dotfiles";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

config/home-manager/home.nix

@@ -30,7 +30,7 @@
   home = {
     username = "menno";
     homeDirectory = "/home/menno";
-    stateVersion = "24.11";
+    stateVersion = "25.05";
     sessionVariables = {
       PATH = "${config.home.homeDirectory}/go/bin:$PATH";
     };

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

@@ -69,7 +69,7 @@
       choose # Modern cut
       jq # JSON processor
       yq # YAML processor
-      xsv # CSV processor
+      xan # CSV processor (xsv is no longer maintained)
       ncdu # Disk usage analyzer
 
       # System monitoring and process management