From 3c9b94721488ccc64af4bdd70acacc1b957a0b86 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 30 May 2025 20:43:57 +0200 Subject: modules/lf: Consolidate the `ll` and `lm` wrappers in the module Having them as separate packages was just not necessary. --- pkgs/by-name/ll/ll/ll.sh | 29 ----------------------------- pkgs/by-name/ll/ll/package.nix | 18 ------------------ pkgs/by-name/lm/lm/lm.sh | 28 ---------------------------- pkgs/by-name/lm/lm/package.nix | 18 ------------------ 4 files changed, 93 deletions(-) delete mode 100755 pkgs/by-name/ll/ll/ll.sh delete mode 100644 pkgs/by-name/ll/ll/package.nix delete mode 100755 pkgs/by-name/lm/lm/lm.sh delete mode 100644 pkgs/by-name/lm/lm/package.nix (limited to 'pkgs') diff --git a/pkgs/by-name/ll/ll/ll.sh b/pkgs/by-name/ll/ll/ll.sh deleted file mode 100755 index e012cffa..00000000 --- a/pkgs/by-name/ll/ll/ll.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env dash - -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# 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 . - -last_directory="$(mktemp)" -cleanup() { - rm "$last_directory" -} -trap cleanup EXIT - -command lf -last-dir-path="$last_directory" "$@" - -dir="$(cat "$last_directory")" -if cd "$dir"; then - [ -d "$XDG_RUNTIME_DIR/ll" ] || mkdir "$XDG_RUNTIME_DIR/ll" - echo "$dir" >"$XDG_RUNTIME_DIR/ll/last_directory" -else - die "$dir does not exist!" -fi - -# vim: ft=sh diff --git a/pkgs/by-name/ll/ll/package.nix b/pkgs/by-name/ll/ll/package.nix deleted file mode 100644 index 6e4ee336..00000000 --- a/pkgs/by-name/ll/ll/package.nix +++ /dev/null @@ -1,18 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# 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 . -{writeShellApplication}: -writeShellApplication { - name = "ll"; - text = builtins.readFile ./ll.sh; - - # This is sourced in the shell - inheritPath = true; - bashOptions = []; -} diff --git a/pkgs/by-name/lm/lm/lm.sh b/pkgs/by-name/lm/lm/lm.sh deleted file mode 100755 index 71213721..00000000 --- a/pkgs/by-name/lm/lm/lm.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env dash - -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# 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 . - -die() { - echo "ERROR: $1" - exit 1 -} - -msg() { - echo "$1" -} - -if [ -f "$XDG_RUNTIME_DIR/ll/last_directory" ]; then - last_dir="$(cat "$XDG_RUNTIME_DIR/ll/last_directory")" - cd "$last_dir" || die "$last_dir does not exist!" -else - msg "No last directory saved (try using ll instead)." -fi -# vim: ft=sh diff --git a/pkgs/by-name/lm/lm/package.nix b/pkgs/by-name/lm/lm/package.nix deleted file mode 100644 index 42bdc687..00000000 --- a/pkgs/by-name/lm/lm/package.nix +++ /dev/null @@ -1,18 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# 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 . -{writeShellApplication}: -writeShellApplication { - name = "lm"; - text = builtins.readFile ./lm.sh; - - # This is sourced in the shell - inheritPath = true; - bashOptions = []; -} -- cgit 1.4.1