From 95263bf9bc976ede0db6c8fd1b3d3ce4c79bcebd Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 12 Oct 2022 16:23:06 +0100
Subject: [PATCH] Buncha changes

---
 states/git/init.sls        | 3 ++-
 states/tmux/files/wm_copy  | 2 +-
 states/tmux/files/wm_paste | 2 +-
 states/zsh/files/zshenv    | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/states/git/init.sls b/states/git/init.sls
index 2bfd1ca..6090612 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -15,7 +15,8 @@ include:
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
   'merge.ff': 'false',
-  'pull.rebase': 'false',
+  'pull.rebase': 'true',
+  'pull.ff': 'true',
   'push.default': 'simple',
   'alias.lg': 'log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
   'alias.hist': 'log --graph --full-history --all --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
diff --git a/states/tmux/files/wm_copy b/states/tmux/files/wm_copy
index 1ea6ef0..4e4750a 100644
--- a/states/tmux/files/wm_copy
+++ b/states/tmux/files/wm_copy
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [[ $XDG_SESSION_TYPE == "wayland" ]]; then
+if [ $XDG_SESSION_TYPE == "wayland" ]; then
     wl-copy < /dev/stdin > /dev/null
 else
     xclip -selection clipboard -i < /dev/stdin > /dev/null
diff --git a/states/tmux/files/wm_paste b/states/tmux/files/wm_paste
index abf1385..80e1095 100644
--- a/states/tmux/files/wm_paste
+++ b/states/tmux/files/wm_paste
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [[ XDG_SESSION_TYPE == "wayland" ]]; then
+if [ $XDG_SESSION_TYPE == "wayland" ]; then
     wl-paste
 else
     xclip -selection clipboard -o
diff --git a/states/zsh/files/zshenv b/states/zsh/files/zshenv
index 8e1518c..ab80266 100644
--- a/states/zsh/files/zshenv
+++ b/states/zsh/files/zshenv
@@ -3,6 +3,7 @@ path=(~/.local/bin ~/.cargo/bin $path[@])
 
 if [[ $XDG_SESSION_TYPE == "wayland" ]]; then
     export QT_QPA_PLATFORM=wayland-egl
+    export MOZ_ENABLE_WAYLAND=1
 fi
 
 # make less more friendly for non-text input files, see lesspipe(1)
-- 
2.46.2