From 9c4c5f1861b3eafd7d0fd0493ae04c7f2c31e30b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 23 Jun 2025 11:53:55 -0400 Subject: [PATCH] More niri support --- flake.lock | 65 ++------------------------------- flake.nix | 8 +--- modules/nixos/desktop/tiler.nix | 8 ++-- 3 files changed, 9 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index eabffc4..56e5c14 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1748365336, - "narHash": "sha256-pg0w4uOZI32dLASD6UbBezeQg5PwOa0GLv7rTwn3VxY=", - "owner": "anyrun-org", - "repo": "anyrun", - "rev": "25367153f225a59c5ce5746583e39a71ff052f09", - "type": "github" - }, - "original": { - "owner": "anyrun-org", - "repo": "anyrun", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -38,30 +16,9 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -209,32 +166,16 @@ }, "root": { "inputs": { - "anyrun": "anyrun", "ghostty": "ghostty", "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "systems": "systems_3" + "systems": "systems_2" } }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -249,7 +190,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 696a7d9..4e32f9a 100644 --- a/flake.nix +++ b/flake.nix @@ -22,11 +22,6 @@ url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; - # Anyrun launcher - anyrun = { - url = "github:anyrun-org/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = @@ -38,7 +33,7 @@ , nix-darwin , nix-flatpak , ghostty - , anyrun + , }: let user = { @@ -85,7 +80,6 @@ specialArgs = { inputs = { inherit - anyrun ghostty; }; }; diff --git a/modules/nixos/desktop/tiler.nix b/modules/nixos/desktop/tiler.nix index 7094f14..ba13444 100644 --- a/modules/nixos/desktop/tiler.nix +++ b/modules/nixos/desktop/tiler.nix @@ -1,6 +1,5 @@ -{ config, lib, pkgs, inputs, ... }: +{ config, lib, pkgs, ... }: let - anyrun = inputs.anyrun.packages.${pkgs.stdenv.hostPlatform.system}.anyrun; cfg = config.skyg.nixos.desktop.tiler; in { @@ -15,7 +14,10 @@ in mako libnotify fuzzel - anyrun + waybar + pavucontrol + sfwbar + xwayland-satellite ]; }; }