Compare commits

...

4 Commits

Author SHA1 Message Date
FliegendeWurst
41e943d82a sddm-theme-utah: init at 1.0 2023-11-04 21:56:10 +01:00
FliegendeWurst
7cb0a0c27f tmux-thumbs: init at 0.5.1-infdev 2023-11-04 21:49:38 +01:00
FliegendeWurst
f67121fabe thumbs: init at 0.5.1-infdev 2023-11-04 21:27:27 +01:00
FliegendeWurst
8869791cff openscad-snapshot: fix meta 2023-10-19 12:05:32 +02:00
7 changed files with 141 additions and 2 deletions

View File

@ -8,7 +8,7 @@
{ pkgs ? import <nixpkgs> { } }:
{
rec {
# The `lib`, `modules`, and `overlay` names are special
lib = import ./lib { inherit pkgs; }; # functions
modules = import ./modules; # NixOS modules
@ -27,4 +27,10 @@
ripgrep-all = pkgs.callPackage ./pkgs/ripgrep-all {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
};
sddm-theme-utah = pkgs.callPackage ./pkgs/sddm-theme-utah { };
thumbs = pkgs.callPackage ./pkgs/thumbs { };
tmux-thumbs = pkgs.callPackage ./pkgs/tmux-thumbs {
inherit (pkgs.tmuxPlugins) mkTmuxPlugin;
inherit thumbs;
};
}

View File

@ -35,7 +35,8 @@ appimageTools.wrapType2 {
'';
meta = with lib; {
inherit (openscad.meta);
inherit (openscad.meta) description longDescription homepage license;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ fliegendewurst ];
};
}

View File

@ -0,0 +1,27 @@
{ lib, stdenv, fetchurl, plasma-workspace }:
stdenv.mkDerivation {
pname = "sddm-theme-utah";
version = "1.0";
dontBuild = true;
dontUnpack = true;
installPhase = ''
mkdir -p $out/share/sddm/themes/
cp -aR ${plasma-workspace}/share/sddm/themes/breeze $out/share/sddm/themes/sddm-theme-custom
chmod +w $out/share/sddm/themes/sddm-theme-custom $out/share/sddm/themes/sddm-theme-custom/theme.conf
cp -aR $src $out/share/sddm/themes/sddm-theme-custom/background.png
sed -i 's/background=.*/background=background.png/g' $out/share/sddm/themes/sddm-theme-custom/theme.conf
'';
src = fetchurl {
url = "https://fliegendewurst.eu/tmp/utah.png";
hash = "sha256-eREFKG5Uj991UB6GppZEOgrao1WToq1OtA+rKB5szs8=";
};
meta = with lib; {
description = "Breeze SDDM theme with Utah desert as background";
homepage = "https://old.reddit.com/r/EarthPorn/comments/15egvz1/an_epic_morning_in_the_remote_utah_desert/";
license = licenses.unfree;
maintainers = with maintainers; [ fliegendewurst ];
platforms = platforms.all;
};
}

24
pkgs/thumbs/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "thumbs";
version = "0.5.1-infdev";
src = fetchFromGitHub {
owner = "FliegendeWurst";
repo = "tmux-thumbs";
rev = "60824a826a0f64403fd45ded9be8cf3a130476b2";
sha256 = "sha256-3MKhZq2ks2rBYACf1kkfRxxXNexHjnQ6/+s1wCfqHeo=";
};
patches = [ ./fix.patch ];
cargoSha256 = "sha256-iPOEUd6+qPR1vI7khkHXgwR8UFRrCH5irHlL1VZVPyY=";
meta = with lib; {
homepage = "https://github.com/FliegendeWurst/tmux-thumbs";
description = "A lightning fast version copy/pasting like vimium/vimperator";
license = licenses.mit;
maintainers = with maintainers; [ fliegendewurst ];
};
}

13
pkgs/thumbs/fix.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/swapper.rs b/src/swapper.rs
index 6cf1e89..bcb0969 100644
--- a/src/swapper.rs
+++ b/src/swapper.rs
@@ -215,7 +215,7 @@ impl<'a> Swapper<'a> {
};
let pane_command = format!(
- "tmux capture-pane -J -et {active_pane_id} -p{scroll_params} | tail -n {height} | {dir}/target/release/thumbs -f '%U:%H' -t {tmp} {args}; tmux swap-pane -t {active_pane_id}; {zoom_command} tmux wait-for -S {signal}",
+ "tmux capture-pane -J -et {active_pane_id} -p{scroll_params} | tail -n {height} | {dir}/thumbs -f '%U:%H' -t {tmp} {args}; tmux swap-pane -t {active_pane_id}; {zoom_command} tmux wait-for -S {signal}",
active_pane_id = active_pane_id,
scroll_params = scroll_params,
height = self.active_pane_height.unwrap_or(i32::MAX),

View File

@ -0,0 +1,29 @@
{ lib, mkTmuxPlugin, fetchFromGitHub, thumbs, substituteAll }:
mkTmuxPlugin rec {
pluginName = "tmux-thumbs";
version = "0.5.1-infdev";
rtpFilePath = "tmux-thumbs.tmux";
src = fetchFromGitHub {
owner = "FliegendeWurst";
repo = pluginName;
rev = "60824a826a0f64403fd45ded9be8cf3a130476b2";
sha256 = "sha256-3MKhZq2ks2rBYACf1kkfRxxXNexHjnQ6/+s1wCfqHeo=";
};
patches = [
(substituteAll {
src = ./fix.patch;
tmuxThumbsDir = "${thumbs}/bin";
})
];
meta = with lib; {
homepage = "https://github.com/FliegendeWurst/tmux-thumbs";
description = "tmux-thumbs with color support";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ fliegendewurst ];
};
}

View File

@ -0,0 +1,39 @@
diff --git a/tmux-thumbs.sh b/tmux-thumbs.sh
index 34dd528..8c05d54 100755
--- a/tmux-thumbs.sh
+++ b/tmux-thumbs.sh
@@ -3,19 +3,6 @@
# Setup env variables to be compatible with compiled and bundled installations
CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-RELEASE_DIR="${CURRENT_DIR}/target/release"
-
-THUMBS_BINARY="${RELEASE_DIR}/thumbs"
-TMUX_THUMBS_BINARY="${RELEASE_DIR}/tmux-thumbs"
-VERSION=$(grep 'version =' "${CURRENT_DIR}/Cargo.toml" | grep -o "\".*\"" | sed 's/"//g')
-
-if [ ! -f "$THUMBS_BINARY" ]; then
- tmux split-window "cd ${CURRENT_DIR} && bash ./tmux-thumbs-install.sh"
- exit
-elif [[ $(${THUMBS_BINARY} --version) != "thumbs ${VERSION}" ]]; then
- tmux split-window "cd ${CURRENT_DIR} && bash ./tmux-thumbs-install.sh update"
- exit
-fi
function get-opt-value() {
tmux show -vg "@thumbs-${1}" 2> /dev/null
@@ -35,7 +22,7 @@
fi
}
-PARAMS=(--dir "${CURRENT_DIR}")
+PARAMS=(--dir @tmuxThumbsDir@)
function add-param() {
local type opt arg
@@ -50,4 +37,4 @@
add-param multi-command string
add-param osc52 boolean
-"${TMUX_THUMBS_BINARY}" "${PARAMS[@]}" || true
+@tmuxThumbsDir@/tmux-thumbs "${PARAMS[@]}" || true