diff --git a/flake.lock b/flake.lock index 18ba966..6e4468d 100644 --- a/flake.lock +++ b/flake.lock @@ -77,6 +77,25 @@ "type": "github" } }, + "elephant": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "systems": "systems" + }, + "locked": { + "lastModified": 1775706155, + "narHash": "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=", + "owner": "abenz1267", + "repo": "elephant", + "rev": "376ee71c66db38683daabd57350bf3f6f086eaf8", + "type": "github" + }, + "original": { + "owner": "abenz1267", + "repo": "elephant", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -134,7 +153,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1777642796, @@ -170,8 +189,8 @@ "blueprint": "blueprint", "bun2nix": "bun2nix", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", - "systems": "systems", + "nixpkgs": "nixpkgs_4", + "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -191,7 +210,7 @@ "lux-pkgs": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1772315038, @@ -211,7 +230,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -265,7 +284,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1777181277, @@ -283,7 +302,7 @@ }, "nix-wrapper-modules": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1777588201, @@ -363,6 +382,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1775888245, "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", @@ -378,7 +413,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -394,7 +429,39 @@ "type": "github" } }, + "nixpkgs_13": { + "locked": { + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1775423009, "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", @@ -410,7 +477,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1777425547, "narHash": "sha256-d57AbflkNfZNoFaZDzssEq1RfPoM9dLtOGI2O+N/68Q=", @@ -426,7 +493,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1772173633, "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", @@ -442,7 +509,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1777268161, "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", @@ -458,7 +525,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1776877367, "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", @@ -474,7 +541,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1775579569, "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=", @@ -490,7 +557,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1777425547, "narHash": "sha256-fUlUlthbjH+ppUqSdGoLFM+GbtuxcDhp8V8ouXEAgow=", @@ -503,25 +570,9 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "noctalia-qs": "noctalia-qs" }, "locked": { @@ -544,7 +595,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -564,6 +615,7 @@ "root": { "inputs": { "disko": "disko", + "elephant": "elephant", "flake-parts": [ "lux-pkgs", "flake-parts" @@ -576,15 +628,16 @@ "nix-index-database": "nix-index-database", "nix-wrapper-modules": "nix-wrapper-modules", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "noctalia": "noctalia", "sops-nix": "sops-nix", - "vicinae-extensions": "vicinae-extensions" + "vicinae-extensions": "vicinae-extensions", + "walker": "walker" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1777338324, @@ -601,6 +654,21 @@ } }, "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=", @@ -615,7 +683,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -630,7 +698,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -645,6 +713,21 @@ "type": "github" } }, + "systems_5": { + "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -716,8 +799,8 @@ "vicinae-extensions": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_11", - "systems": "systems_3", + "nixpkgs": "nixpkgs_12", + "systems": "systems_4", "vicinae": "vicinae" }, "locked": { @@ -734,6 +817,28 @@ "type": "github" } }, + "walker": { + "inputs": { + "elephant": [ + "elephant" + ], + "nixpkgs": "nixpkgs_13", + "systems": "systems_5" + }, + "locked": { + "lastModified": 1777789924, + "narHash": "sha256-fX3ErzTmHRO9z1SzHC2VZUgKOgRfO13X/joC5a3QN7Q=", + "owner": "abenz1267", + "repo": "walker", + "rev": "93d44d1cb41732e1370e4b949429ae8e34ea05a4", + "type": "github" + }, + "original": { + "owner": "abenz1267", + "repo": "walker", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 538d5c3..b8d3485 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,12 @@ #vicinae.url = "github:vicinaehq/vicinae"; vicinae-extensions.url = "github:vicinaehq/extensions"; + elephant.url = "github:abenz1267/elephant"; + walker = { + url = "github:abenz1267/walker"; + inputs.elephant.follows = "elephant"; + }; + lux-pkgs.url = "git+ssh://gitea@orion/kiri/lux-pkgs"; }; diff --git a/modules/capabilities/walker.nix b/modules/capabilities/walker.nix index 94c88fc..c748228 100644 --- a/modules/capabilities/walker.nix +++ b/modules/capabilities/walker.nix @@ -1,46 +1,24 @@ +{ inputs, ... }: { flake.modules.homeManager.walker = { config, lib, - pkgs, ... }: let - elephantCommand = lib.getExe pkgs.elephant; - launcherCommand = lib.getExe config.services.walker.package; + launcherCommand = lib.getExe config.programs.walker.package; in { - home.packages = [ pkgs.elephant ]; + imports = [ inputs.walker.homeManagerModules.default ]; - services.walker = { + programs.walker = { enable = true; - systemd.enable = true; - }; - - systemd.user.services = { - elephant = { - Unit = { - Description = "Elephant application launcher backend"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - Install.WantedBy = [ "graphical-session.target" ]; - Service = { - ExecStart = elephantCommand; - Restart = "always"; - RestartSec = 10; - }; - }; - - walker.Unit = { - Wants = [ "elephant.service" ]; - After = [ "elephant.service" ]; - }; + runAsService = true; }; meta.desktop.launcher = { - package = config.services.walker.package; + package = config.programs.walker.package; commands = { open = [ launcherCommand ]; files = [