summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marekpasnikowski@pm.me>2023-12-26 06:01:44 +0100
committerMarek Paśnikowski <marekpasnikowski@pm.me>2023-12-26 06:01:44 +0100
commit1698e82f10534da222c46f92be066fcae8dd0ce8 (patch)
tree1e6e51ad963aaf06778f0bddbeaf1af632f1b06e
parent681bbd1d8a1b67b2c3d7828c4d5344970062682e (diff)
Use git -C to actually pull updates
-rw-r--r--home-configuration.scm12
-rw-r--r--izumi.org12
2 files changed, 14 insertions, 10 deletions
diff --git a/home-configuration.scm b/home-configuration.scm
index 25812ca..8fc6b37 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -143,26 +143,28 @@
( local-file "home-files/git-ignore.conf" ) ) ) ))
(list
(let*
- ((and " && ")
+ ((and "&& ")
(collect-garbage "sudo guix gc -d 7d ")
(configuration-prefix "/home/marek/src/izumi/")
(pull-guix "guix pull ")
(reconfigure-home
(string-append
- "git pull --rebase=true "
+ "git -C "
configuration-prefix
+ " pull "
and
"guix home reconfigure "
configuration-prefix
- "home-configuration.scm"))
+ "home-configuration.scm "))
(reconfigure-system
(string-append
- "git pull --rebase=true "
+ "git -C "
configuration-prefix
+ " pull "
and
"sudo guix system reconfigure "
configuration-prefix
- "system-configuration.scm"))
+ "system-configuration.scm "))
(update-system
(string-append
pull-guix
diff --git a/izumi.org b/izumi.org
index 10c4420..d2c05fd 100644
--- a/izumi.org
+++ b/izumi.org
@@ -797,26 +797,28 @@
#+NAME: HOME-BASH-SERVICE-TYPE
#+BEGIN_SRC scheme
(let*
- ((and " && ")
+ ((and "&& ")
(collect-garbage "sudo guix gc -d 7d ")
(configuration-prefix "/home/marek/src/izumi/")
(pull-guix "guix pull ")
(reconfigure-home
(string-append
- "git pull --rebase=true "
+ "git -C "
configuration-prefix
+ " pull "
and
"guix home reconfigure "
configuration-prefix
- "home-configuration.scm"))
+ "home-configuration.scm "))
(reconfigure-system
(string-append
- "git pull --rebase=true "
+ "git -C "
configuration-prefix
+ " pull "
and
"sudo guix system reconfigure "
configuration-prefix
- "system-configuration.scm"))
+ "system-configuration.scm "))
(update-system
(string-append
pull-guix