From 8e62e843021e11d090c7d64da8e1a9e08426b770 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sat, 11 Jul 2026 17:08:52 +0200
Subject: pkgs/swallow: Rename to `sw`

That's easier to type
---
 modules/by-name/ri/river/module.nix |  2 +-
 pkgs/by-name/sw/sw/package.nix      | 25 +++++++++++++++++++++++++
 pkgs/by-name/sw/sw/sw.sh            | 28 ++++++++++++++++++++++++++++
 pkgs/by-name/sw/swallow/package.nix | 25 -------------------------
 pkgs/by-name/sw/swallow/swallow.sh  | 28 ----------------------------
 5 files changed, 54 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/by-name/sw/sw/package.nix
 create mode 100755 pkgs/by-name/sw/sw/sw.sh
 delete mode 100644 pkgs/by-name/sw/swallow/package.nix
 delete mode 100755 pkgs/by-name/sw/swallow/swallow.sh

diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix
index 7eb30014..f9ecea0f 100644
--- a/modules/by-name/ri/river/module.nix
+++ b/modules/by-name/ri/river/module.nix
@@ -229,7 +229,7 @@ in {
 
       home.packages = [
         river-start
-        pkgs.swallow
+        pkgs.sw
       ];
 
       xdg.configFile."river/init" = {
diff --git a/pkgs/by-name/sw/sw/package.nix b/pkgs/by-name/sw/sw/package.nix
new file mode 100644
index 00000000..dea7e16c
--- /dev/null
+++ b/pkgs/by-name/sw/sw/package.nix
@@ -0,0 +1,25 @@
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
+{
+  writeShellApplication,
+  # Dependencies
+  river-classic,
+}:
+writeShellApplication {
+  name = "sw";
+  text = builtins.readFile ./sw.sh;
+
+  # We need to inherit the path, so that we can spawn stuff in a swallowed mode.
+  inheritPath = true;
+
+  runtimeInputs = [
+    river-classic
+  ];
+}
diff --git a/pkgs/by-name/sw/sw/sw.sh b/pkgs/by-name/sw/sw/sw.sh
new file mode 100755
index 00000000..68dd6a75
--- /dev/null
+++ b/pkgs/by-name/sw/sw/sw.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env dash
+# Based on: https://codeberg.org/nirodhvana/reservoir/src/commit/2fa8c14877799a03bb927f048c2907dbb418fd68/dot-local/bin/gobble
+
+# Inspired by https://github.com/swindlesmccoop/not-just-dotfiles/blob/master/.local/bin/swallow
+
+swallow_tag=$((1 << 9))
+eat() {
+    riverctl set-view-tags $swallow_tag
+}
+
+throwup() {
+    riverctl set-focused-tags $swallow_tag &&
+        riverctl send-to-previous-tags &&
+        riverctl focus-previous-tags
+}
+
+if [ -z "$*" ]; then
+    printf "ERROR: No arguments supplied\n"
+elif ! command -v "$1" >/dev/null; then
+    printf "ERROR: Command '%s' does not exist\n" "$1"
+else
+    # Make sure that we actually `throwup`, when the command fails
+    set +e
+
+    eat && "$@"
+
+    throwup
+fi
diff --git a/pkgs/by-name/sw/swallow/package.nix b/pkgs/by-name/sw/swallow/package.nix
deleted file mode 100644
index 16608143..00000000
--- a/pkgs/by-name/sw/swallow/package.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# nixos-config - My current NixOS configuration
-#
-# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# This file is part of my nixos-config.
-#
-# You should have received a copy of the License along with this program.
-# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{
-  writeShellApplication,
-  # Dependencies
-  river-classic,
-}:
-writeShellApplication {
-  name = "swallow";
-  text = builtins.readFile ./swallow.sh;
-
-  # We need to inherit the path, so that we can spawn stuff in a swallowed mode.
-  inheritPath = true;
-
-  runtimeInputs = [
-    river-classic
-  ];
-}
diff --git a/pkgs/by-name/sw/swallow/swallow.sh b/pkgs/by-name/sw/swallow/swallow.sh
deleted file mode 100755
index 68dd6a75..00000000
--- a/pkgs/by-name/sw/swallow/swallow.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env dash
-# Based on: https://codeberg.org/nirodhvana/reservoir/src/commit/2fa8c14877799a03bb927f048c2907dbb418fd68/dot-local/bin/gobble
-
-# Inspired by https://github.com/swindlesmccoop/not-just-dotfiles/blob/master/.local/bin/swallow
-
-swallow_tag=$((1 << 9))
-eat() {
-    riverctl set-view-tags $swallow_tag
-}
-
-throwup() {
-    riverctl set-focused-tags $swallow_tag &&
-        riverctl send-to-previous-tags &&
-        riverctl focus-previous-tags
-}
-
-if [ -z "$*" ]; then
-    printf "ERROR: No arguments supplied\n"
-elif ! command -v "$1" >/dev/null; then
-    printf "ERROR: Command '%s' does not exist\n" "$1"
-else
-    # Make sure that we actually `throwup`, when the command fails
-    set +e
-
-    eat && "$@"
-
-    throwup
-fi
-- 
cgit v1.3.1