schrofi
/
dotfiles
1
0
Fork 0
Code Releases Activity

add i3 packages, clear xfce keybindings

master
Florian Schrofner 2023-12-01 23:53:07 +01:00
parent 67c0a8ded4
commit d7abf97803
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configs/configs.clj
View File

@ -5,6 +5,7 @@
'[clojure.string :as str]) '[clojure.string :as str])
(def user (System/getenv "SUDO_USER")) (def user (System/getenv "SUDO_USER"))
(def home (str "/home/" user))
;;todo: import from base.clj ;;todo: import from base.clj
(defn- safe-sh [& commands] (defn- safe-sh [& commands]
@ -14,7 +15,7 @@
(defn- safe-sh-as-user [& commands] (defn- safe-sh-as-user [& commands]
(safe-sh "su" "-c" (str/join " " (map #(if (str/includes? % " ") (str "\"" % "\"") %) commands)) user)) (safe-sh "su" "-c" (str/join " " (map #(if (str/includes? % " ") (str "\"" % "\"") %) commands)) user))
(defn- setup-spacemacs [user home] (defn- setup-spacemacs []
;; installing spacemacs ;; installing spacemacs
(println "setting up spacemacs..") (println "setting up spacemacs..")
(-> (fs/file (str home "/.emacs.d")) (fs/delete-tree)) (-> (fs/file (str home "/.emacs.d")) (fs/delete-tree))
@ -22,18 +23,27 @@
(safe-sh "chown" (str user ":" user) "-R" (str home "/.emacs.d")) (safe-sh "chown" (str user ":" user) "-R" (str home "/.emacs.d"))
(println "spacemacs set up")) (println "spacemacs set up"))
(defn- setup-android-scripts [user home] (defn- setup-android-scripts []
(let [android-scripts-dir (str home "/Projects/android-scripts")] (let [android-scripts-dir (str home "/Projects/android-scripts")]
(fs/create-dirs android-scripts-dir) (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 "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))) (safe-sh "chown" (str user ":" user) "-R" android-scripts-dir)))
(let [home (str "/home/" user)] (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" ""))))
;;todo: fetch spacemacs ;;todo: fetch spacemacs
;;todo: disable locking when closing lid on ac ;;todo: disable locking when closing lid on ac
(println "applying configuration..") (println "applying configuration..")
;;(setup-spacemacs user home) ;;(setup-spacemacs)
;;change shell to fish ;;change shell to fish
(safe-sh "chsh" "-s" "/usr/bin/fish" user) (safe-sh "chsh" "-s" "/usr/bin/fish" user)
@ -43,13 +53,16 @@
(safe-sh-as-user "git" "config" "--global" "user.email" "florian@schro.fi") (safe-sh-as-user "git" "config" "--global" "user.email" "florian@schro.fi")
(println "changed git user data") (println "changed git user data")
(setup-i3)
(println "set up i3")
;;creating projects dir ;;creating projects dir
(let [projects-dir (str home "/Projects")] (let [projects-dir (str home "/Projects")]
(fs/create-dirs projects-dir) (fs/create-dirs projects-dir)
(safe-sh "chown" (str user ":" user) "-R" projects-dir) (safe-sh "chown" (str user ":" user) "-R" projects-dir)
(println "created project directory")) (println "created project directory"))
(setup-android-scripts user home) (setup-android-scripts)
(println "set up android scripts") (println "set up android scripts")
(println "configuration applied")) (println "configuration applied")

2
packages/packages.clj
View File

@ -12,7 +12,7 @@
(def home (str "/home/" user)) (def home (str "/home/" user))
(def packages { (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"] :work ["kotlin-bin" "scrcpy"]
}) })