removed swayfx and enables sway on gridlock

borg/backup.sh

@@ -47,6 +47,9 @@ borg create --progress --stats --exclude-caches \
 --exclude $HOME/tmp \
 --exclude $HOME/.local/Steam \
 --exclude $HOME/.local/share/Steam \
+--exclude $HOME/Audio \
+--exclude $HOME/nas \
+--exclude $HOME/go \
 $ARCHIVE $SRC && if ! $LOCAL; then date +%s > $HOME/.lastbak; fi
 
 
@@ -54,20 +57,39 @@ $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 \
+  -m 6 \
-  -y 3 \
+  -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
+#  set +e
-  git annex mirror --from=origin
+#  git annex mirror --from=origin
-  set -e
+  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 $SRC
   git annex sync
   cd /
   udisksctl unmount -b "/dev/disk/by-label/$DISK"
   udisksctl lock -b "/dev/disk/by-partlabel/$DISK"
+else
+  echo "Backing up Audo archive..."
+  cd "$HOME/Audio"
+  git annex copy --to origin > /dev/null
+  echo "Backing up Photo archive..."
+  cd "$HOME/Photos"
+  git annex copy --to origin > /dev/null
 fi

gridlock.nix

@@ -1,6 +1,10 @@
 { config, pkgs, lib, ... }:
 
 {
+  imports = [
+#    ./home-i3.nix
+    ./home-wl.nix
+  ];
   home.packages = with pkgs; [
     darktable
   ];
@@ -9,7 +13,7 @@
     "wireless wlp6s0" = {
       position = 2;
       settings = {
-        format_up = "%essid %bitrate";
+        format_up = "%essid";
         format_down = "down";
       };
     };
@@ -22,5 +26,9 @@
   };
   xsession.windowManager.i3.extraConfig = ''
     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-i3.nix

@@ -0,0 +1,141 @@
+{ config, pkgs, lib, ... }:
+
+{
+  home.packages = with pkgs; [
+    arandr
+    feh
+    dmenu
+    i3lock-blur
+    xclip
+  ];
+
+  xsession.windowManager.i3.enable = true;
+
+  xsession.windowManager.i3.config = {
+    fonts = {
+      names = [ "Ubuntu" ];
+      style = "Regular";
+      size = 12.0;
+    };
+    defaultWorkspace = "1";
+    bars = [{
+      position = "top";
+      colors.background = "#ef5ffc";
+      colors.focusedWorkspace = {
+        text = "#333333";
+        border = "#ef5ffc";
+        background = "#a15ffc";
+      };
+      colors.inactiveWorkspace = {
+        text = "#333333";
+        border = "#ef5ffc";
+        background = "#ef5ffc";
+      };
+      colors.statusline = "#333333";
+      fonts = {
+        names = [ "Ubuntu" ];
+        style = "Regular";
+        size = 13.0;
+      };
+      statusCommand = "~/.borg/i3status-bakage.sh";
+      extraConfig = ''
+        height 24
+      '';
+    }];
+    colors.focused = {
+      border = "#ef5ffc";
+      background = "#ef5ffc";
+      text = "#333333";
+      indicator = "#2e9ef4";
+      childBorder = "#ef5ffc";
+    };
+    floating = {
+      criteria = [
+        {
+          instance = "keepassxc";
+          class = "KeePassXC";
+        }
+      ];
+    };
+    gaps = {
+      inner = 8;
+      smartBorders = "on";
+      smartGaps = true;
+    };
+    keybindings = 
+      let
+        modifier = config.xsession.windowManager.i3.config.modifier;
+        menu = config.xsession.windowManager.i3.config.menu;
+      in lib.mkOptionDefault {
+        "${modifier}+space" = "exec ${menu}";
+        "${modifier}+Control+Space" = "focus mode_toggle";
+        "XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
+        "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
+        "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
+        "XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
+       # "XF86Launch1" = "exec ~/scripts/sunset.sh";
+        "${modifier}+Control+p" = "exec i3lock -n -c ef5ffc";
+        "${modifier}+Control+x" = "exec ~/scripts/scale.sh";
+    };
+    menu = "rofi -show drun";
+    modifier = "Mod4";
+    window.titlebar = false;
+    terminal = "alacritty";
+    window.border = 2;
+    startup = [
+      { command = "feh --bg-scale ~/.config/home-manager/xenia.png"; }
+      { command = "keepassxc"; }
+      { command = "i3-msg workspace 1"; }
+    ];
+  };
+  services.redshift = {
+    enable = true;
+    latitude = 49.0;
+    longitude = 9.0;
+    tray = true;
+  };
+  services.caffeine.enable = true;
+  services.screen-locker.enable = true;
+  services.screen-locker.lockCmd = "/home/vi/.nix-profile/bin/i3lock -n -c ef5ffc";
+  programs.i3status = {
+    enable = true;
+    enableDefault = false;
+    general = {
+      colors = true;
+      interval = 5;
+      color_good = "#333333";
+      color_degraded = "#333333";
+      color_bad = "#333333";
+      color_separator = "#a15ffc";
+      separator = " ★ ";
+    };
+    modules = {
+      "volume master".position = 1;
+      "wireless wlp2s0" = {
+        position = 2;
+        settings = {
+          format_up = "%essid %bitrate";
+          format_down = "down";
+        };
+      };
+      "battery 0" = {
+        position = 3;
+        settings = {
+          color_good = "#333333";
+          color_degraded = "#d6cf19";
+          color_bad = "#d6191f";
+          format = "%status %percentage %remaining";
+          status_chr = "C";
+          status_bat = "B";
+          status_full = "F";
+        };
+      };
+      "time" = {
+        position = 4;
+        settings = {
+          format = "%a, %d.%m.%Y - %H:%M ★ ";
+        };
+      };
+    };
+  };
+}

