diff --git a/flake.lock b/flake.lock index aa3289d..c9901bd 100644 --- a/flake.lock +++ b/flake.lock @@ -563,14 +563,17 @@ ] }, "locked": { - "lastModified": 1, + "lastModified": 1724674667, "narHash": "sha256-m7DC7MqCfT0uwD0BhdLfwyCw8DyKVlf9rAu+g29tmMo=", - "path": "river-shifttags", - "type": "path" + "ref": "refs/heads/master", + "rev": "1188ea50cab4aae64be1ee68bff2fc0d5c32650f", + "revCount": 1, + "type": "git", + "url": "ssh://gitsrht@git.sourcehut.005540.xyz/~logistic-bot/river-shifttags" }, "original": { - "path": "river-shifttags", - "type": "path" + "type": "git", + "url": "ssh://gitsrht@git.sourcehut.005540.xyz/~logistic-bot/river-shifttags" } }, "root": { diff --git a/flake.nix b/flake.nix index 852ba1e..903789f 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ }; river-shifttags = { - url = "path:river-shifttags"; + url = "git+ssh://gitsrht@git.sourcehut.005540.xyz/~logistic-bot/river-shifttags"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/river-shifttags/flake.lock b/river-shifttags/flake.lock deleted file mode 100644 index bf51175..0000000 --- a/river-shifttags/flake.lock +++ /dev/null @@ -1,26 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1722869614, - "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.05", - "type": "indirect" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/river-shifttags/flake.nix b/river-shifttags/flake.nix deleted file mode 100644 index 6515abb..0000000 --- a/river-shifttags/flake.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - description = "A small utility for the river Wayland compositor to rotate the focused tags."; - inputs = { - nixpkgs.url = "nixpkgs/nixos-24.05"; - }; - outputs = { nixpkgs, ... }: - let - system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - dependencies = with pkgs; [ - pkg-config - pixman - wayland - wayland-scanner - ]; - version = "0.2.2"; - in - { - packages.${system}.default = pkgs.stdenv.mkDerivation { - pname = "river-shifttags"; - inherit version; - - src = pkgs.fetchFromGitLab { - owner = "logistic-bot"; - repo = "river-shifttags"; - rev = "1cb09ab24dc5fd08453bbbb03982a9e544c36eae"; - hash = "sha256-Fvp7VucysYjoMq3hbeIQF6PeyBveHw2y+AsTLAy2fYw="; - }; - - outputs = [ "out" "man" ]; - - nativeBuildInputs = dependencies; - - installPhase = '' - mkdir -p $out/usr/local/bin - mkdir -p $man/share/man - install -Dm 755 -t "$out/bin" ./river-shifttags - install -Dm 644 -t "$man/share/man/man1" ./river-shifttags.1 - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/river-shifttags --help - ''; - }; - devShells.${system}.default = pkgs.mkShell { - packages = dependencies ++ [ - pkgs.gdb - ]; - shellHook = "exec zsh"; - }; - }; -}