summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/sway/config2
-rw-r--r--.gitconfig10
2 files changed, 11 insertions, 1 deletions
diff --git a/.config/sway/config b/.config/sway/config
index a2f4b96..ccb6f0b 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -185,4 +185,4 @@ for_window [class="pwcview"] floating enable ; sticky enable
for_window [title="wpgtk*"] floating enable
## STARTUP
-exec_always sh /usr/home/atc/.config/wpg/wp-init.sh
+exec_always sh /home/atc/.config/wpg/wp-init.sh
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..1edbc46
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,10 @@
+# This is Git's per-user configuration file.
+[user]
+ name = Adam T. Carpenter
+ email = atc@53hor.net
+ signingkey = atc@53hor.net
+[init]
+ defaultBranch = master
+[pull]
+ rebase = true
+ #rebase = true