home-wl.nix

@@ -0,0 +1,116 @@
+{ config, pkgs, lib, ... }:
+
+{
+
+  home.packages = with pkgs; [
+    swayimg
+    wl-clipboard
+    waybar
+    wofi
+  ];
+  home.file = {
+    ".config/waybar" = {
+      source = ./waybar;
+    };
+    ".config/wofi/config".text = ''
+      show=drun
+      drun-print_command=true
+    '';
+  };
+  wayland.windowManager.sway.enable = true;
+#  wayland.windowManager.sway.package = pkgs.swayfx;
+  wayland.windowManager.sway.config = {
+    bars = [{
+      command = "waybar";
+      position = "top";
+    }];
+    colors.focused = {
+      border = "#ef5ffc";
+      background = "#ef5ffc";
+      text = "#333333";
+      indicator = "#2e9ef4";
+      childBorder = "#ef5ffc";
+    };
+    defaultWorkspace = "1";
+    floating = {
+      criteria = [
+        {
+          app_id = "org.keepassxc.KeePassXC";
+        }
+      ];
+    };
+    gaps = {
+      inner = 8;
+      smartBorders = "on";
+      smartGaps = true;
+    };
+    input = {
+      "type:keyboard" = {
+        xkb_layout = "us";
+        xkb_variant = "altgr-intl";
+        xkb_options = "caps:escape,compose:102,shift:both_capslock,eurosign:e";
+      };
+    };
+    keybindings = 
+      let
+        modifier = config.wayland.windowManager.sway.config.modifier;
+        menu = config.wayland.windowManager.sway.config.menu;
+      in lib.mkOptionDefault {
+        "${modifier}+space" = "exec ${menu}";
+        "${modifier}+Control+Space" = "focus mode_toggle";
+        "XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
+        "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
+        "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
+        "XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
+        "XF86Launch1" = "exec ~/scripts/sunset.sh";
+        "${modifier}+Control+p" = "exec swaylock -f -c ef5ffc";
+    };
+    menu = "wofi -G | xargs swaymsg exec --";
+    modifier = "Mod4";
+    output = {
+      "*" = {
+        bg = "~/.config/sway/xenia.png fill";
+      };
+    };
+    window.titlebar = false;
+    terminal = "alacritty";
+    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
+
+    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 = false;
+    events = [
+      {
+        event = "before-sleep";
+        command = "/run/current-system/sw/bin/swaylock -f -c ef5ffc";
+      }
+    ];
+    timeouts = [
+      {
+        command = "/run/current-system/sw/bin/swaylock -f -c ef5ffc";
+        timeout = 300;
+      }
+      {
+        command = "swaymsg \"output * dpms off\"";
+        resumeCommand = "swaymsg \"output * dpms on\"";
+        timeout = 600;
+      }
+    ];
+  };
+}

home.nix

@@ -12,7 +12,9 @@
   home.stateVersion = "23.11"; # Please read the comment before changing.
 
   home.packages = with pkgs; [
-    feh
+    gimp
+    yt-dlp
+    openssl
     killall
     sshfs
     hledger
@@ -48,7 +50,6 @@
     neofetch
     telegram-desktop
     git-annex
-    dmenu
     python3
     eza
     bat
@@ -59,7 +60,7 @@
     git
     waybar
     wofi
-    signal-desktop
+#    signal-desktop
     element-desktop
 #    thunderbird
     keepassxc
@@ -72,12 +73,14 @@
     libreoffice
     borgbackup
     gnupg
-    i3lock-blur
-    xclip
     firefox
     thunderbird
     rofi
+    go
+    gopls
   ];
