From 0874bb6698ff1e4820dead48170f8de8474532e5 Mon Sep 17 00:00:00 2001 From: servius Date: Sat, 7 Mar 2026 22:43:13 +0530 Subject: [PATCH] feat: Added stuff --- flake.lock | 54 ++++++++++++++++----------------- home/apps/zen.nix | 1 - home/services/hyprland.nix | 2 -- home/services/xdg.nix | 3 +- nixos/ryu/apps/crosspipe.nix | 3 ++ nixos/ryu/apps/default.nix | 2 +- nixos/ryu/apps/helvum.nix | 3 -- nixos/ryu/configuration.nix | 2 -- nixos/ryu/programs/hyprland.nix | 1 - overlays.nix | 16 +++++----- 10 files changed, 41 insertions(+), 46 deletions(-) create mode 100644 nixos/ryu/apps/crosspipe.nix delete mode 100644 nixos/ryu/apps/helvum.nix diff --git a/flake.lock b/flake.lock index c449b9e7..5c6ba278 100644 --- a/flake.lock +++ b/flake.lock @@ -474,10 +474,10 @@ "crates-io-index": { "flake": false, "locked": { - "lastModified": 1772835417, - "narHash": "sha256-7MP8SlaH5e+qOlCyZ26Rw7WFWONF5+lmKI+E/AWvXbk=", + "lastModified": 1772879886, + "narHash": "sha256-qe2Q46O9wKFLscjrzzorHuD4qPC64/CZHf89oeThHpA=", "ref": "refs/heads/master", - "rev": "e6b95e4c34d772e648e267b5a3144bf9d80a0982", + "rev": "3c77163787f774ee902dd8164e6cd8901afb1495", "shallow": true, "type": "git", "url": "https://github.com/rust-lang/crates.io-index" @@ -1552,11 +1552,11 @@ ] }, "locked": { - "lastModified": 1772807318, - "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { @@ -1687,11 +1687,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1772833450, - "narHash": "sha256-XuuvhTD/72mH8MBncTeOyN0JzLCtwav7lkwBQlIofd4=", + "lastModified": 1772879267, + "narHash": "sha256-lIt/i73U7w2LzBGGTJsABXMhibByg7XhM6IlSa5giGs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4152ac76d0813d9d0f67d2f04653a13fa6e17433", + "rev": "32e75e3e320fb66ab517a378df645f3d29b3a209", "type": "github" }, "original": { @@ -2471,11 +2471,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1772833378, - "narHash": "sha256-3xCGRFiE9PmrFvYrikic7ja7e7MklVlQlrsfzRxXkwk=", + "lastModified": 1772879399, + "narHash": "sha256-fjk9/8iLcfgzXj6XfIRhhrSv+V7ny1i9mjkpluU+DfQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "67063f61d1b843adc3d0f2fa415977b03d258ad0", + "rev": "6912e69f87fe3642cc313e16e6f1ba3ff871cfd6", "type": "github" }, "original": { @@ -2513,11 +2513,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772762760, - "narHash": "sha256-GhDh8NKawETPtwIxjP1l+eBJ+rffbIocIgYcNEaT/JI=", + "lastModified": 1772848685, + "narHash": "sha256-7Idiu5NAvtY95DfGp+RLY2Zjt70D9OIbAHQogCFRH9Y=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "633902fb1ef580f96d8f2700160eaca6226c1648", + "rev": "457e3704134d5967e1d8f4a39b84b296807fd2b9", "type": "github" }, "original": { @@ -2528,11 +2528,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -2624,11 +2624,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -2778,11 +2778,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1772832645, - "narHash": "sha256-XXOyU8/Ckvv1WKzm1P5VTJw8eqzfnYG8GJYhAvihW2A=", + "lastModified": 1772877320, + "narHash": "sha256-KSX6e1/NMY1tF2CJrlSQhS5Pwp4VAU/M1o0lEG2dGmU=", "owner": "nix-community", "repo": "nur", - "rev": "9278cdd2cdf521b640c4b7a1a30cd25a6c2f1288", + "rev": "73ddcced42469569c9ed9b151ca9d2c0f72612f2", "type": "github" }, "original": { @@ -4004,11 +4004,11 @@ ] }, "locked": { - "lastModified": 1772772172, - "narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=", + "lastModified": 1772858378, + "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3", + "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", "type": "github" }, "original": { diff --git a/home/apps/zen.nix b/home/apps/zen.nix index 31eb5792..a510aa45 100644 --- a/home/apps/zen.nix +++ b/home/apps/zen.nix @@ -158,6 +158,5 @@ Fingerprinting = true; }; }; - suppressXdgMigrationWarning = true; }; } diff --git a/home/services/hyprland.nix b/home/services/hyprland.nix index 4f9b2624..5276e04a 100644 --- a/home/services/hyprland.nix +++ b/home/services/hyprland.nix @@ -32,8 +32,6 @@ wayland.windowManager.hyprland = { enable = device.is "ryu"; systemd.enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; settings = { # source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf"; diff --git a/home/services/xdg.nix b/home/services/xdg.nix index f10460e5..95606eda 100644 --- a/home/services/xdg.nix +++ b/home/services/xdg.nix @@ -13,8 +13,7 @@ }; extraPortals = with pkgs; [ kdePackages.xdg-desktop-portal-kde - # xdg-desktop-portal-hyprland - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland + xdg-desktop-portal-hyprland xdg-desktop-portal-gtk ]; }; diff --git a/nixos/ryu/apps/crosspipe.nix b/nixos/ryu/apps/crosspipe.nix new file mode 100644 index 00000000..055c8a24 --- /dev/null +++ b/nixos/ryu/apps/crosspipe.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [crosspipe]; +} diff --git a/nixos/ryu/apps/default.nix b/nixos/ryu/apps/default.nix index 16b69a8a..fa831b59 100644 --- a/nixos/ryu/apps/default.nix +++ b/nixos/ryu/apps/default.nix @@ -7,7 +7,7 @@ # ./alvr.nix ./easyeffects.nix ./vr.nix - ./helvum.nix + ./crosspipe.nix # ./wine.nix # ./virt.nix ./gparted.nix diff --git a/nixos/ryu/apps/helvum.nix b/nixos/ryu/apps/helvum.nix deleted file mode 100644 index dac3ba27..00000000 --- a/nixos/ryu/apps/helvum.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [helvum]; -} diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index e366361d..605f8457 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -28,8 +28,6 @@ enable = true; withUWSM = true; xwayland.enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; uwsm.enable = true; }; diff --git a/nixos/ryu/programs/hyprland.nix b/nixos/ryu/programs/hyprland.nix index ee83eade..c56ff4af 100644 --- a/nixos/ryu/programs/hyprland.nix +++ b/nixos/ryu/programs/hyprland.nix @@ -4,7 +4,6 @@ ... }: { environment.systemPackages = with pkgs; [ - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland xhost ]; } diff --git a/overlays.nix b/overlays.nix index d629f438..93c29094 100644 --- a/overlays.nix +++ b/overlays.nix @@ -26,9 +26,9 @@ }; }; }; - tmux-float = inputs.tmux-float.packages.${prev.system}.default; + tmux-float = inputs.tmux-float.packages.${prev.stdenv.hostPlatform.system}.default; zellijPlugins = { - zjstatus = inputs.zjstatus.packages.${prev.system}.default; + zjstatus = inputs.zjstatus.packages.${prev.stdenv.hostPlatform.system}.default; }; }; @@ -65,13 +65,13 @@ # --- Media --- media = final: prev: { - ddcbacklight = inputs.ddcbacklight.packages.${prev.system}.ddcbacklight; - music-player-git = inputs.music-player.packages.${prev.system}.default; + ddcbacklight = inputs.ddcbacklight.packages.${prev.stdenv.hostPlatform.system}.ddcbacklight; + music-player-git = inputs.music-player.packages.${prev.stdenv.hostPlatform.system}.default; }; # --- macOS-specific --- darwin = final: prev: { - kitty = inputs.nixpkgs-stable.legacyPackages.${prev.system}.kitty; + kitty = inputs.nixpkgs-stable.legacyPackages.${prev.stdenv.hostPlatform.system}.kitty; yabai = prev.yabai.overrideAttrs (oldAttrs: rec { version = "7.1.16"; src = final.fetchzip { @@ -82,7 +82,9 @@ }; applications = final: prev: { - iamb = inputs.iamb.packages.${prev.system}.default; + 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; }; # --- Themes and assets --- @@ -90,7 +92,7 @@ catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;}; nix-index-database = final.runCommandLocal "nix-index-database" {} '' mkdir -p $out - ln -s ${inputs.nix-index-database.legacyPackages.${prev.system}.database} $out/files + ln -s ${inputs.nix-index-database.legacyPackages.${prev.stdenv.hostPlatform.system}.database} $out/files ''; }; in