removed swayfx and enables sway on gridlock

borg/backup.sh

@@ -57,25 +57,30 @@ $ARCHIVE $SRC && if ! $LOCAL; then date +%s > $HOME/.lastbak; fi
 borg prune --stats --list --keep-within 1d --glob-archives "$HOSTNAME*" \
   -d 7 \
   -w 4 \
-  -m 12 \
-  -y 3 \
+  -m 6 \
+  -y 1 \
   $REPO
 
-if $LOCAL && nmcli connection show --active | grep '^vt-net' > /dev/null
+if $LOCAL
 then
+  SRC=""
+  if ! nmcli connection show --active | grep '^vt-net' > /dev/null
+  then
+    SRC="--from local"
+  fi
   echo "backing up Photo archive..."
   cd "/run/media/$USER/$DISK/photos"
   git annex sync
 #  set +e
 #  git annex mirror --from=origin
-  git annex get
+  git annex get $SRC
 #  set -e
   git annex sync
   echo "backing up Audio archive..."
   cd "/run/media/$USER/$DISK/audio"
   git annex sync
 ###  git annex mirror --from=origin
-  git annex get
+  git annex get $SRC
   git annex sync
   cd /
   udisksctl unmount -b "/dev/disk/by-label/$DISK"

gridlock.nix

@@ -1,6 +1,10 @@
 { config, pkgs, lib, ... }:
 
 {
+  imports = [
+#    ./home-i3.nix
+    ./home-wl.nix
+  ];
   home.packages = with pkgs; [
     darktable
   ];
@@ -24,4 +28,7 @@
     exec xrandr --output DisplayPort-0 --scale 0.75x0.75
     exec feh --bg-scale ~/.config/home-manager/xenia.png
   '';
+  wayland.windowManager.sway.extraConfig = ''
+    exec swaymsg "output * scale 1.5"
+  '';
 }

home-wl.nix

@@ -18,7 +18,7 @@
     '';
   };
   wayland.windowManager.sway.enable = true;
-  wayland.windowManager.sway.package = pkgs.swayfx;
+#  wayland.windowManager.sway.package = pkgs.swayfx;
   wayland.windowManager.sway.config = {
     bars = [{
       command = "waybar";
@@ -77,17 +77,24 @@
     window.border = 2;
   };
   wayland.windowManager.sway.extraConfig = ''
-    blur enable
-    blur_xray disable
-    corner_radius 4
-    shadows enable
-    default_dim_inactive 0.1
-    dim_inactive_colors.unfocused #fc28c3
+#    blur enable
+#    blur_xray disable
+#    corner_radius 4
+#    shadows enable
+#    default_dim_inactive 0.1
+#    dim_inactive_colors.unfocused #fc28c3
+
+    exec swayidle -w \
+      timeout 300 'swaylock -f -c ef5ffc' \
+      timeout 600 'swaymsg output * dpms off' \
+        resume 'swaymsg putput * dpms on' \
+      before-sleep 'swaylock -f -c ef5ffc'
+    
     include ~/.config/sway/device-conf
   '';
   # Let Home Manager install and manage itself.
   services.swayidle = {
-    enable = true;
+    enable = false;
     events = [
       {
         event = "before-sleep";