obsidian

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790734419,
+        "lastModified": 1792507013,
-        "narHash": "sha256-n7wew722m1OTBT9DOIMxNX/NF4zfsSUABAO5eW3wikE=",
+        "narHash": "sha256-8tKjSQajD3mUND1GaAuaWTcuyUpgcGsh5V+l4ibzC7U=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "3daa710894355fa2fad8243380af373a2b4046ef",
+        "rev": "5e5b88a0c8e56f291a108c2fe9934054d9745b2e",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792231076,
+        "lastModified": 1792666613,
-        "narHash": "sha256-B0jTpyaR+YEAg1dcmeYjoUwOQBRAgLNvzTg66S/cxKo=",
+        "narHash": "sha256-n/yNeh9J0JrtM9QhQqo3IaKHGT7aKzgmEsDuUKXF40U=",
         "owner": "elwrcl",
         "repo": "heliux",
-        "rev": "0b28ec7dde52d74f70bafeae5e68c457ce61c0ed",
+        "rev": "55e2ec3dff4213bb77b9002dddc6feb37c8469da",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792098797,
+        "lastModified": 1793124281,
-        "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=",
+        "narHash": "sha256-KdGTOgYXgMDA/ymTV10yLMt9tOjz9EmTgnTvaD+bhe4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "640725978b99076e18e069f6e7d2959124584f8f",
+        "rev": "1e3ebeb683d055d1675d3f64e6d2b186cb2ee504",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790996401,
+        "lastModified": 1792818383,
-        "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
+        "narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
+        "rev": "24f2190587513b9c2f73db112a17844ae912d965",
         "type": "github"
       },
       "original": {
@@ -293,11 +293,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783744694,
+        "lastModified": 1792800221,
-        "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=",
+        "narHash": "sha256-53jIZEWNh96irEXhsMZFoNhLJgGSU3nYl1i4wFQHAsU=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74",
+        "rev": "d31953cf55f9027a56e9be938daf5db8c5655663",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1792277718,
+        "lastModified": 1793160151,
-        "narHash": "sha256-Nv32eZ+x7qr/yKofkemv1O2ImnXkUpFQgq71u6c6Wi8=",
+        "narHash": "sha256-Roh0gTP2V1nUiVbi1vzE2Tt0OGPizn4InZxAOihVYHo=",
         "owner": "FlameFlag",
         "repo": "nixcord",
-        "rev": "f4f803048d4bb6bc296fc4bdbd8620ff63fe100f",
+        "rev": "b7dc284e7198863f2df20f5e730cc9c74290b004",
         "type": "github"
       },
       "original": {
@@ -355,11 +355,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1792094642,
+        "lastModified": 1793110635,
-        "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=",
+        "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df",
+        "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010",
         "type": "github"
       },
       "original": {
@@ -371,11 +371,11 @@
     },
     "nixpkgs-ci": {
       "locked": {
-        "lastModified": 1791130267,
+        "lastModified": 1792812153,
-        "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=",
+        "narHash": "sha256-GNxqGToDYDZH2M4YeIj5nLPEyljtn3hEdIFY1/JNm0M=",
-        "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2",
+        "rev": "674a2028661e550a97400c1cc992b9cca9a668a1",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1100667.674a2028661e/nixexprs.tar.zst"
       },
       "original": {
         "type": "tarball",
@@ -399,11 +399,11 @@
     },
     "nixpkgs-packages": {
       "locked": {
-        "lastModified": 1791130267,
+        "lastModified": 1792812153,
-        "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=",
+        "narHash": "sha256-GNxqGToDYDZH2M4YeIj5nLPEyljtn3hEdIFY1/JNm0M=",
-        "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2",
+        "rev": "674a2028661e550a97400c1cc992b9cca9a668a1",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1100667.674a2028661e/nixexprs.tar.zst"
       },
       "original": {
         "type": "tarball",
@@ -428,11 +428,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1791594108,
+        "lastModified": 1792773339,
-        "narHash": "sha256-V0WmebqwEeAVZMqxfv7Dq7hpKkPPM19W50xQf3D1Kf4=",
+        "narHash": "sha256-17eNBI5Khe4JZaRkL5hRGPWf8MZ6qv+bWAr4V8YeKBw=",
-        "rev": "6510408d147d8c5e6d76043e899e9251756f6a75",
+        "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1089111.6510408d147d/nixexprs.tar.zst"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1100280.3ec636362e18/nixexprs.tar.zst"
       },
       "original": {
         "type": "tarball",
@@ -444,11 +444,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1792243036,
+        "lastModified": 1793158243,
-        "narHash": "sha256-DUNMQn8Wc1U4SMs+I+WymAdccBu89qoeUeU5M+2JtNE=",
+        "narHash": "sha256-krvMCWdwTEw0eMHm+YJajLSvlha4tDdieEZBumxBoZ8=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "3982122906f2409aeaff17399552153c4c323f20",
+        "rev": "490d327d7ecc2dc350649b78dca2143e93209f3d",
         "type": "github"
       },
       "original": {
@@ -524,11 +524,11 @@
     "sidechery": {
       "flake": false,
       "locked": {
-        "lastModified": 1789219073,
+        "lastModified": 1793011532,
-        "narHash": "sha256-cSLIxv+oJNQNIP754ZELih7UN62dIFbXfI68bhX6lWQ=",
+        "narHash": "sha256-BBw+gBGFarZHdMRPU08R0zMyF2sT4kSQqHfryCnEuUo=",
         "owner": "teidesu",
         "repo": "sidechery",
-        "rev": "e015b37b16eaef6a6655dd34a46512c8b376b4dc",
+        "rev": "03dc2f0e694ab9a54241e779a67d2075bb48d5ca",
         "type": "github"
       },
       "original": {
@@ -595,11 +595,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1791198660,
+        "lastModified": 1791885023,
-        "narHash": "sha256-f8Pye933T60vreB9u9pqfAXDyBqO13U7H0LvPsOxCIA=",
+        "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "8b367b728be38d1bb7206f037c9df9989df3353a",
+        "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c",
         "type": "github"
       },
       "original": {
@@ -672,11 +672,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792271801,
+        "lastModified": 1793144002,
-        "narHash": "sha256-LYN8miMEew9CxgRrF/RCnAyOe6476dQM/JzELnFQef0=",
+        "narHash": "sha256-YDtNVswt0oYB7LNEzZWmFmo57MME8EVS9VxAdqWm/Co=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "e1b9b3578ebb388b56012cd9ddd80e19681d2d39",
+        "rev": "4434539379bc839480edb8b919de9b67f70cb520",
         "type": "github"
       },
       "original": {

hosts/copland.ulu.nix

@@ -100,6 +100,7 @@ in
               config.flake.homeModules.home-discord-plugins
               config.flake.homeModules.home-thunderbird
               config.flake.homeModules.home-obsidian
+              config.flake.homeModules.home-obsidian-icloud-sync
               config.flake.homeModules.home-mpv
               config.flake.homeModules.home-mpv-intel-hard
               config.flake.homeModules.home-mpv-svp
@@ -168,6 +169,7 @@ in
       config.flake.nixosModules.common-git
       config.flake.nixosModules.common-agenix
       config.flake.nixosModules.common-packages
+      config.flake.nixosModules.common-spotifast
       # import
       inputs.helium.nixosModules.helium
       ./copland-hardware.nix

modules/home/home-browser-helium-sidechery.ulu.nix

@@ -19,7 +19,7 @@
           inherit (finalAttrs) pname version src;
           pnpm = pkgs.pnpm_10;
           fetcherVersion = 4;
-          hash = "sha256-c05e5Wchb3mq45cHcjjiUCAzi9RrhtKWunYJ7QK30wM=";
+          hash = "sha256-s/dTRvlIkv5AMSxBX4yiJz7qDyYU2gLDDFhZcKstLFY=";
         };
 
         nativeBuildInputs = [

modules/home/home-obsidian-icloud-sync.ulu.nix

@@ -0,0 +1,59 @@
+{ ... }:
+{
+  flake.homeModules.home-obsidian-icloud-sync =
+    { config, pkgs, ... }:
+    let
+      vault = "${config.home.homeDirectory}/${config.programs.obsidian.vaults.notes.target}";
+      remote = "icloud:Obsidian/elars";
+      filters = pkgs.writeText "obsidian-icloud-filters.txt" ''
+        - .obsidian/**
+        - .trash/**
+        - .DS_Store
+      '';
+
+      sync = pkgs.writeShellScript "obsidian-icloud-sync" ''
+        workdir="${config.xdg.stateHome}/obsidian-icloud-sync"
+        ${pkgs.coreutils}/bin/mkdir -p "$workdir"
+
+        resync=()
+        shopt -s nullglob
+        listings=("$workdir"/*.lst)
+        if [ ''${#listings[@]} -eq 0 ]; then
+          resync=(--resync)
+        fi
+
+        if ! ${pkgs.diffutils}/bin/cmp -s ${filters} "$workdir/filters.txt"; then
+          ${pkgs.coreutils}/bin/install -m644 ${filters} "$workdir/filters.txt"
+          resync=(--resync)
+        fi
+
+        exec ${pkgs.rclone}/bin/rclone bisync "${vault}" "${remote}" \
+          --filters-file "$workdir/filters.txt" \
+          --workdir "$workdir" \
+          --resilient --recover --max-lock 2m \
+          --conflict-resolve newer \
+          "''${resync[@]}"
+      '';
+    in
+    {
+      systemd.user.services.obsidian-icloud-sync = {
+        Unit = {
+          Description = "Obsidian vault <-> iCloud (rclone bisync)";
+          After = [ "network-online.target" ];
+        };
+        Service = {
+          Type = "oneshot";
+          ExecStart = "${sync}";
+        };
+      };
+
+      systemd.user.timers.obsidian-icloud-sync = {
+        Unit.Description = "Periodic Obsidian iCloud sync";
+        Timer = {
+          OnStartupSec = "1min";
+          OnUnitInactiveSec = "3min";
+        };
+        Install.WantedBy = [ "timers.target" ];
+      };
+    };
+}

modules/home/home-radicle.ulu.nix

@@ -12,7 +12,7 @@
       hasSecret = (osConfig.age.secrets or { }) ? radicle-key;
     in
     {
-      home.packages = [ pkgs.radicle-node ];
+      home.packages = [ (pkgs.radicle-node.overrideAttrs { doCheck = false; }) ];
       home.file.".radicle/config.json".text = builtins.toJSON {
         publicExplorer = "https://radicle.network/nodes/$host/$rid$path";
         preferredSeeds = [

modules/nixos/common/common-packages.ulu.nix

@@ -17,7 +17,6 @@
         moonlight-qt
         qbittorrent
         obs-studio
-        spotifast
         picotool
         sunshine
         whatsie

modules/nixos/common/common-spotifast.ulu.nix

@@ -0,0 +1,19 @@
+{ ... }:
+{
+  flake.nixosModules.common-spotifast =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [
+        (pkgs.spotifast.overrideAttrs (old: rec {
+          version = "0.14.2";
+          src = pkgs.fetchFromGitHub {
+            owner = "crmne";
+            repo = "spotifast";
+            tag = "v${version}";
+            hash = "sha256-LdhBPj7ZrXXMvQpM/DqYH5m7zH7duTZ/tZbHO3XI5CQ=";
+          };
+          cargoHash = "sha256-q6wmUeh102dRN4yIwPogq726Zx4AcefUT4lDiqhSnMU=";
+        }))
+      ];
+    };
+}