Buncha changes

diff --git a/states/git/init.sls b/states/git/init.sls
index 2bfd1ca05979d1745fdf8f5dd2bde91ced6ddfe5..6090612013bc9d6bba195c00f22b4942ead16fb5 100644 (file)
--- 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 1ea6ef0e7eb200f7a799f3abbb2cd0904065e90f..4e4750af167a458fd796409c3c3fe86af489b022 100644 (file)
--- 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 abf1385af13a5fc130b164d9b042b3080df53c7f..80e109599a8da8a15a7428a4aefc4bf38e8870a0 100644 (file)
--- 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 8e1518c3283bc54d7c9e5f23e91731184b41fba4..ab80266ddf37230d515272815fffc45ae8ec05e1 100644 (file)
--- 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)