diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | flake.nix | 11 | ||||
| -rw-r--r-- | flake/default.nix | 2 | ||||
| -rw-r--r-- | home-manager/default.nix | 2 | ||||
| -rw-r--r-- | home-manager/soispha/config/lf/commands/default.nix | 3 | ||||
| -rwxr-xr-x | home-manager/soispha/config/lf/commands/scripts/rename | 26 | ||||
| -rw-r--r-- | home-manager/soispha/config/lf/default.nix | 3 |
7 files changed, 49 insertions, 28 deletions
diff --git a/flake.lock b/flake.lock index 2ce9fb11..b33bbc7d 100644 --- a/flake.lock +++ b/flake.lock @@ -387,6 +387,35 @@ "type": "github" } }, + "lf_rename": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1692548268, + "narHash": "sha256-UnuTjb4RTnPoNJ4u4LBOpSObf7HkGMhR4M7e6xL9o/c=", + "ref": "refs/heads/prime", + "rev": "03dc34eac8a469a723298846081d5fea31157cb8", + "revCount": 9, + "type": "git", + "url": "https://codeberg.org/soispha/lf-rename.git" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/soispha/lf-rename.git" + } + }, "neovim_config": { "flake": false, "locked": { @@ -762,6 +791,7 @@ "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", + "lf_rename": "lf_rename", "neovim_config": "neovim_config", "nixNeovim": "nixNeovim", "nixNeovimPlugins": "nixNeovimPlugins", diff --git a/flake.nix b/flake.nix index 6be4609d..c8e95bcc 100644 --- a/flake.nix +++ b/flake.nix @@ -180,6 +180,15 @@ rust-overlay.follows = "rust-overlay"; }; }; + lf_rename = { + url = "git+https://codeberg.org/soispha/lf-rename.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + flake-compat.follows = "flake-compat"; + systems.follows = "systems"; + }; + }; video_pause = { url = "git+https://codeberg.org/soispha/video-pause.git"; inputs = { @@ -293,6 +302,7 @@ # my binaries video_pause, strip_js_comments, + lf_rename, generate_firefox_extensions, shell_library, river_init_lesser, @@ -341,6 +351,7 @@ video_pause strip_js_comments + lf_rename generate_firefox_extensions shell_library river_init_lesser diff --git a/flake/default.nix b/flake/default.nix index 5a4be312..a8c597e9 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -24,6 +24,7 @@ # my binaries video_pause, strip_js_comments, + lf_rename, generate_firefox_extensions, shell_library, river_init_lesser, @@ -44,6 +45,7 @@ video_pause yambar_cpu yambar_memory + lf_rename strip_js_comments river_init_lesser grades diff --git a/home-manager/default.nix b/home-manager/default.nix index f1ff6ed6..015cdeb2 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -7,6 +7,7 @@ video_pause, yambar_cpu, yambar_memory, + lf_rename, strip_js_comments, river_init_lesser, grades, @@ -37,6 +38,7 @@ video_pause yambar_cpu yambar_memory + lf_rename strip_js_comments river_init_lesser grades diff --git a/home-manager/soispha/config/lf/commands/default.nix b/home-manager/soispha/config/lf/commands/default.nix index fa366d37..95cd2991 100644 --- a/home-manager/soispha/config/lf/commands/default.nix +++ b/home-manager/soispha/config/lf/commands/default.nix @@ -3,6 +3,7 @@ sysLib, shell_library, system, + lf_rename, ... }: let functionCall = { @@ -197,7 +198,7 @@ in { dependencies = []; }; rename = pipe { - file = ./scripts/rename; + file = "${lf_rename.packages."${system}".default}"; dependencies = []; }; stripspace = pipe { diff --git a/home-manager/soispha/config/lf/commands/scripts/rename b/home-manager/soispha/config/lf/commands/scripts/rename deleted file mode 100755 index e1aef306..00000000 --- a/home-manager/soispha/config/lf/commands/scripts/rename +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env dash - -# shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.1.4" . %SHELL_LIBRARY_PATH - - -prompt "New name: " -name="" -while [ -z "$name" ] || [ -e "$name" ] -do - read -r name - if [ -e "$name" ]; then - prompt "Name already exists, overwrite [y|N]: " - read -r ans - - if [ "$ans" = "y" ]; then - break - else - prompt "Name: " - fi - fi -done - -mv "$f" "$name" - -# vim: ft=sh diff --git a/home-manager/soispha/config/lf/default.nix b/home-manager/soispha/config/lf/default.nix index 9f43a891..a4f7d7b9 100644 --- a/home-manager/soispha/config/lf/default.nix +++ b/home-manager/soispha/config/lf/default.nix @@ -3,10 +3,11 @@ sysLib, nixosConfig, shell_library, + lf_rename, system, ... }: let - commands = import ./commands {inherit pkgs sysLib shell_library system;}; + commands = import ./commands {inherit pkgs sysLib shell_library system lf_rename;}; keybindings = import ./keybindings {inherit nixosConfig;}; in { xdg.configFile."lf/icons".source = ./icons; |