+  services.kdeconnect.enable = true;
+  services.kdeconnect.indicator = true;
   programs.taskwarrior = {
     enable = true;
     config = {
@@ -147,140 +150,12 @@
     EDITOR = "nvim";
     VISUAL = "nvim";
     LEDGER_FILE = "$HOME/hledger/hledger.journal";
+    PATH = "$PATH:$HOME/go/bin";
   };
 
   # Let Home Manager install and manage itself.
-  xsession.windowManager.i3.enable = true;
 #  xsession.windowManager.i3.package = ;
 
-  xsession.windowManager.i3.config = {
-    fonts = {
-      names = [ "Ubuntu" ];
-      style = "Regular";
-      size = 12.0;
-    };
-    defaultWorkspace = "workspace 1";
-    bars = [{
-      position = "top";
-      colors.background = "#ef5ffc";
-      colors.focusedWorkspace = {
-        text = "#333333";
-        border = "#ef5ffc";
-        background = "#a15ffc";
-      };
-      colors.inactiveWorkspace = {
-        text = "#333333";
-        border = "#ef5ffc";
-        background = "#ef5ffc";
-      };
-      colors.statusline = "#333333";
-      fonts = {
-        names = [ "Ubuntu" ];
-        style = "Regular";
-        size = 13.0;
-      };
-      statusCommand = "~/.borg/i3status-bakage.sh";
-      extraConfig = ''
-        height 24
-      '';
-    }];
-    colors.focused = {
-      border = "#ef5ffc";
-      background = "#ef5ffc";
-      text = "#333333";
-      indicator = "#2e9ef4";
-      childBorder = "#ef5ffc";
-    };
-    floating = {
-      criteria = [
-        {
-          instance = "keepassxc";
-          class = "KeePassXC";
-        }
-      ];
-    };
-    gaps = {
-      inner = 8;
-      smartBorders = "on";
-      smartGaps = true;
-    };
-    keybindings = 
-      let
-        modifier = config.xsession.windowManager.i3.config.modifier;
-        menu = config.xsession.windowManager.i3.config.menu;
-      in lib.mkOptionDefault {
-        "${modifier}+space" = "exec ${menu}";
-        "${modifier}+Control+Space" = "focus mode_toggle";
-        "XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
-        "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
-        "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
-        "XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
-       # "XF86Launch1" = "exec ~/scripts/sunset.sh";
-        "${modifier}+Control+p" = "exec i3lock -n -c ef5ffc";
-        "${modifier}+Control+x" = "exec ~/scripts/scale.sh";
-    };
-    menu = "rofi -show drun";
-    modifier = "Mod4";
-    window.titlebar = false;
-    terminal = "alacritty";
-    window.border = 2;
-    startup = [
-      { command = "feh --bg-scale ~/.config/home-manager/xenia.png"; }
-      { command = "keepassxc"; }
-    ];
-  };
-  services.redshift = {
-    enable = true;
-    latitude = 49.0;
-    longitude = 9.0;
-    tray = true;
-  };
-  services.caffeine.enable = true;
-  services.screen-locker.enable = true;
-  services.screen-locker.lockCmd = "i3lock -n -c ef5ffc";
-  programs.i3status = {
-    enable = true;
-    enableDefault = false;
-    general = {
-      colors = true;
-      interval = 5;
-      color_good = "#333333";
-      color_degraded = "#333333";
-      color_bad = "#333333";
-      color_separator = "#a15ffc";
-      separator = " ★ ";
-    };
-    modules = {
-      "volume master".position = 1;
-      "wireless wlp2s0" = {
-        position = 2;
-        settings = {
-          format_up = "%essid %bitrate";
-          format_down = "down";
-        };
-      };
-      "battery 0" = {
-        position = 3;
-        settings = {
-          color_good = "#333333";
-          color_degraded = "#d6cf19";
-          color_bad = "#d6191f";
-          format = "%status %percentage %remaining";
-          status_chr = "C";
-          status_bat = "B";
-          status_full = "F";
-        };
-      };
-      "time" = {
-        position = 4;
-        settings = {
-          format = "%a, %d.%m.%Y - %H:%M ★ ";
-        };
-      };
-    };
-  };
-
-
   programs.home-manager.enable = true;
   programs.fish.enable = true;
   home.shellAliases = {
@@ -293,6 +168,10 @@
     backup = "$HOME/.borg/backup.sh";
     grep = "rg";
     fox = "cat";
+    t = "task";
+    hl = "hledger";
+    mountNas = "systemctl start home-vi-nas.mount";
+    budget = "hledger print income:krankengeld | grep -Po \'^\\d\\d\\d\\d-\\d\\d-\\d\\d\' | tail -1 | xargs -I{} hledger balance budgets date:{}-today";
   };
   programs.neovim = {
     enable = true;

scripts/scale.sh

@@ -6,3 +6,4 @@ then
 else
   xrandr --output DisplayPort-0 --scale 0.75x0.75
 fi
+feh --bg-scale ~/.config/home-manager/xenia.png

x230-wl.nix

@@ -0,0 +1,15 @@
+{ config, pkgs, lib, ... }:
+
+{
+  
+  programs.alacritty.settings.font.size = lib.mkForce 11;
+
+  home.packages = with pkgs; [
+    wlsunset
+  ];
+  wayland.windowManager.sway.config = {
+    startup = [
+      { command = "bash ~/scripts/sunset.sh"; }
+    ];
+  };
+}

x230.nix

@@ -1,12 +1,11 @@
 { config, pkgs, lib, ... }:
 
+
 {
-  home.packages = with pkgs; [
+  imports = [ 
-    wlsunset
+    ./home-wl.nix
+    ./x230-wl.nix
   ];
-  wayland.windowManager.sway.config = {
+  services.batsignal.enable = true;
-    startup = [
+  services.batsignal.extraArgs = [ "-D poweroff" ];
-      { command = "bash ~/scripts/sunset.sh"; }
-    ];
-  };
 }