formatted
This commit is contained in:
parent
ba1684c8d4
commit
737ca01e49
24 changed files with 468 additions and 411 deletions
|
@ -1,15 +1,15 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, kcoreaddons
|
||||
, kwindowsystem
|
||||
, plasma-framework
|
||||
, systemsettings
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, esbuild
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchFromGitHub,
|
||||
kcoreaddons,
|
||||
kwindowsystem,
|
||||
plasma-framework,
|
||||
systemsettings,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
esbuild,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "bismuth";
|
||||
version = "3.1.3";
|
||||
|
@ -42,7 +42,7 @@ mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A dynamic tiling extension for KWin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pasqui23 ];
|
||||
maintainers = with maintainers; [pasqui23];
|
||||
homepage = "https://bismuth-forge.github.io/bismuth/";
|
||||
inherit (kwindowsystem.meta) platforms;
|
||||
};
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{ lib, fetchFromGitea, rustPlatform, libX11, pkg-config }:
|
||||
|
||||
{
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
rustPlatform,
|
||||
libX11,
|
||||
pkg-config,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "culr";
|
||||
version = "0.1.0";
|
||||
|
@ -12,16 +17,15 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-Blo1PyhzKU4LzflmeGrvWOQEon2BCTkF3uQR+7D5/kc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libX11 ];
|
||||
nativeBuildInputs = [pkg-config];
|
||||
buildInputs = [libX11];
|
||||
|
||||
cargoSha256 = "sha256-Vnhni8tckrexlJ85gfSDEAVWhH6oVHn9/z2O2OIVR5o=";
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "colourise piped input";
|
||||
homepage = "https://git.atagen.co/atagen/culr";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = [];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
hyprland-system76-scheduler-integration = pkgs.callPackage ./hyprland-system76-scheduler-integration.nix {};
|
||||
system76-scheduler = pkgs.callPackage ./system76-scheduler.nix {};
|
||||
culr = pkgs.callPackage ./culr.nix {};
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.programs.fuzzel;
|
||||
iniFormat = pkgs.formats.ini { };
|
||||
iniFormat = pkgs.formats.ini {};
|
||||
in {
|
||||
options = {
|
||||
programs.fuzzel = {
|
||||
|
@ -19,7 +21,7 @@ in {
|
|||
|
||||
settings = mkOption {
|
||||
type = iniFormat.type;
|
||||
default = { };
|
||||
default = {};
|
||||
example = literalExpression ''
|
||||
{
|
||||
window.dimensions = {
|
||||
|
@ -45,18 +47,17 @@ in {
|
|||
|
||||
config = mkMerge [
|
||||
(mkIf cfg.enable {
|
||||
home.packages = [ cfg.package ];
|
||||
home.packages = [cfg.package];
|
||||
|
||||
xdg.configFile."fuzzel/fuzzel.ini" = mkIf (cfg.settings != { }) {
|
||||
xdg.configFile."fuzzel/fuzzel.ini" = mkIf (cfg.settings != {}) {
|
||||
# TODO: Replace by the generate function but need to figure out how to
|
||||
# handle the escaping first.
|
||||
#
|
||||
# source = yamlFormat.generate "alacritty.yml" cfg.settings;
|
||||
|
||||
text =
|
||||
replaceStrings [ "\\\\" ] [ "\\" ] (builtins.toJSON cfg.settings);
|
||||
replaceStrings ["\\\\"] ["\\"] (builtins.toJSON cfg.settings);
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-credential-keepassxc";
|
||||
version = "0.10.0";
|
||||
|
@ -17,7 +20,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Helper that allows Git (and shell scripts) to use KeePassXC as credential store";
|
||||
homepage = "https://github.com/frederick888/git-credential-keepassxc";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
maintainers = [];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,16 @@
|
|||
{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols
|
||||
, libX11, libGL }:
|
||||
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromSourcehut,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wlroots,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
libX11,
|
||||
libGL,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glpaper";
|
||||
version = "unstable-latest";
|
||||
|
@ -13,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-//IKW2BfpqwcR2WAPShs0kzn5nkV/yyABPvOYm3zMPU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
nativeBuildInputs = [meson ninja pkg-config];
|
||||
buildInputs = [
|
||||
wayland
|
||||
libX11 # required by libglvnd
|
||||
|
@ -21,11 +31,10 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper";
|
||||
description = "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper";
|
||||
homepage = "https://hg.sr.ht/~scoopta/glpaper";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ccellado ];
|
||||
maintainers = with maintainers; [ccellado];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
{ lib, stdenv, fetchurl, unzip }:
|
||||
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "headscale-ui";
|
||||
version = "2022.12.23.2-beta";
|
||||
|
@ -9,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-QF10la68Rl2t0K53CH63Qiq54ynkySQACdELorZF/cY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
nativeBuildInputs = [unzip];
|
||||
|
||||
unpackCmd = "unzip headscale-ui.zip";
|
||||
|
||||
|
@ -19,5 +23,4 @@ stdenv.mkDerivation rec {
|
|||
mkdir $out/
|
||||
cp -R . $out
|
||||
'';
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,47 +1,52 @@
|
|||
|
||||
{ lib, pkgs, stdenv, hyprland, ripgrep, socat, dbus, ... }:
|
||||
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
stdenv,
|
||||
hyprland,
|
||||
ripgrep,
|
||||
socat,
|
||||
dbus,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hyprland-system76-scheduler-integration";
|
||||
version = "0.1.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
socat
|
||||
socat
|
||||
dbus
|
||||
hyprland
|
||||
ripgrep
|
||||
hyprland
|
||||
ripgrep
|
||||
];
|
||||
|
||||
dontUnpack = "true";
|
||||
dontUnpack = "true";
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
runHook preInstall
|
||||
|
||||
cat <<EOF > $out/bin/hyprland-system76-scheduler-hook.sh
|
||||
#!${pkgs.bash}/bin/bash
|
||||
echo "opening socket.."
|
||||
${pkgs.socat}/bin/socat -u UNIX-CLIENT:/tmp/hypr/\''$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock STDOUT |
|
||||
while read line; do
|
||||
if [[ "\''$line" == activewindow* ]]; then
|
||||
echo "got \''$line."
|
||||
pid="\''$(${pkgs.hyprland}/bin/hyprctl activewindow | ${pkgs.ripgrep}/bin/rg pid | ${pkgs.coreutils}/bin/cut -d' ' -f2)"
|
||||
if [[ -n \''$pid ]]; then
|
||||
echo "sending \''$pid!"
|
||||
${pkgs.dbus}/bin/dbus-send --system --dest=com.system76.Scheduler --type=method_call /com/system76/Scheduler com.system76.Scheduler.SetForegroundProcess uint32:\''$pid
|
||||
fi
|
||||
pid=""
|
||||
fi
|
||||
echo "continuing.."
|
||||
done
|
||||
echo "finished."
|
||||
EOF
|
||||
chmod +x $out/bin/hyprland-system76-scheduler-hook.sh
|
||||
mkdir -p $out/bin
|
||||
|
||||
runHook postInstall
|
||||
cat <<EOF > $out/bin/hyprland-system76-scheduler-hook.sh
|
||||
#!${pkgs.bash}/bin/bash
|
||||
echo "opening socket.."
|
||||
${pkgs.socat}/bin/socat -u UNIX-CLIENT:/tmp/hypr/\''$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock STDOUT |
|
||||
while read line; do
|
||||
if [[ "\''$line" == activewindow* ]]; then
|
||||
echo "got \''$line."
|
||||
pid="\''$(${pkgs.hyprland}/bin/hyprctl activewindow | ${pkgs.ripgrep}/bin/rg pid | ${pkgs.coreutils}/bin/cut -d' ' -f2)"
|
||||
if [[ -n \''$pid ]]; then
|
||||
echo "sending \''$pid!"
|
||||
${pkgs.dbus}/bin/dbus-send --system --dest=com.system76.Scheduler --type=method_call /com/system76/Scheduler com.system76.Scheduler.SetForegroundProcess uint32:\''$pid
|
||||
fi
|
||||
pid=""
|
||||
fi
|
||||
echo "continuing.."
|
||||
done
|
||||
echo "finished."
|
||||
EOF
|
||||
chmod +x $out/bin/hyprland-system76-scheduler-hook.sh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -1,9 +1,20 @@
|
|||
{ lib, pkgs, stdenv, fetchFromGitHub, dbus, qt5, qtbase, wrapQtAppsHook, kpackage, kcoreaddons, ... }:
|
||||
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
dbus,
|
||||
qt5,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
kpackage,
|
||||
kcoreaddons,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kwin-system76-scheduler-integration";
|
||||
version = "0.1";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxiberta";
|
||||
repo = pname;
|
||||
|
@ -25,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
mkdir -p $out/bin
|
||||
kpackagetool5 --type=KWin/Script -i . -p $out/share/kwin/scripts
|
||||
|
||||
|
@ -49,6 +60,4 @@ stdenv.mkDerivation rec {
|
|||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, linux-pam, pkg-config }:
|
||||
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
linux-pam,
|
||||
pkg-config,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lemurs";
|
||||
version = "0.3.1";
|
||||
|
@ -11,16 +16,15 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-mQXavJULD5iyOnzj72xTV0EQ1HQvj25SHsbDgfRg4lQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ linux-pam ];
|
||||
nativeBuildInputs = [pkg-config];
|
||||
buildInputs = [linux-pam];
|
||||
|
||||
cargoSha256 = "sha256-OCaIeQB8reK0089vbC+4IvQt5pKdZ2SCyyGuQEYWzjo=";
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "A customizable TUI display/login manager written in Rust";
|
||||
homepage = "https://git.atagen.co/coastalwhite/lemurs";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = [];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
18
pkgs/ly.nix
18
pkgs/ly.nix
|
@ -1,5 +1,11 @@
|
|||
{ stdenv, lib, fetchFromGitHub, linux-pam, libxcb, git }:
|
||||
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
linux-pam,
|
||||
libxcb,
|
||||
git,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ly";
|
||||
version = "0.5.0+";
|
||||
|
@ -12,9 +18,9 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git ];
|
||||
buildInputs = [ linux-pam libxcb ];
|
||||
makeFlags = [ "FLAGS=-Wno-error=unused-result" ];
|
||||
nativeBuildInputs = [git];
|
||||
buildInputs = [linux-pam libxcb];
|
||||
makeFlags = ["FLAGS=-Wno-error=unused-result"];
|
||||
|
||||
preBuildPhase = ''
|
||||
mkdir -p ./data
|
||||
|
@ -36,6 +42,6 @@ stdenv.mkDerivation rec {
|
|||
description = "TUI display manager";
|
||||
license = licenses.wtfpl;
|
||||
homepage = "https://github.com/fairyglade/ly";
|
||||
maintainers = [ ];
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
{ stdenvNoCC, lib, fetchFromGitea, }:
|
||||
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "Simplewaita";
|
||||
version = "0.1.0";
|
||||
|
@ -26,5 +29,5 @@ stdenvNoCC.mkDerivation rec {
|
|||
homepage = "https://git.disroot.org/eudaimon/Simplewaita";
|
||||
license = licenses.gpl1Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,12 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, gtk3, gtk-layer-shell, libpulseaudio }:
|
||||
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
gtk-layer-shell,
|
||||
libpulseaudio,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "SwayOSD";
|
||||
version = "0.1.0";
|
||||
|
@ -11,14 +18,12 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-3K8LlX4MrG523BwD4nZOcXgSxsnYRxxU5gCOp7rCOCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk3 gtk-layer-shell libpulseaudio ];
|
||||
nativeBuildInputs = [pkg-config];
|
||||
buildInputs = [gtk3 gtk-layer-shell libpulseaudio];
|
||||
cargoLock.lockFileContents = builtins.readFile ./swayosd.lock;
|
||||
postPatch = ''
|
||||
cp ${./swayosd.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
cargoSha256 = lib.fakeSha256;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
{ pkgs, lib, rustPlatform, fetchFromGitHub, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
...
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
||||
pname = "system76-scheduler";
|
||||
version = "1.2.2";
|
||||
|
||||
|
@ -30,5 +35,4 @@ rustPlatform.buildRustPackage rec {
|
|||
# install -Dm0644 data/com.system76.Scheduler.service $out/lib/systemd/system/com.system76.Scheduler.service
|
||||
install -Dm0644 data/com.system76.Scheduler.conf $out/etc/dbus-1/system.d/com.system76.Scheduler.conf
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue