atagen/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

big cleanup

Browse source
This commit is contained in:
atagen 2024-05-02 14:01:13 +10:00
parent 533f88f4cd
commit c7c6606d14
81 changed files with 0 additions and 8334 deletions
Download patch file Download diff file Expand all files Collapse all files

95
flakes/comfyui/flake.lock generated
View file

@ -1,95 +0,0 @@
{
"nodes": {
"comfyui-mgr": {
"flake": false,
"locked": {
"lastModified": 1714523018,
"narHash": "sha256-BsJbbWtgIx7ydyVCy4lxdJR9xAGvCdA3FDGdwcLEuSY=",
"owner": "ltdrdata",
"repo": "ComfyUI-Manager",
"rev": "393bf64b35439ee948dc71483e69c478bb05e35c",
"type": "github"
},
"original": {
"owner": "ltdrdata",
"repo": "ComfyUI-Manager",
"type": "github"
}
},
"comfyui-src": {
"flake": false,
"locked": {
"lastModified": 1714526620,
"narHash": "sha256-mQ9YBiSAR+WbGeEHd7DRdcMSz9+XF6ZrQkxrZigv2Cw=",
"owner": "comfyanonymous",
"repo": "ComfyUI",
"rev": "2aed53c4ac78d842a2e984d23343334a29ed8562",
"type": "github"
},
"original": {
"owner": "comfyanonymous",
"repo": "ComfyUI",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"comfyui-mgr": "comfyui-mgr",
"comfyui-src": "comfyui-src",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

68
flakes/comfyui/flake.nix
View file

@ -1,68 +0,0 @@
{
description = "ComfyUI";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
comfyui-src = {
url = "github:comfyanonymous/ComfyUI";
flake = false;
};
comfyui-mgr = {
url = "github:ltdrdata/ComfyUI-Manager";
flake = false;
};
};
# cuda
# micromamba
# pytorch
# triton
# comfyui
# requirements.txt
# needs some kind of mutability escape hatch for addons, models etc..
outputs = {
self,
nixpkgs,
flake-utils,
comfyui-src,
comfyui-mgr,
}:
flake-utils.lib.eachDefaultSystem (
system: let
pkgs = import nixpkgs {inherit system;};
in
with pkgs; rec {
packages.default = buildFHSEnv {
name = "ComfyUI";
targetPkgs = pkgs: (with pkgs;
with cudaPackages; [
cuda_cudart
cudnn
micromamba
]);
extraBuildCommands = ''
mkdir -p $out/opt/ComfyUI
mkdir -p $out/opt/ComfyUI/custom_nodes/ComfyUI-Manager
cp -R ${comfyui-src}/* $out/opt/ComfyUI
cp -R ${comfyui-mgr}/* $out/opt/ComfyUI/custom_nodes/ComfyUI-Manager
'';
profile = ''
ln -nfs /opt/ComfyUI/models /host/etc/comfyui/models
ln -nfs /opt/ComfyUI/custom_nodes /host/etc/comfyui/custom_nodes
'';
# cd /opt/ComfyUI
# eval "$(micromamba shell hook --shell bash)"
# micromamba activate
# micromamba install python pytorch triton
# pip install -r requirements.txt
# '';
runScript = ''
bash
# ./startup.sh
'';
};
}
);
}

54
flakes/lutgen/flake.nix
View file

@ -1,54 +0,0 @@
{
description = "Description for the project";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
lutgen-lock = {
url = "https://raw.githubusercontent.com/ozwaldorf/lutgen-rs/main/Cargo.lock";
flake = false;
};
lutgen-src = {
url = "github:ozwaldorf/lutgen-rs";
flake = false;
};
};
outputs = inputs @ {flake-parts, ...}:
flake-parts.lib.mkFlake {inherit inputs;} {
imports = [
# To import a flake module
# 1. Add foo to inputs
# 2. Add foo as a parameter to the outputs function
# 3. Add here: foo.flakeModule
];
systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"];
perSystem = {
config,
self',
inputs',
pkgs,
system,
...
}: {
# Per-system attributes can be defined here. The self' and inputs'
# module parameters provide easy access to attributes of the same
# system.
# Equivalent to inputs'.nixpkgs.legacyPackages.hello;
packages.default = pkgs.rustPlatform.buildRustPackage rec {
pname = "lutgen";
version = "git-${inputs.lutgen-src.lastModifiedDate}";
src = inputs.lutgen-src;
cargoLock = {
lockFile = inputs.lutgen-lock;
};
};
};
flake = {
# The usual flake attributes can be defined here, including system-
# agnostic ones like nixosModule and system-enumerating ones, although
# those are more easily expressed in perSystem.
};
};
}

118
flakes/qtile/flake.nix
View file

@ -1,118 +0,0 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
qtile-src = {
url = "github:qtile/qtile";
flake = false;
};
pywlroots = {
url = "path:pywlroots";
inputs.nixpkgs.follows = "nixpkgs";
};
# smartfloat = {
# url = "path:smartfloat";
# inputs.nixpkgs.follows = "nixpkgs";
# };
# scenefx = {
# url = "path:scenefx";
# inputs.nixpkgs.follows = "nixpkgs";
# };
};
outputs = inputs @ {
flake-parts,
qtile-src,
pywlroots,
...
}:
flake-parts.lib.mkFlake {inherit inputs;} {
systems = ["x86_64-linux"];
perSystem = {
config,
self',
inputs',
pkgs,
system,
...
}: rec {
packages.qtile-unwrapped = with pkgs;
with python3Packages;
buildPythonPackage rec {
pname = "qtile";
version = "unstable-${inputs.qtile-src.lastModifiedDate}";
src = inputs.qtile-src;
SETUPTOOLS_SCM_PRETEND_VERSION = "0.23.0";
postPatch = ''
substituteInPlace libqtile/pangocffi.py \
--replace libgobject-2.0.so.0 ${pkgs.glib.out}/lib/libgobject-2.0.so.0 \
--replace libpangocairo-1.0.so.0 ${pkgs.pango.out}/lib/libpangocairo-1.0.so.0 \
--replace libpango-1.0.so.0 ${pkgs.pango.out}/lib/libpango-1.0.so.0
substituteInPlace libqtile/backend/x11/xcursors.py \
--replace libxcb-cursor.so.0 ${pkgs.xcb-util-cursor.out}/lib/libxcb-cursor.so.0
substituteInPlace libqtile/backend/wayland/cffi/cairo_buffer.py \
--replace drm_fourcc.h libdrm/drm_fourcc.h
substituteInPlace libqtile/backend/wayland/cffi/build.py \
--replace /usr/include/pixman-1 ${lib.getDev pkgs.pixman}/include \
--replace /usr/include/libdrm ${lib.getDev pkgs.libdrm}/include/libdrm
'';
nativeBuildInputs = [
pkg-config
setuptools-scm
setuptools
];
propagatedBuildInputs = [
xcffib
(cairocffi.override {withXcffib = true;})
python-dateutil
dbus-python
dbus-next
mpd2
psutil
pulsectl-asyncio
pyxdg
pygobject3
pywayland
inputs'.pywlroots.packages.default
xkbcommon
];
buildInputs = [
libinput
libxkbcommon
libdrm
wayland
xorg.xcbutilwm
# inputs'.scenefx.packages.default
((wlroots_0_16.override {
xwayland = xwayland;
enableXWayland = true;
})
.overrideAttrs (wf: wp: {
postPatch =
wp.postPatch
+ ''
substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
'';
}))
];
# patches = [./scenefx.patch];
makeWrapperArgs = [
"--suffix PATH : ${lib.makeBinPath [mypy]}"
];
doCheck = false;
};
packages.qtile = with pkgs;
with python3Packages;
(python3.withPackages (_: [packages.qtile-unwrapped])).overrideAttrs (_: {
inherit (packages.qtile-unwrapped) pname version meta;
name = with packages.qtile-unwrapped; "${pname}-${version}";
passthru.unwrapped = packages.qtile-unwrapped;
});
};
};
}

74
flakes/qtile/pywlroots/flake.nix
View file

@ -1,74 +0,0 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
pywlroots-src = {
url = "github:flacjacket/pywlroots";
flake = false;
};
};
outputs = inputs @ {
flake-parts,
pywlroots-src,
...
}:
flake-parts.lib.mkFlake {inherit inputs;} {
systems = ["x86_64-linux"];
perSystem = {
config,
self',
inputs',
pkgs,
system,
...
}: {
packages.default = with pkgs;
with pkgs.python3Packages;
buildPythonPackage rec {
pname = "pywlroots";
version = "unstable-${inputs.pywlroots-src.lastModifiedDate}";
format = "setuptools";
disable = pythonOlder "3.7";
src = inputs.pywlroots-src;
nativeBuildInputs = [pkg-config];
propagatedNativeBuildInputs = [cffi];
buildInputs = [
libinput
libxkbcommon
pixman
xorg.libxcb
xorg.xcbutilwm
udev
wayland
((wlroots_0_16.override {
xwayland = xwayland;
enableXWayland = true;
})
.overrideAttrs (wf: wp: {
postPatch =
wp.postPatch
+ ''
substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
'';
}))
];
propagatedBuildInputs = [
cffi
pywayland
xkbcommon
];
nativeCheckInputs = [pytestCheckHook];
postBuild = ''
${python3.pythonOnBuildForHost.interpreter} wlroots/ffi_build.py
'';
pythonImportsCheck = ["wlroots"];
passthru.test = {inherit qtile;};
};
};
}; #/mkFlake
}

34
flakes/qtile/pywlroots/scenefx.patch
View file

@ -1,34 +0,0 @@
diff --git a/wlroots/ffi_build.py b/wlroots/ffi_build.py
index ec01f8b..cac6dd8 100755
--- a/wlroots/ffi_build.py
+++ b/wlroots/ffi_build.py
@@ -1891,6 +1891,12 @@ void wlr_scene_buffer_set_dest_size(struct wlr_scene_buffer *scene_buffer,
void wlr_scene_buffer_set_transform(struct wlr_scene_buffer *scene_buffer,
enum wl_output_transform transform);
+void wlr_scene_buffer_set_opacity(struct wlr_scene_buffer *scene_buffer,
+ float opacity);
+
+void wlr_scene_buffer_set_corner_radius(struct wlr_scene_buffer *scene_buffer,
+ int radii);
+
void wlr_scene_buffer_send_frame_done(struct wlr_scene_buffer *scene_buffer,
struct timespec *now);
diff --git a/wlroots/wlr_types/scene.py b/wlroots/wlr_types/scene.py
index 3a99d2f..2f3d5ba 100755
--- a/wlroots/wlr_types/scene.py
+++ b/wlroots/wlr_types/scene.py
@@ -170,6 +170,12 @@ class SceneBuffer(Ptr):
region_ptr = region._ptr if region else ffi.NULL
lib.wlr_scene_buffer_set_buffer_with_damage(self._ptr, buffer_ptr, region_ptr)
+ def set_opacity(self, opacity: float) -> None:
+ lib.wlr_scene_buffer_set_opacity(self._ptr, opacity)
+
+ def set_corner_radius(self, radii: int) -> None:
+ lib.wlr_scene_buffer_set_corner_radius(self._ptr, radii)
+
T = TypeVar("T")
BufferCallback = Callable[[SceneBuffer, int, int, T], None]

35
flakes/qtile/smartfloat/flake.nix
View file

@ -1,35 +0,0 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
};
outputs = inputs @ {flake-parts, ...}:
flake-parts.lib.mkFlake {inherit inputs;} {
systems = ["x86_64-linux"];
perSystem = {
config,
self',
inputs',
pkgs,
system,
...
}: {
packages.default = with pkgs;
stdenv.mkDerivation rec {
pname = "smartfloat";
version = "0.1.0";
src = builtins.path {
name = "smartfloat";
path = ./smartfloat.py;
sha256 = "62fe831a0e4d2e02fee85928f844992418d1a94a8eacd5336f1e51d4490adb31";
};
unpackPhase = ''
cp $src $out
'';
};
};
};
}

108
flakes/qtile/smartfloat/smartfloat.py
View file

@ -1,108 +0,0 @@
from __future__ import annotations
from typing import TYPE_CHECKING
from libqtile.backend.base import Window
from libqtile.config import ScreenRect
from libqtile.layout.base import Layout
from typing import List
class SmartWindow:
def __init__(self, payload, x: int, y: int, w: int, h: int) -> None:
self.payload = payload
self.x: int = x
self.y: int = y
self.w: int = w
self.h: int = h
def intersect(self, window) -> bool:
return \
abs((self.x + self.w/2) - (window.x + window.w/2)) * 2 \
< (self.w + window.w) and \
abs((self.y + self.h/2) - (window.y + window.h/2)) * 2 \
< (self.h + window.h)
def __repr__(self):
return "<SmartWindow containing" + \
f"{self.payload} at {self.x}, {self.y}, {self.w}, {self.h}>"
class SmartFloat(Layout):
defaults = [
('name', 'SmartFloat', 'Layout name'),
]
def __init__(self, **config) -> None:
Layout.__init__(self, **config)
self.add_defaults(SmartFloat.defaults)
self.windows: List[SmartWindow] = []
self.dims: ScreenRect | None = None
self.focused: Window | None = None
def find_window(self, client: Window) -> SmartWindow | None:
for window in self.windows:
if window.payload == client:
return window
return None
def add_client(self, client: Window) -> None:
self.windows.append(SmartWindow(client, 0, 0, 600, 600))
def remove(self, client: Window) -> None:
window = self.find_window(client)
if window:
self.windows.remove(window)
def configure(self, client: Window, screen_rect: ScreenRect) -> None:
self.dims = screen_rect
window = self.find_window(client)
if not window:
return
if len(self.windows) == 1:
window.x = screen_rect.x + screen_rect.width // 3
window.y = screen_rect.y + screen_rect.height // 3
window.w = screen_rect.width // 2
window.h = screen_rect.height // 2
# else:
# for other_window in self.windows:
# if not other_window == window and window.intersect(other_window):
# diff_x = window.x - other_window.x
# diff_y = window.y - other_window.y
client.place(
window.x,
window.y,
window.w,
window.h,
self.border_width,
getattr(self, "border_" + "focus" if client.has_focus else "normal"),
above=True
)
client.unhide()
@abstract_method
def focus_first(self):
return None
@abstract_method
def focus_last(self):
return None
@abstract_method
def focus_next(self):
return None
@abstract_method
def focus_previous(self):
return None
@abstract_method
def next(self):
return None
@abstract_method
def previous(self):
return None

147
flakes/swayosd/flake.lock generated
View file

@ -1,147 +0,0 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1704722960,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay",
"swayosd-src": "swayosd-src"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1705025860,
"narHash": "sha256-9vcqo5CJLOHU63S7pVlP0u4OhgJxrXebQR4vqMPXLRg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d458975da373a37422577886566fce8201bc1254",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"swayosd-src": {
"flake": false,
"locked": {
"lastModified": 1702248404,
"narHash": "sha256-3NJHZv4Ed7haUUmE9JV9Yl4rRnJlPqQFv53Xuw0q+IY=",
"owner": "ErikReider",
"repo": "SwayOSD",
"rev": "a0709bcd89d6ca19889486972bac35e69f1fa8e4",
"type": "github"
},
"original": {
"owner": "ErikReider",
"repo": "SwayOSD",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

71
flakes/swayosd/flake.nix
View file

@ -1,71 +0,0 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
swayosd-src = {
url = "github:ErikReider/SwayOSD";
flake = false;
};
rust-overlay.url = "github:oxalica/rust-overlay";
};
outputs = inputs @ {
self,
nixpkgs,
rust-overlay,
flake-utils,
...
}:
flake-utils.lib.eachDefaultSystem (
system: let
overlays = [(import rust-overlay)];
pkgs = import nixpkgs {
inherit system overlays;
};
in
with pkgs; {
packages.default = stdenv.mkDerivation {
pname = "swayosd";
version = "unstable-${inputs.swayosd-src.lastModifiedDate}";
src = inputs.swayosd-src;
cargoDeps = rustPlatform.importCargoLock {
lockFile = "${inputs.swayosd-src}/Cargo.lock";
};
nativeBuildInputs = [
wrapGAppsHook
pkg-config
meson
ninja
glib
sassc
rustPlatform.cargoSetupHook
(rust-bin.selectLatestNightlyWith (toolchain: toolchain.default))
];
buildInputs = [
gtk-layer-shell
libevdev
libinput
libpulseaudio
udev
systemd
];
patches = [
./systemd.patch
];
postPatch = ''
substituteInPlace data/udev/99-swayosd.rules \
--replace /bin/chgrp ${coreutils}/bin/chgrp \
--replace /bin/chmod ${coreutils}/bin/chmod
'';
};
}
);
}

18
flakes/swayosd/systemd.patch
View file

@ -1,18 +0,0 @@
diff --git a/data/meson.build b/data/meson.build
index fc687a5..68decdf 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -41,11 +42,7 @@ configure_file(
# Systemd service unit
systemd = dependency('systemd', required: false)
-if systemd.found()
- systemd_service_install_dir = systemd.get_variable(pkgconfig :'systemdsystemunitdir')
-else
- systemd_service_install_dir = join_paths(libdir, 'systemd', 'system')
-endif
+systemd_service_install_dir = join_paths(libdir, 'systemd', 'system')
configure_file(
configuration: conf_data,