dotter: Simplify local setups

Everything that is in the repo should be listed in the global.toml
file. The local.toml file then picks the stuff to actually
write. For systemwide packages, a systemwide.toml (local) file
is used instead.

.dotter/global.toml

@@ -14,8 +14,6 @@ depends = [
   "writing",
 ]
 
-[system]
-
 [workstation]
 depends = ["linux", "desktop", "multimedia", "qutebrowser"]
 
@@ -79,3 +77,7 @@ terminal = "~"
 [writing.files]
 "writing/README.md" = { target = "~/README.md", type = "symbolic", if = "false" }
 writing = "~"
+
+[system.files]
+"bootstrap/system-packages" = { target = "/", type = "symbolic", owner = "root" }
+

.dotter/incl-systemwide.toml

@@ -1,7 +0,0 @@
-[system]
-
-[system.files]
-"bootstrap/system-packages" = { target = "/", type = "symbolic", owner = "root" }
-
-[system.variables]
-

.dotter/systemwide.toml

@@ -1,4 +1,3 @@
-includes = [".dotter/incl-systemwide.toml"]
 packages = ["system", "workstation"]
 
 [files]

.gitignore

@@ -1,3 +1,6 @@
+# don't move the cache into repo
+/.dotter/cache.toml
+
 # no idea why gopass adds this image to config path
 gopass-logo-small.png
 #

install.sh

@@ -77,13 +77,13 @@ manage_dotfiles() {
 	check_consent y "Link dot files?" "Not linking dotfiles." || return
 	check_consent n "Link system settings files? This will require sudo access but will not overwrite existing files." "Not touching system files." || link_systemfiles=false
 	if [ "$link_systemfiles" == "false" ]; then
-        dotter deploy -l .dotter/dots.toml
+        dotter deploy
 	    echo "Linked dotfiles."
     else
 	    if [ -e "/etc/pacman.conf" ]; then
 		    check_consent n "Found an existing pacman.conf file, installation will error if it exists. Remove file?" && run_elevated rm "/etc/pacman.conf"
 	    fi
-        dotter deploy -l .dotter/dots-with-systemwide.toml
+        dotter deploy -l .dotter/systemwide.toml
 	    echo "Linked dotfiles and system files."
 	fi
 }