feat: Update stuff

flake.lock

@@ -342,6 +342,23 @@
         "type": "github"
       }
     },
+    "cinny": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1772967635,
+        "narHash": "sha256-2qxmlj4IK6twDh27R6qMJDmYSfsWoofVGuRHxSP72f0=",
+        "owner": "cinnyapp",
+        "repo": "cinny",
+        "rev": "55e83065767645ed7cd510a6f4b5cf4733b000b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cinnyapp",
+        "ref": "dev",
+        "repo": "cinny",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1762538466,
@@ -474,10 +491,10 @@
     "crates-io-index": {
       "flake": false,
       "locked": {
-        "lastModified": 1772879886,
+        "lastModified": 1772964728,
-        "narHash": "sha256-qe2Q46O9wKFLscjrzzorHuD4qPC64/CZHf89oeThHpA=",
+        "narHash": "sha256-Up4dWUxHpjPZodSKtsy64RE+UDB9OW7LQI3xNpRd4vQ=",
         "ref": "refs/heads/master",
-        "rev": "3c77163787f774ee902dd8164e6cd8901afb1495",
+        "rev": "0c907d92a476b9ffadcfd9bc5e3d8afa4ffd30c4",
         "shallow": true,
         "type": "git",
         "url": "https://github.com/rust-lang/crates.io-index"
@@ -659,11 +676,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772789012,
+        "lastModified": 1772900169,
-        "narHash": "sha256-V/WCIvB9Tmsi1RZR/E+ypA/8rGTxCjLgn6dn3VuWUdc=",
+        "narHash": "sha256-Y3dW9gL+7PfQHjsjbCStsFS2ziNKMvQi8mLKh//+xeI=",
         "owner": "christo-auer",
         "repo": "eilmeldung",
-        "rev": "5a7ec9dd237f32bebd90f97378517165e605381f",
+        "rev": "0400f8a3dd3eaccac2d836991da71bd1b13f1bde",
         "type": "github"
       },
       "original": {
@@ -1532,11 +1549,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772390736,
+        "lastModified": 1772914505,
-        "narHash": "sha256-TWzqKAd55rKaK1ebiZ6eaq8t1J7jipDJ2uIN+KH9zVw=",
+        "narHash": "sha256-civTFnGjtsbxqvj+YD0r6Tt7dHLbt/xNhKISsm0OXcE=",
         "owner": "tale",
         "repo": "headplane",
-        "rev": "df11aefd0c6dcc4166abbad4e397d27aff96bd00",
+        "rev": "6d70497758840e67a836d1c33ff20017b66c2049",
         "type": "github"
       },
       "original": {
@@ -1687,11 +1704,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1772879267,
+        "lastModified": 1772913214,
-        "narHash": "sha256-lIt/i73U7w2LzBGGTJsABXMhibByg7XhM6IlSa5giGs=",
+        "narHash": "sha256-lI361+KhTUerHMYJOaDzVhIikAX1PNcZMNY1WEx/+dc=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "32e75e3e320fb66ab517a378df645f3d29b3a209",
+        "rev": "a4ecae91600d7e8ceb31610176d6b40cb816711b",
         "type": "github"
       },
       "original": {
@@ -2317,11 +2334,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1772341813,
+        "lastModified": 1772945408,
-        "narHash": "sha256-/PQ0ubBCMj/MVCWEI/XMStn55a8dIKsvztj4ZVLvUrQ=",
+        "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "a2051ff239ce2e8a0148fa7a152903d9a78e854f",
+        "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
         "type": "github"
       },
       "original": {
@@ -2471,11 +2488,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1772879399,
+        "lastModified": 1772963923,
-        "narHash": "sha256-fjk9/8iLcfgzXj6XfIRhhrSv+V7ny1i9mjkpluU+DfQ=",
+        "narHash": "sha256-RzfLK7/Txe27Kl38aFtMtRAQLJgau9rPUXTAfbFSkUk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6912e69f87fe3642cc313e16e6f1ba3ff871cfd6",
+        "rev": "079fda761ac518f7b8ec4fb19e3c2b5f24744c2f",
         "type": "github"
       },
       "original": {
@@ -2487,11 +2504,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1772598333,
+        "lastModified": 1772822230,
-        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
+        "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
+        "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
         "type": "github"
       },
       "original": {
@@ -2513,11 +2530,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1772848685,
+        "lastModified": 1772935638,
-        "narHash": "sha256-7Idiu5NAvtY95DfGp+RLY2Zjt70D9OIbAHQogCFRH9Y=",
+        "narHash": "sha256-NzeoTOG8HVsn2RM/SyC9NSoK1f+rUQUTwfbB5ZvdcRE=",
         "owner": "nix-community",
         "repo": "nixpkgs-xr",
-        "rev": "457e3704134d5967e1d8f4a39b84b296807fd2b9",
+        "rev": "390bd6961152a4ae1802a20f5d61bc876d3d255e",
         "type": "github"
       },
       "original": {
@@ -2576,11 +2593,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1772198003,
+        "lastModified": 1772773019,
-        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
+        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
+        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
         "type": "github"
       },
       "original": {
@@ -2778,11 +2795,11 @@
         "nixpkgs": "nixpkgs_10"
       },
       "locked": {
-        "lastModified": 1772877320,
+        "lastModified": 1772963736,
-        "narHash": "sha256-KSX6e1/NMY1tF2CJrlSQhS5Pwp4VAU/M1o0lEG2dGmU=",
+        "narHash": "sha256-enl7bSBgPMrtdXnrdq4Tp2QVaHzDvxf5pp8KI9Vbsd0=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "73ddcced42469569c9ed9b151ca9d2c0f72612f2",
+        "rev": "ff2b50088ba1e8d6bdc4ea87572da3d58b225cfc",
         "type": "github"
       },
       "original": {
@@ -2919,6 +2936,7 @@
         "anyrun-hyprwin": "anyrun-hyprwin",
         "anyrun-nixos-options": "anyrun-nixos-options",
         "arion": "arion",
+        "cinny": "cinny",
         "crates-io-index": "crates-io-index",
         "crates-nix": "crates-nix",
         "d2": "d2",
@@ -3228,11 +3246,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772495394,
+        "lastModified": 1772944399,
-        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
+        "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
+        "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0",
         "type": "github"
       },
       "original": {
@@ -3940,11 +3958,11 @@
         "systems": "systems_25"
       },
       "locked": {
-        "lastModified": 1772722036,
+        "lastModified": 1772924242,
-        "narHash": "sha256-jwEFqCHrNMiguDLgoUJnc48Kd/hz4rmSiVC3r9NKBIo=",
+        "narHash": "sha256-JcqiV4rdCWhEkCetF+enOzsWLfr0xJ7+8gdxeLTPoM4=",
         "owner": "vicinaehq",
         "repo": "vicinae",
-        "rev": "ca1067afd8c1a3707f1aaf6eb64e980539945b43",
+        "rev": "394c6c4cc7c0e6d9f3d9dd8c622057f9487db199",
         "type": "github"
       },
       "original": {
@@ -4004,11 +4022,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772858378,
+        "lastModified": 1772945022,
-        "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=",
+        "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9",
+        "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -184,6 +184,10 @@
       url = "github:ulyssa/iamb/latest";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    cinny = {
+      url = "github:cinnyapp/cinny/dev";
+      flake = false;
+    };
   };
 
   outputs = {
@@ -362,10 +366,6 @@
           config.allowUnfree = true;
         };
       in {
-        # packages = rec {
-        #   default = neovim;
-        #   neovim = pkgs.nixvim.makeNixvim (pkgs.callPackage ./neovim);
-        # };
         devShells = {
           default = pkgs.mkShell {
             packages = with pkgs; [sops just openssl ast-grep];

home/services/hyprland.nix

@@ -32,6 +32,8 @@
   wayland.windowManager.hyprland = {
     enable = device.is "ryu";
     systemd.enable = true;
+    package = pkgs.hyprland;
+    portalPackage = pkgs.xdph;
 
     settings = {
       # source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";

home/services/xdg.nix

@@ -5,16 +5,12 @@
   inputs,
   ...
 }: {
+  environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"];
   xdg.portal = {
     enable = device.is "ryu";
     config = {
       hyprland.default = ["hyprland"];
       common.default = ["*" "hyprland"];
     };
-    extraPortals = with pkgs; [
-      kdePackages.xdg-desktop-portal-kde
-      xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ];
   };
 }

nixos/ryu/configuration.nix

@@ -23,15 +23,6 @@
     tctiEnvironment.enable = true;
   };
 
-  programs = {
-    hyprland = {
-      enable = true;
-      withUWSM = true;
-      xwayland.enable = true;
-    };
-    uwsm.enable = true;
-  };
-
   systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
   # systemd.tmpfiles.rules = [
   #   "L+ /etc/gdm/.config/monitors.xml - - - - ${./monitors.xml}"

nixos/ryu/programs/hyprland.nix

@@ -6,4 +6,14 @@
   environment.systemPackages = with pkgs; [
     xhost
   ];
+  programs = {
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+      xwayland.enable = true;
+      package = pkgs.hyprland;
+      portalPackage = pkgs.xdph;
+    };
+    uwsm.enable = true;
+  };
 }

nixos/tako/services/default.nix

@@ -25,7 +25,7 @@
     ./llms.nix
     ./matrix
     ./monitoring.nix
-    ./servius-website.nix
+    # ./servius-website.nix
     # ./paperless.nix
     ./prowlarr.nix
     # ./searxng.nix

nixos/tako/services/matrix/cinny.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   config,
+  inputs,
   ...
 }: let
   base_domain = "darksailor.dev";
@@ -19,16 +20,18 @@
       pname = "cinny-unwrapped";
       version = "4.10.5";
 
-      src = fetchFromGitHub {
+      # src = fetchFromGitHub {
-        owner = "cinnyapp";
+      #   owner = "cinnyapp";
-        repo = "cinny";
+      #   repo = "cinny";
-        tag = "v${version}";
+      #   rev = "dev";
-        hash = "sha256-Napy3AcsLRDZPcBh3oq1U30FNtvoNtob0+AZtZSvcbM=";
+      #   # tag = "v${version}";
-      };
+      #   hash = "sha256-2qxmlj4IK6twDh27R6qMJDmYSfsWoofVGuRHxSP72f0=";
+      # };
+      src = inputs.cinny;
 
       nodejs = nodejs_22;
 
-      npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo=";
+      npmDepsHash = "sha256-qyQ0SXkPSUES/tavKzPra0Q+ZnU9qHvkTC1JgAjL0o8=";
 
       nativeBuildInputs = [
         python3

overlays.nix

@@ -57,7 +57,7 @@
 
   # --- Networking ---
   networking = final: prev: {
-    caddyWithCloudflare = inputs.nixpkgs.legacyPackages.${final.system}.caddy.withPlugins {
+    caddyWithCloudflare = inputs.nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}.caddy.withPlugins {
       plugins = ["github.com/caddy-dns/cloudflare@v0.2.2"];
       hash = "sha256-biQdtiscdmrwP6VUsuXmZrvcdewl+g50kdmab5lhE0s=";
     };
@@ -84,7 +84,8 @@
   applications = final: prev: {
     iamb = inputs.iamb.packages.${prev.stdenv.hostPlatform.system}.default;
     hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland;
-    # xdg-desktop-portal-hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    xdg-desktop-portal-hyprland = prev.enableDebugging inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    xdph = inputs.nixpkgs-master.legacyPackages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
   };
 
   # --- Themes and assets ---