Forgotten comma.

This removes the need for the syncthing and rysnc plumbing.

common/compute-node.nix

@@ -1,11 +1,10 @@
 { pkgs, ... }:
 {
-  # Compute node: Cluster node with Nomad, GlusterFS server, and Syncthing
+  # Compute node: Cluster node with Nomad and GlusterFS server
   # Used by: c1, c2, c3
   imports = [
     ./cluster-node.nix
     ./glusterfs.nix
     ./nomad.nix
-    ./syncthing-data.nix
   ];
 }

common/syncthing-data.nix

@@ -1,53 +0,0 @@
-{
-  # TODO: when deploying this to a new machine for the first time, first
-  # comment this out to get /data/sync created with the right owner and
-  # permissions. then, do it again with persistence enabled.
-  # This could list the owner user but I'm not sure if it's already created at
-  # the time impermanence setup runs.
-  # Note: chown syncthing:syncthing /data/sync && chmod 700 /data/sync also seems to work
-  environment.persistence."/persist".directories = [ "/data/sync" ];
-
-  services.syncthing = {
-    enable = true;
-    dataDir = "/data/sync";
-    openDefaultPorts = true;
-    #guiAddress = "0.0.0.0:8384";
-    overrideDevices = true;
-    overrideFolders = true;
-    settings = {
-      devices = {
-        "c1" = {
-          id = "XJECP3R-AZHCAYX-UIQKHIT-AHBK5UM-KM7T4OV-B7SEUCW-ZE2UFPG-7BNAIQZ";
-        };
-        "c2" = {
-          id = "II4XUXQ-7WCH3SB-FU655O7-NI6DYYW-GQCJS6J-K7USRC2-XLM5J5W-6ZCWPQU";
-        };
-        "c3" = {
-          id = "D3C3YII-A3QGUNF-LHOGZNX-GJ4ZF3X-VVLMNY5-BBKF3BO-KNHKJMD-EA5QYQJ";
-        };
-        "zippy" = {
-          id = "WXDYZWN-JG2OBQH-CC42RMM-LPJGTS6-Y2BV37J-TYSLHL4-VHGYL5M-URI42QJ";
-        };
-      };
-      folders = {
-        "wordpress" = {
-          path = "/data/sync/wordpress";
-          devices = [
-            "c1"
-            "c2"
-            "c3"
-            "zippy"
-          ];
-          ignorePerms = false;
-          versioning = {
-            type = "staggered";
-            params = {
-              cleanInterval = "3600";
-              maxAge = "15768000";
-            };
-          };
-        };
-      };
-    };
-  };
-}

flake.lock

@@ -1,5 +1,27 @@
 {
   "nodes": {
+    "browser-previews": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1761074928,
+        "narHash": "sha256-hjy44ZxzQURjtPZ6WKpTDkD3aae9IaBv9pVL/n5KcD8=",
+        "owner": "nix-community",
+        "repo": "browser-previews",
+        "rev": "5e9b89761aeffb1a41b8a0446ead327654f446a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "browser-previews",
+        "type": "github"
+      }
+    },
     "deploy-rs": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -68,13 +90,13 @@
         "devshell": "devshell",
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "foundry-nix": "foundry-nix",
         "nixpkgs": [
           "nixpkgs-unstable"
         ],
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -164,7 +186,7 @@
     "flake-utils": {
       "inputs": {
         "systems": [
-          "ethereum-nix",
+          "browser-previews",
           "systems"
         ]
       },
@@ -184,7 +206,28 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": [
+          "ethereum-nix",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -380,7 +423,7 @@
           "nixpkgs-unstable"
         ],
         "nuschtosSearch": "nuschtosSearch",
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1759878636,
@@ -398,7 +441,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -421,6 +464,7 @@
     },
     "root": {
       "inputs": {
+        "browser-previews": "browser-previews",
         "deploy-rs": "deploy-rs",
         "disko": "disko",
         "ethereum-nix": "ethereum-nix",
@@ -455,16 +499,16 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1680978846,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "x86_64-linux",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "x86_64-linux",
         "type": "github"
       }
     },
@@ -513,6 +557,21 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -536,7 +595,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,

flake.nix

@@ -29,6 +29,10 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    browser-previews = {
+      url = "github:nix-community/browser-previews";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
   };
 
   outputs =
@@ -42,6 +46,7 @@
       home-manager,
       impermanence,
       sops-nix,
+      browser-previews,
       ...
     }@inputs:
     let
@@ -54,6 +59,10 @@
         };
       };
 
+      overlay-browser-previews = final: prev: {
+        browser-previews = browser-previews.packages.${prev.system};
+      };
+
       mkHost =
         system: profile: modules:
         let
@@ -70,7 +79,7 @@
             (
               { config, pkgs, ... }:
               {
-                nixpkgs.overlays = [ overlay-unstable ];
+                nixpkgs.overlays = [ overlay-unstable overlay-browser-previews ];
                 nixpkgs.config.allowUnfree = true;
               }
             )

