[fix] fixes after actual install

4 files changed, 76 insertions, 21 deletions

diff --git a/.config/archinstall/user_configuration.json b/.config/archinstall/user_configuration.json
index b483e1c..4cf9a5b 100644
--- a/.config/archinstall/user_configuration.json
+++ b/.config/archinstall/user_configuration.json
@@ -1,11 +1,71 @@
 {
     "additional-repositories": [],
     "archinstall-language": "English",
-    "audio_config": null,
-    "bootloader": "Systemd-boot",
+    "bootloader": "Grub",
     "config_version": "2.6.0",
     "debug": false,
-    "disk_config": null,
+    "disk_config": {
+        "config_type": "default_layout",
+        "device_modifications": [
+            {
+                "device": "/dev/sda",
+                "partitions": [
+                    {
+                        "btrfs": [],
+                        "flags": [
+                            "Boot"
+                        ],
+                        "fs_type": "fat32",
+                        "length": {
+                            "sector_size": null,
+                            "total_size": null,
+                            "unit": "MiB",
+                            "value": 203
+                        },
+                        "mount_options": [],
+                        "mountpoint": "/boot",
+                        "obj_id": "4376cf69-bbc5-456c-9eb8-a3f499ec9db0",
+                        "start": {
+                            "sector_size": null,
+                            "total_size": null,
+                            "unit": "MiB",
+                            "value": 3
+                        },
+                        "status": "create",
+                        "type": "primary"
+                    },
+                    {
+                        "btrfs": [],
+                        "flags": [],
+                        "fs_type": "ext4",
+                        "length": {
+                            "sector_size": null,
+                            "total_size": {
+                                "sector_size": null,
+                                "total_size": null,
+                                "unit": "B",
+                                "value": 500107862016
+                            },
+                            "unit": "Percent",
+                            "value": 100
+                        },
+                        "mount_options": [],
+                        "mountpoint": "/",
+                        "obj_id": "e9978aea-ba88-4d0e-9ad8-a3f62e2248e8",
+                        "start": {
+                            "sector_size": null,
+                            "total_size": null,
+                            "unit": "MiB",
+                            "value": 206
+                        },
+                        "status": "create",
+                        "type": "primary"
+                    }
+                ],
+                "wipe": true
+            }
+        ]
+    },
     "hostname": "archion",
     "kernels": [
         "linux-lts"
@@ -106,16 +166,7 @@
         }
     },
     "network_config": {
-        "nics": [
-            {
-                "dhcp": true,
-                "dns": [],
-                "gateway": null,
-                "iface": "wlan0",
-                "ip": null
-            }
-        ],
-        "type": "manual"
+        "type": "iso"
     },
     "no_pkg_lookups": false,
     "ntp": true,
@@ -142,7 +193,7 @@
     },
     "script": "guided",
     "silent": false,
-    "swap": false,
+    "swap": true,
     "timezone": "Europe/Berlin",
     "version": "2.6.0"
-}
+}
\ No newline at end of file
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 71f4f0f..2f26097 100644..100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -1,12 +1,16 @@
-#!/bin/zsh
+#!/bin/bash
 
 sudo pacman -Sy \
   zsh neovim man-db \
-  eza btop \
+  eza btop cron \
+  python \
   firefox \
-  docker
+  docker docker-compose
 
+chsh -s /bin/zsh
+
+usermod -a -G docker $(whoami)
 sudo systemctl enable docker.service --now
 
-CRONTAB_UPDATE="0 3 * * * update"
-(crontab -u $(whoami) -l; echo "$CRON_UPDATE") | crontab -u $(whoami) -
+CRON_UPDATE="0 3 * * * update"
+(crontab -l; echo "$CRON_UPDATE") | crontab -
diff --git a/.local/bin/update b/.local/bin/update
index ee6f67d..ee6f67d 100644..100755
--- a/.local/bin/update
+++ b/.local/bin/update
diff --git a/Applications/Traefik/docker-compose.yml b/Applications/Traefik/docker-compose.yml
index b432691..33bb0bc 100644
--- a/Applications/Traefik/docker-compose.yml
+++ b/Applications/Traefik/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     labels:
       - "traefik.enable=true"
       # Dashboard
-      - "traefik.http.services.loadbalancer.server.port=8080"
+      - "traefik.http.services.traefik.loadbalancer.server.port=8080"
       - "traefik.http.routers.traefik.rule=Host(`${DOMAIN}`)"
       - "traefik.http.routers.traefik.entrypoints=web"
     volumes: