chore: remove old setting that no longer has any effect

flake.lock

@@ -41,11 +41,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752743471,
+        "lastModified": 1753216019,
-        "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=",
+        "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506",
+        "rev": "be166e11d86ba4186db93e10c54a141058bdce49",
         "type": "github"
       },
       "original": {
@@ -235,11 +235,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753470191,
+        "lastModified": 1754263839,
-        "narHash": "sha256-hOUWU5L62G9sm8NxdiLWlLIJZz9H52VuFiDllHdwmVA=",
+        "narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a1817d1c0e5eabe7dfdfe4caa46c94d9d8f3fdb6",
+        "rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773",
         "type": "github"
       },
       "original": {
@@ -282,11 +282,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749155331,
+        "lastModified": 1753964049,
-        "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
         "type": "github"
       },
       "original": {
@@ -342,11 +342,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1753523167,
+        "lastModified": 1754254502,
-        "narHash": "sha256-DLVvtdF8zPmL+7dYubnMfK9IIITriecCg7ijLErUTg0=",
+        "narHash": "sha256-uxfjGhR1BeD1lgPgPjIkcGxdWHOKA0+KoCTWfIsegLM=",
         "ref": "refs/heads/main",
-        "rev": "e1fff05d0db9c266679ec7ea1b5734c73d6b0a57",
+        "rev": "1b86d35f7ebc2c613f5ef6cba89dcd8d1ceedaa4",
-        "revCount": 6314,
+        "revCount": 6344,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -462,11 +462,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371812,
+        "lastModified": 1753819801,
-        "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
+        "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
         "owner": "hyprwm",
         "repo": "hyprland-qtutils",
-        "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
+        "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
         "type": "github"
       },
       "original": {
@@ -491,11 +491,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371198,
+        "lastModified": 1753622892,
-        "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
+        "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
+        "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809",
         "type": "github"
       },
       "original": {
@@ -564,11 +564,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1753378338,
+        "lastModified": 1753819183,
-        "narHash": "sha256-Ctk7zophp8obM/u9S2c8a6nOWV+VeIzq6ma+dI5BE3s=",
+        "narHash": "sha256-KjuaXO9pdSHwpnsdj+TXqLDVZ8EhqfV5duSzIssBlzY=",
         "owner": "hyprwm",
         "repo": "hyprsunset",
-        "rev": "962f519df793ea804810b1ddebfc8a88b80a845c",
+        "rev": "233aaccdbdd20af848be3f30ab318342e28cd7e3",
         "type": "github"
       },
       "original": {
@@ -589,11 +589,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752252310,
+        "lastModified": 1753800567,
-        "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=",
+        "narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82",
+        "rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7",
         "type": "github"
       },
       "original": {
@@ -759,11 +759,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1753122741,
+        "lastModified": 1754316476,
-        "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
+        "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
+        "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28",
         "type": "github"
       },
       "original": {
@@ -805,11 +805,11 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1753432016,
+        "lastModified": 1744868846,
-        "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
         "type": "github"
       },
       "original": {
@@ -885,11 +885,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1753429684,
+        "lastModified": 1754214453,
-        "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
+        "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
+        "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
         "type": "github"
       },
       "original": {
@@ -933,11 +933,11 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1753429684,
+        "lastModified": 1754214453,
-        "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
+        "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
+        "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
         "type": "github"
       },
       "original": {
@@ -993,11 +993,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1753530457,
+        "lastModified": 1754319480,
-        "narHash": "sha256-ElI7ya0YQ07RMDEaF94bQe7Rmz4tr2pKYa+KdRchrEY=",
+        "narHash": "sha256-Q2sQCiGrQ80bPdD2b8xrjKXEr+frwDP7Oa5LtgRqiy8=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "8c37eaf318485018b37efa1006af881c5c7f5616",
+        "rev": "4de6ec34385c2fdd449989fc3751586caaf1dc12",
         "type": "github"
       },
       "original": {
@@ -1066,7 +1066,8 @@
         "nixpkgs": "nixpkgs_6",
         "nixvim": "nixvim",
         "nur": "nur",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "stablepkgs": "stablepkgs"
       }
     },
     "rust-analyzer-src": {
@@ -1104,6 +1105,22 @@
         "type": "github"
       }
     },
+    "stablepkgs": {
+      "locked": {
+        "lastModified": 1754292888,
+        "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1689347949,
@@ -1192,11 +1209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751300244,
+        "lastModified": 1753633878,
-        "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=",
+        "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a",
+        "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a",
         "type": "github"
       },
       "original": {

hosts/dandelion/default.nix

@@ -16,8 +16,6 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOLdcB5JFWx6OK2BAr8J0wPHNhr2VP2/Ci6fv3a+DPfo liv@violet" # allow violet to log in over ssh to do back ups
   ];
 
-  networking.hostName = "dandelion";
-
   liv.server.enable = true;
 
   nixpkgs.config.permittedInsecurePackages = [
@@ -27,8 +25,34 @@
 
   time.timeZone = "Europe/Amsterdam";
 
+  networking = {
+    hostName = "dandelion";
+    firewall = {
+      allowedTCPPorts = [
+        5201
+      ];
+      allowedUDPPorts = [
+        5201
+      ];
+      interfaces."ens4s1".allowedTCPPorts = [
+        # allow everything for local link
+        {
+          from = 1;
+          to = 65354;
+        }
+      ];
+      interfaces."ens4s1".allowedUDPPorts = [
+        # allow everything for local link
+        {
+          from = 1;
+          to = 65354;
+        }
+      ];
+    };
+  };
+
   systemd.network.networks."99-local" = {
-    matchConfig.name = "ens3s1";
+    matchConfig.name = "ens4s1";
     address = [
       "192.168.1.100/24"
     ];
@@ -60,16 +84,22 @@
     trim.enable = true;
   };
 
-  boot.zfs.extraPools = [ "spinners" ];
+  boot.zfs.extraPools = [
+    "spinners"
+  ];
 
-  fileSystems = {
+  # fileSystems = {
-    "/spinners/rootvol" = {
+  #   "/spinners/rootvol" = {
-      device = "terrabite/rootvol";
+  #     device = "spinners/rootvol";
-      fsType = "zfs";
+  #     fsType = "zfs";
-    };
+  #   };
-    "/spinners/ahwx" = {
+  #   "/spinners/ahwx" = {
-      device = "terrabite/ahwx";
+  #     device = "spinners/ahwx";
-      fsType = "zfs";
+  #     fsType = "zfs";
-    };
+  #   };
-  };
+  #   "/spinners/violet" = {
+  #     device = "spinners/violet";
+  #     fsType = "zfs";
+  #   };
+  # };
 }

hosts/yoshino/default.nix

@@ -12,6 +12,7 @@
     # ./../../modules/home/nfs.nix
     ./../../modules/core/virtualization.nix
     ./../../modules/services/tailscale.nix
+    ./../../modules/services/mpd.nix
   ];
 
   powerManagement = {
@@ -20,6 +21,24 @@
     cpuFreqGovernor = lib.mkDefault "performance";
   };
 
+  networking = {
+    hostName = "yoshino";
+    networkmanager.enable = true;
+  };
+
+  systemd.network.networks."99-local" = {
+    matchConfig.name = "enp68s0";
+    address = [
+      "192.168.1.100/24"
+    ];
+    routes = [
+      {
+        Gateway = "172.16.10.1";
+        GatewayOnLink = false;
+      }
+    ];
+  };
+
   liv = {
     desktop.enable = true;
     creative.enable = true;
@@ -28,11 +47,6 @@
     gui.enable = true;
   };
 
-  networking = {
-    hostName = "yoshino";
-    networkmanager.enable = true;
-  };
-
   boot = {
     kernelParams = [ ];
     kernelModules = [ "acpi_call" ];

modules/core/services.nix

@@ -9,5 +9,5 @@
   '';
 
   # To prevent getting stuck at shutdown.
-  systemd.extraConfig = "DefaultTimeoutStopSec=10s";
+  # systemd.extraConfig = "DefaultTimeoutStopSec=10s"; # Deprecated now
 }

modules/core/sops.nix

@@ -25,10 +25,14 @@
       else if (host == "sakura") then
         {
           "systemMailerPassword" = { };
+          "dandelionSyncthingId" = { };
+          "sakuraSyncthingId" = { };
         }
       else if (host == "dandelion") then
         {
           "systemMailerPassword" = { };
+          "dandelionSyncthingId" = { };
+          "sakuraSyncthingId" = { };
         }
       else
         { };

modules/services/dandelion.nix

@@ -7,6 +7,7 @@
     ++ [ (import ./home-assistant.nix) ]
     ++ [ (import ./monitoring.nix) ]
     ++ [ (import ./smart-monitoring.nix) ]
+    ++ [ (import ./syncthing.nix) ]
     ++ [ (import ./tailscale.nix) ]
     ++ [ (import ./nfs.nix) ]
     ++ [ (import ./hd-idle.nix) ];

modules/services/nfs.nix

@@ -8,7 +8,7 @@
   services = {
     # Network shares
     samba = {
-      package = pkgs.samba4Full;
+      package = pkgs.samba;
       # ^^ `samba4Full` is compiled with avahi, ldap, AD etc support (compared to the default package, `samba`
       # Required for samba to register mDNS records for auto discovery
       # See https://github.com/NixOS/nixpkgs/blob/592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3/pkgs/top-level/all-packages.nix#L27268