home/default.nix

@@ -20,6 +20,7 @@
       GEMINI_API_KEY = "AIzaSyBZkifYOFNKCjROLa_GZyzQbB2EbEYIby4";
       LLM_GEMINI_KEY = "AIzaSyBZkifYOFNKCjROLa_GZyzQbB2EbEYIby4";
       PLAYWRIGHT_BROWSERS_PATH = "${pkgs.unstable.playwright-driver.browsers}";
+      NIXOS_OZONE_WL = "1";
     };
 
     shellAliases = {

home/profiles/desktop.nix

@@ -3,11 +3,15 @@ let
   workstationProfile = import ./workstation.nix { inherit pkgs; };
 
   desktopPkgs = with pkgs; [
-    unstable.chromium
+    browser-previews.google-chrome
     foot # Wayland-native terminal emulator
     wofi # Application launcher for Wayland
   ];
 in
 {
   packages = workstationProfile.packages ++ desktopPkgs;
+  environment.persistence."/persist/home/ppetru".directories = [
+    ".cache"
+    ".config/google-chrome"
+  ];
 }

home/programs/desktop.nix

@@ -6,70 +6,21 @@
   wayland.windowManager.hyprland = {
     enable = true;
     settings = {
+      monitor = "DP-1,preferred,auto,auto";
+
       # Remap CapsLock to Super (Mod4)
       "$mod" = "SUPER";
 
       input = {
         kb_options = "caps:super";
         follow_mouse = 1;
-        touchpad = {
-          natural_scroll = false;
-        };
         sensitivity = 0;
       };
 
-      general = {
-        gaps_in = 5;
-        gaps_out = 10;
-        border_size = 2;
-        "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
-        "col.inactive_border" = "rgba(595959aa)";
-        layout = "dwindle";
-      };
-
-      decoration = {
-        rounding = 5;
-        blur = {
-          enabled = true;
-          size = 3;
-          passes = 1;
-        };
-        drop_shadow = true;
-        shadow_range = 4;
-        shadow_render_power = 3;
-        "col.shadow" = "rgba(1a1a1aee)";
-      };
-
-      animations = {
-        enabled = true;
-        bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
-        animation = [
-          "windows, 1, 7, myBezier"
-          "windowsOut, 1, 7, default, popin 80%"
-          "border, 1, 10, default"
-          "borderangle, 1, 8, default"
-          "fade, 1, 7, default"
-          "workspaces, 1, 6, default"
-        ];
-      };
-
-      dwindle = {
-        pseudotile = true;
-        preserve_split = true;
-      };
-
       master = {
         new_status = "master";
       };
 
-      gestures = {
-        workspace_swipe = false;
-      };
-
-      misc = {
-        force_default_wallpaper = 0;
-      };
-
       # Key bindings
       bind = [
         # Application launchers

services/wordpress-backup.hcl

@@ -1,30 +0,0 @@
-job "wordpress-backup" {
-  datacenters = ["alo"]
-  type = "batch"
-
-  periodic {
-    crons = ["*/5 * * * * *"]
-    prohibit_overlap = true
-  }
-
-  group "cron" {
-    task "rsync" {
-      driver = "raw_exec"
-
-      config {
-        command = "/bin/sh"
-        args = [ "local/script.sh" ]
-      }
-
-      template {
-        destination = "local/script.sh"
-        data = <<EOH
-          set -e
-          /run/current-system/sw/bin/rsync -a /data/sync/wordpress/ /data/compute/appdata/wordpress/ && \
-          echo "last_success $(date +%s)" | \
-          /run/current-system/sw/bin/curl --data-binary @- http://pushgateway.service.consul:9091/metrics/job/wordpress_backup
-        EOH
-      }
-    }
-  }
-}

services/wordpress.hcl

@@ -20,7 +20,7 @@ job "wordpress" {
         image = "gitea.v.paler.net/ppetru/wordpress"
         ports = ["http"]
         volumes = [
-          "/data/sync/wordpress:/var/www/html",
+          "/data/services/wordpress:/var/www/html",
           "local/php-custom.ini:/usr/local/etc/php/conf.d/php-custom.ini",
         ]
       }

stateful-commands.txt

@@ -28,9 +28,6 @@ replacing failed / reinstalled gluster volume (c1 in this case). all commands on
   * gluster peer probe 192.168.1.71 (not c1 because switching to IPs to avoid DNS/tailscale issues)
   * gluster volume add-brick compute replica 3 192.168.1.71:/persist/glusterfs/compute/brick1
 
-replacing failed / reinstalled host - other things:
-  * syncthing ID needs updating in common/syncthing-data.nix
-
 kopia repository server setup (on a non-NixOS host at the time):
   * kopia repository create filesystem --path /backup/persist
   * kopia repository connect filesystem --path=/backup/persist