diff --git a/base/base.clj b/base/base.clj
new file mode 100644
index 0000000..e8ee31c
--- /dev/null
+++ b/base/base.clj
@@ -0,0 +1,4 @@
+;;executes shell command but throws exception on error
+(defn- safe-sh [& commands]
+  (as-> (apply shell/sh commands) $
+    (if (= (:exit $) 0) $ (throw (Exception. (:err $))))))
diff --git a/cdist/manifest/init b/cdist/manifest/init
deleted file mode 100644
index a6300f2..0000000
--- a/cdist/manifest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-# once there are more types, this should be handled by a parameter
-__manjaro_desktop
\ No newline at end of file
diff --git a/cdist/type/__aur/gencode-remote b/cdist/type/__aur/gencode-remote
deleted file mode 100755
index 087727d..0000000
--- a/cdist/type/__aur/gencode-remote
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-package="$__object_id"
-user="$(cat "$__object/parameter/user")"
-directory="$(cat "$__object/parameter/directory")/$package"
-
-#install dependencies as root
-echo "grep makedepends $directory/PKGBUILD > $directory/deps;"
-echo "source $directory/deps;"
-echo 'if [[ !(${#makedepends[@]} -eq 0) ]]; then pacman -Sy --noconfirm --needed --asdeps "${makedepends[@]}"; else echo "no make dependencies"; fi;'
-
-#make package as user
-echo "su - $user -s /bin/bash -c \"(cd $directory && makepkg -f)\";"
-
-#install package as root
-echo "pacman --noconfirm -U $directory/*-x86_64.pkg.*;"
diff --git a/cdist/type/__aur/manifest b/cdist/type/__aur/manifest
deleted file mode 100644
index eb7b880..0000000
--- a/cdist/type/__aur/manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-package="$__object_id"
-user="$(cat "$__object/parameter/user")"
-directory="$(cat "$__object/parameter/directory")"
-packagedir="$directory/$package"
-
-export CDIST_ORDER_DEPENDENCY=on
-__git $packagedir --source https://aur.archlinux.org/$package.git
-require="__git/$packagedir" __directory $directory --owner $user --group $user --recursive
-unset CDIST_ORDER_DEPENDENCY
\ No newline at end of file
diff --git a/cdist/type/__aur/nonparallel b/cdist/type/__aur/nonparallel
deleted file mode 100644
index e69de29..0000000
diff --git a/cdist/type/__aur/parameter/required b/cdist/type/__aur/parameter/required
deleted file mode 100644
index c118a71..0000000
--- a/cdist/type/__aur/parameter/required
+++ /dev/null
@@ -1,2 +0,0 @@
-user
-directory
diff --git a/cdist/type/__manjaro_desktop/dotfiles/i3/config b/cdist/type/__manjaro_desktop/dotfiles/i3/config
deleted file mode 100644
index f6d184e..0000000
--- a/cdist/type/__manjaro_desktop/dotfiles/i3/config
+++ /dev/null
@@ -1,209 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod4
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font pango:Fira Code Light 8
-
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-#font pango:DejaVu Sans Mono 8
-
-# The combination of xss-lock, nm-applet and pactl is a popular choice, so
-# they are included here as an example. Modify as you see fit.
-
-# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
-# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-
-# NetworkManager is the most popular way to manage wireless networks on Linux,
-# and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
-
-# Use pactl to adjust volume in PulseAudio.
-set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# custom keybindings
-bindsym $mod+Return exec alacritty
-bindsym $mod+y exec passmenu
-bindsym $mod+x exec emacs
-bindsym $mod+c exec firefox
-bindsym Print exec flameshot gui
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# start dmenu (a program launcher)
-bindsym $mod+d exec "dmenu_run -nf '#F8F8F2' -nb '#282A36' -sb '#6272A4' -sf '#F8F8F2' -fn 'monospace-10' -p 'dmenu%'"
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+odiaeresis focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+odiaeresis move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-# switch to workspace
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-bindsym $mod+4 workspace number $ws4
-bindsym $mod+5 workspace number $ws5
-bindsym $mod+6 workspace number $ws6
-bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $ws8
-bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-  # These bindings trigger as soon as you enter the resize mode
-
-  # Pressing left will shrink the window’s width.
-  # Pressing right will grow the window’s width.
-  # Pressing up will shrink the window’s height.
-  # Pressing down will grow the window’s height.
-  bindsym j resize shrink width 10 px or 10 ppt
-  bindsym k resize grow height 10 px or 10 ppt
-  bindsym l resize shrink height 10 px or 10 ppt
-  bindsym odiaeresis resize grow width 10 px or 10 ppt
-
-  # same bindings, but for the arrow keys
-  bindsym Left resize shrink width 10 px or 10 ppt
-  bindsym Down resize grow height 10 px or 10 ppt
-  bindsym Up resize shrink height 10 px or 10 ppt
-  bindsym Right resize grow width 10 px or 10 ppt
-
-  # back to normal: Enter or Escape or $mod+r
-  bindsym Return mode "default"
-  bindsym Escape mode "default"
-  bindsym $mod+r mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# Dracula Theme
-# class                 border  bground text    indicator child_border
-client.focused          #6272A4 #6272A4 #F8F8F2 #6272A4   #6272A4
-client.focused_inactive #44475A #44475A #F8F8F2 #44475A   #44475A
-client.unfocused        #282A36 #282A36 #BFBFBF #282A36   #282A36
-client.urgent           #44475A #FF5555 #F8F8F2 #FF5555   #FF5555
-client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
-
-client.background       #F8F8F2
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-  status_command i3status
-
-  colors {
-    background #282A36
-    statusline #F8F8F2
-    separator  #44475A
-
-    focused_workspace  #44475A #44475A #F8F8F2
-    active_workspace   #282A36 #44475A #F8F8F2
-    inactive_workspace #282A36 #282A36 #BFBFBF
-    urgent_workspace   #FF5555 #FF5555 #F8F8F2
-    binding_mode       #FF5555 #FF5555 #F8F8F2
-  }
-}
-
-for_window [class="Lazarus" instance="*"] floating enable
\ No newline at end of file
diff --git a/cdist/type/__manjaro_desktop/dotfiles/ncspot/config.toml b/cdist/type/__manjaro_desktop/dotfiles/ncspot/config.toml
deleted file mode 100644
index 71bd381..0000000
--- a/cdist/type/__manjaro_desktop/dotfiles/ncspot/config.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[theme]
-background = "black"
-primary = "light white"
-secondary = "light black"
-title = "green"
-playing = "green"
-playing_selected = "light green"
-playing_bg = "black"
-highlight = "light white"
-highlight_bg = "#484848"
-error = "light white"
-error_bg = "red"
-statusbar = "black"
-statusbar_progress = "green"
-statusbar_bg = "green"
-cmdline = "light white"
-cmdline_bg = "black"
-search_match = "light red"
diff --git a/cdist/type/__manjaro_desktop/manifest b/cdist/type/__manjaro_desktop/manifest
deleted file mode 100644
index 6739a88..0000000
--- a/cdist/type/__manjaro_desktop/manifest
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh -e
-
-# vars
-user="schrofi"
-home="/home/schrofi"
-
-# setup user
-__user "$user" --home "$home" --shell /bin/fish
-require="__user/$user" __directory "$home" \
-       --owner "$user" --group "$user" --mode 0755
-
-__timezone --tz Europe/Vienna
-
-# install packages
-__package_update_index
-require="__package_update_index" __package_upgrade_all
-
-package_list="
-    alacritty
-    binutils
-    chromium
-    clipmenu
-    cups
-    dbeaver
-    emacs
-    fakeroot
-    feh
-    filezilla
-    firefox
-    fish
-    flameshot
-    galculator
-    gcc
-    gimp
-    git
-    git-lfs
-    gnupg
-    gmp
-    gparted
-    gradle
-    gtk3
-    htop
-    jdk-openjdk
-    jre-openjdk
-    libreoffice
-    libxss
-    manjaro-pipewire
-    mosh
-    mtpfs
-    nss
-    nss-mdns
-    ntfs-3g
-    openvpn
-    pass
-    patch
-    pipewire
-    pipewire-jack
-    pipewire-pulse
-    plasma-browser-integration
-    ranger
-    realtime-privileges
-    signal-desktop
-    strip-nondeterminism
-    udevil
-    unarchiver
-    vlc
-    zerotier-one
-"
-
-for package in $package_list
-do require="__package_upgrade_all" __package $package --state=present
-done
-
-# setup dotfiles
-#__dot_file .config/i3/config --user "$user" --source "$__type/dotfiles/i3/config"
-__dot_file .config/ncspot/config.toml --user "$user" --source "$__type/dotfiles/ncspot/config.toml"
-
-# those have to be done in order, install spacemacs
-export CDIST_ORDER_DEPENDENCY=on
-require="__package/emacs" __git "$home/.emacs.d" --source https://github.com/syl20bnr/spacemacs
-__directory "$home/.emacs.d" --owner $user --group $user --recursive
-unset CDIST_ORDER_DEPENDENCY
-
-# install aur packages
-aurdir="$home/Projects/AUR"
-
-# the installation of the following libraries is failing:
-# aura-bin
-# postman-bin
-# seafile
-aur_packages="
-  android-studio
-  helvum
-  ncspot
-  rescrobbled-git
-  scrcpy
-  teams
-"
-
-export CDIST_ORDER_DEPENDENCY=on
-for package in $aur_packages
-do
-    __aur $package --user $user --directory $aurdir
-done
-unset CDIST_ORDER_DEPENDENCY
diff --git a/cdist/type/__manjaro_desktop/singleton b/cdist/type/__manjaro_desktop/singleton
deleted file mode 100644
index e69de29..0000000
diff --git a/configs/configs.clj b/configs/configs.clj
new file mode 100755
index 0000000..4ac4df6
--- /dev/null
+++ b/configs/configs.clj
@@ -0,0 +1,30 @@
+#!/usr/bin/env bb
+
+(require 
+  '[babashka.fs :as fs]
+  '[clojure.tools.cli :refer [parse-opts]]
+  '[clojure.string :as string])
+
+;;todo: import from base.clj
+(defn- safe-sh [& commands]
+  (as-> (apply shell/sh commands) $
+    (if (= (:exit $) 0) $ (throw (Exception. (:err $))))))
+
+(def cli-options
+  [["-u" "--user USER" "The user to set up"]])
+
+(def options (:options (parse-opts *command-line-args* cli-options)))
+
+(if-let [user (:user options)]
+  (let [home (str "/home/" user)]
+    ;;todo: fetch spacemacs
+    ;;todo: disable locking when closing lid on ac
+    (println "applying configuration..")
+
+    ;; installing spacemacs
+    (-> (fs/file (str home "/.emacs.d")) (fs/delete-tree))
+    (safe-sh "git" "clone" "https://github.com/syl20bnr/spacemacs" (str home "/.emacs.d"))
+    (safe-sh "chown" (str user ":" user) "-R" (str home "/.emacs.d"))
+
+    (println "configuration applied"))
+  (println "error: must provide a user to set up"))
\ No newline at end of file
diff --git a/packages/packages.clj b/packages/packages.clj
new file mode 100755
index 0000000..31a74c6
--- /dev/null
+++ b/packages/packages.clj
@@ -0,0 +1,30 @@
+#!/usr/bin/env bb
+
+;;todo: import from base.clj
+(defn- safe-sh [& commands]
+  (as-> (apply shell/sh commands) $
+    (if (= (:exit $) 0) $ (throw (Exception. (:err $))))))
+
+(def packages {
+  :base ["bluez" "chromium" "emacs-gtk3" "fish-shell" "firefox" "flatpak" "git" "pass" "ranger"]
+  :work ["kotlin-bin" "scrcpy"]
+})
+
+(def flatpak-packages {
+  :work ["com.getpostman.Postman" "com.slack.Slack"]
+})
+
+;;todo: allow to pick specific package sets later
+
+;;installing normal xbps packages
+(println "installing packages...")
+(let [packages-to-install (flatten (vals packages))]
+  (apply safe-sh (concat ["xbps-install" "-y"] packages-to-install)))
+(println "packages installed")
+
+;;installing flatpak packages
+(println "installing flatpak packages..")
+(safe-sh "flatpak" "remote-add" "--if-not-exists" "flathub" "https://dl.flathub.org/repo/flathub.flatpakrepo")
+(let [packages-to-install (flatten (vals flatpak-packages))]
+  (apply safe-sh (concat ["flatpak" "install" "flathub" "--noninteractive"] packages-to-install)))
+(println "flatpak packages installed")
diff --git a/readme.md b/readme.md
deleted file mode 100644
index 04f2325..0000000
--- a/readme.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# schrofi's system configuration
-My personal system configuration using cdist on a Manjaro system, specifically tailored towards me and nobody else ¯\_(ツ)_/¯
-You can use it for inspiration though.
-
-## Getting Started
-1. Install cdist 
-```
-git clone https://code.ungleich.ch/ungleich-public/cdist.git
-cd cdist
-export PATH=$PATH:$(pwd -P)/bin
-./bin/cdist-build-helper version
-make install
-sudo python setup.py install
-```
-
-2. Setup SSH root access
-Add the following line into your `/etc/ssh/sshd_config`
-```
-PermitRootLogin yes
-```
-
-Then copy your SSH key to the root user at localhost.
-```
-ssh-copy-id root@localhost
-```
-
-And change the root login back to
-```
-PermitRootLogin without-password
-```
-
-Finally, start the ssh daemon if it is not running
-```
-sudo systemctl start sshd
-```
-
-3. CD into this repository and execute the following command:
-```
-cdist config -vv -c ./cdist localhost
-```
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 0000000..7168d30
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# first install babashka which is required for the other scripts
+xbps-install -y babashka;
+
+./packages/packages.clj;
+./configs/configs.clj;
\ No newline at end of file