From d7abf97803649e59eeb06d14bf3dda92edc55ba8 Mon Sep 17 00:00:00 2001
From: Florian Schrofner <florian@schro.fi>
Date: Fri, 1 Dec 2023 23:53:07 +0100
Subject: [PATCH] add i3 packages, clear xfce keybindings

---
 configs/configs.clj   | 55 ++++++++++++++++++++++++++-----------------
 packages/packages.clj |  2 +-
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/configs/configs.clj b/configs/configs.clj
index 28e6b6e..c101d59 100755
--- a/configs/configs.clj
+++ b/configs/configs.clj
@@ -5,6 +5,7 @@
   '[clojure.string :as str])
 
 (def user (System/getenv "SUDO_USER"))
+(def home (str "/home/" user))
 
 ;;todo: import from base.clj
 (defn- safe-sh [& commands]
@@ -14,7 +15,7 @@
 (defn- safe-sh-as-user [& commands]
   (safe-sh "su" "-c" (str/join " " (map #(if (str/includes? % " ") (str "\"" % "\"") %) commands)) user))
 
-(defn- setup-spacemacs [user home]
+(defn- setup-spacemacs []
   ;; installing spacemacs
   (println "setting up spacemacs..")
   (-> (fs/file (str home "/.emacs.d")) (fs/delete-tree))
@@ -22,34 +23,46 @@
   (safe-sh "chown" (str user ":" user) "-R" (str home "/.emacs.d"))
   (println "spacemacs set up"))
 
-(defn- setup-android-scripts [user home]
+(defn- setup-android-scripts []
   (let [android-scripts-dir (str home "/Projects/android-scripts")]
     (fs/create-dirs android-scripts-dir)
     (safe-sh "git" "clone" "ssh://git@git.schro.fi:4242/schrofi/android-scripts.git" android-scripts-dir)
     (safe-sh "chown" (str user ":" user) "-R" android-scripts-dir)))
 
-(let [home (str "/home/" user)]
-  ;;todo: fetch spacemacs
-  ;;todo: disable locking when closing lid on ac
-  (println "applying configuration..")
+(defn- setup-i3 []
+  (println "setting up i3..")
+  (println "clearing xfce keyboard bindings..")
+  (as-> (safe-sh "xfconf-query" "--channel" "xfce4-keyboard-shortcuts" "--list") $
+    (:out $)
+    (str/split-lines $)
+    (doseq [property $]
+      ;;we actually need to ignore errors here, as we will hit a few undefined properties
+      (shell/sh "xfconf-query" "--channel" "xfce4-keyboard-shortcuts" "--property" property "--set" ""))))
 
-  ;;(setup-spacemacs user home)
+;;todo: fetch spacemacs
+;;todo: disable locking when closing lid on ac
+(println "applying configuration..")
 
-  ;;change shell to fish
-  (safe-sh "chsh" "-s" "/usr/bin/fish" user)
-  (println "changed shell to fish")
+;;(setup-spacemacs)
 
-  (safe-sh-as-user "git" "config" "--global" "user.name" "Florian Schrofner")
-  (safe-sh-as-user "git" "config" "--global" "user.email" "florian@schro.fi")
-  (println "changed git user data")
+;;change shell to fish
+(safe-sh "chsh" "-s" "/usr/bin/fish" user)
+(println "changed shell to fish")
 
-  ;;creating projects dir
-  (let [projects-dir (str home "/Projects")]
-    (fs/create-dirs projects-dir)
-    (safe-sh "chown" (str user ":" user) "-R" projects-dir)
-    (println "created project directory"))
+(safe-sh-as-user "git" "config" "--global" "user.name" "Florian Schrofner")
+(safe-sh-as-user "git" "config" "--global" "user.email" "florian@schro.fi")
+(println "changed git user data")
 
-  (setup-android-scripts user home)
-  (println "set up android scripts")
+(setup-i3)
+(println "set up i3")
 
-  (println "configuration applied"))
+;;creating projects dir
+(let [projects-dir (str home "/Projects")]
+  (fs/create-dirs projects-dir)
+  (safe-sh "chown" (str user ":" user) "-R" projects-dir)
+  (println "created project directory"))
+
+(setup-android-scripts)
+(println "set up android scripts")
+
+(println "configuration applied")
diff --git a/packages/packages.clj b/packages/packages.clj
index bcea4b3..4a36efa 100755
--- a/packages/packages.clj
+++ b/packages/packages.clj
@@ -12,7 +12,7 @@
 (def home (str "/home/" user))
 
 (def packages {
-  :base ["bluez" "chromium" "emacs-gtk3" "fish-shell" "firefox" "flameshot" "flatpak" "git" "htop" "pass" "ranger" "Signal-Desktop" "thunar-archive-plugin" "wget" "xarchiver" "xclip"]
+  :base ["bluez" "chromium" "emacs-gtk3" "fish-shell" "firefox" "flameshot" "flatpak" "git" "htop" "i3" "pass" "ranger" "Signal-Desktop" "thunar-archive-plugin" "wget" "xarchiver" "xclip" "xfce4-i3-workspaces-plugin"]
   :work ["kotlin-bin" "scrcpy"]
 })