refactor(repo): change a bunch of everything

This commit is contained in:
Artur Manuel 2025-02-17 04:40:13 +00:00
commit 81bee82c34
Signed by: amadaluzia
SSH key fingerprint: SHA256:Zwg7gBuZyaG48ucAZneJwltiXu0+tJb7c3lYt9AYlLg
26 changed files with 352 additions and 127 deletions

View file

@ -0,0 +1,34 @@
From 7973ea6a0e2e94a3b31a4c7b87834d49b7f195bb Mon Sep 17 00:00:00 2001
From: Artur Manuel <balkenix@outlook.com>
Date: Tue, 11 Feb 2025 16:42:07 +0000
Subject: [PATCH] feat(env): add NEOVIDE_CONFIG env var
---
src/settings/config.rs | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/settings/config.rs b/src/settings/config.rs
index 705f046..bd8c764 100644
--- a/src/settings/config.rs
+++ b/src/settings/config.rs
@@ -28,9 +28,14 @@ fn neovide_config_dir() -> PathBuf {
}
pub fn config_path() -> PathBuf {
- let mut config_path = neovide_config_dir();
- config_path.push(CONFIG_FILE);
- config_path
+ env::var("NEOVIDE_CONFIG")
+ .ok()
+ .map(PathBuf::from)
+ .filter(|path| path.is_file() && path.exists())
+ .unwrap_or_else(|| {
+ eprintln!("Not a valid config path! Using XDG_CONFIG_HOME.");
+ neovide_config_dir().join("config.toml")
+ })
}
#[derive(Debug, Deserialize, Default, Clone)]
--
2.47.2

View file

@ -0,0 +1,8 @@
{neovide, ...}:
neovide.overrideAttrs (finalAttrs: {
patches =
(finalAttrs.patches or [])
++ [
./0001-feat-env-add-NEOVIDE_CONFIG-env-var.patch
];
})

View file

@ -0,0 +1,147 @@
From fafce5e8cc92f11c476c1c8079f73cdd038acc54 Mon Sep 17 00:00:00 2001
From: Artur Manuel <amad@atl.tools>
Date: Sun, 16 Feb 2025 03:31:46 +0000
Subject: [PATCH] ipc: _{90,180,270} => Normal{90,180,270}
---
niri-ipc/src/lib.rs | 6 +++---
src/dbus/mutter_display_config.rs | 12 ++++++------
src/ipc/client.rs | 6 +++---
src/protocols/output_management.rs | 6 +++---
src/render_helpers/clipped_surface.rs | 4 ++--
src/utils/mod.rs | 12 ++++++------
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/niri-ipc/src/lib.rs b/niri-ipc/src/lib.rs
index 3a585eb3..a6b90d25 100644
--- a/niri-ipc/src/lib.rs
+++ b/niri-ipc/src/lib.rs
@@ -903,13 +903,13 @@ pub enum Transform {
Normal,
/// Rotated by 90°.
#[serde(rename = "90")]
- _90,
+ Normal90,
/// Rotated by 180°.
#[serde(rename = "180")]
- _180,
+ Normal180,
/// Rotated by 270°.
#[serde(rename = "270")]
- _270,
+ Normal270,
/// Flipped horizontally.
Flipped,
/// Rotated by 90° and flipped horizontally.
diff --git a/src/dbus/mutter_display_config.rs b/src/dbus/mutter_display_config.rs
index b8ab08f9..dd553555 100644
--- a/src/dbus/mutter_display_config.rs
+++ b/src/dbus/mutter_display_config.rs
@@ -136,9 +136,9 @@ impl DisplayConfig {
if let Some(logical) = output.logical.as_ref() {
let transform = match logical.transform {
niri_ipc::Transform::Normal => 0,
- niri_ipc::Transform::_90 => 1,
- niri_ipc::Transform::_180 => 2,
- niri_ipc::Transform::_270 => 3,
+ niri_ipc::Transform::Normal90 => 1,
+ niri_ipc::Transform::Normal180 => 2,
+ niri_ipc::Transform::Normal270 => 3,
niri_ipc::Transform::Flipped => 4,
niri_ipc::Transform::Flipped90 => 5,
niri_ipc::Transform::Flipped180 => 6,
@@ -201,9 +201,9 @@ impl DisplayConfig {
scale: Some(niri_config::FloatOrInt(requested_config.scale)),
transform: match requested_config.transform {
0 => niri_ipc::Transform::Normal,
- 1 => niri_ipc::Transform::_90,
- 2 => niri_ipc::Transform::_180,
- 3 => niri_ipc::Transform::_270,
+ 1 => niri_ipc::Transform::Normal90,
+ 2 => niri_ipc::Transform::Normal180,
+ 3 => niri_ipc::Transform::Normal270,
4 => niri_ipc::Transform::Flipped,
5 => niri_ipc::Transform::Flipped90,
6 => niri_ipc::Transform::Flipped180,
diff --git a/src/ipc/client.rs b/src/ipc/client.rs
index 8682d8d3..db1b614a 100644
--- a/src/ipc/client.rs
+++ b/src/ipc/client.rs
@@ -466,9 +466,9 @@ fn print_output(output: Output) -> anyhow::Result<()> {
let transform = match transform {
Transform::Normal => "normal",
- Transform::_90 => "90° counter-clockwise",
- Transform::_180 => "180°",
- Transform::_270 => "270° counter-clockwise",
+ Transform::Normal90 => "90° counter-clockwise",
+ Transform::Normal180 => "180°",
+ Transform::Normal270 => "270° counter-clockwise",
Transform::Flipped => "flipped horizontally",
Transform::Flipped90 => "90° counter-clockwise, flipped horizontally",
Transform::Flipped180 => "flipped vertically",
diff --git a/src/protocols/output_management.rs b/src/protocols/output_management.rs
index 4f1ac8c0..411e9eb6 100644
--- a/src/protocols/output_management.rs
+++ b/src/protocols/output_management.rs
@@ -666,9 +666,9 @@ where
zwlr_output_configuration_head_v1::Request::SetTransform { transform } => {
let transform = match transform {
WEnum::Value(WlTransform::Normal) => Transform::Normal,
- WEnum::Value(WlTransform::_90) => Transform::_90,
- WEnum::Value(WlTransform::_180) => Transform::_180,
- WEnum::Value(WlTransform::_270) => Transform::_270,
+ WEnum::Value(WlTransform::_90) => Transform::Normal90,
+ WEnum::Value(WlTransform::_180) => Transform::Normal180,
+ WEnum::Value(WlTransform::_270) => Transform::Normal270,
WEnum::Value(WlTransform::Flipped) => Transform::Flipped,
WEnum::Value(WlTransform::Flipped90) => Transform::Flipped90,
WEnum::Value(WlTransform::Flipped180) => Transform::Flipped180,
diff --git a/src/render_helpers/clipped_surface.rs b/src/render_helpers/clipped_surface.rs
index f8d074e9..303b81b3 100644
--- a/src/render_helpers/clipped_surface.rs
+++ b/src/render_helpers/clipped_surface.rs
@@ -55,8 +55,8 @@ impl<R: NiriRenderer> ClippedSurfaceRenderElement<R> {
let transform = elem.transform();
// HACK: ??? for some reason flipped ones are fine.
let transform = match transform {
- Transform::_90 => Transform::_270,
- Transform::_270 => Transform::_90,
+ Transform::Normal90 => Transform::Normal270,
+ Transform::Normal270 => Transform::Normal90,
x => x,
};
let transform_matrix = Mat3::from_translation(Vec2::new(0.5, 0.5))
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index e43bad89..274e45ca 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -148,9 +148,9 @@ pub fn logical_output(output: &Output) -> niri_ipc::LogicalOutput {
let size = output_size(output);
let transform = match output.current_transform() {
Transform::Normal => niri_ipc::Transform::Normal,
- Transform::_90 => niri_ipc::Transform::_90,
- Transform::_180 => niri_ipc::Transform::_180,
- Transform::_270 => niri_ipc::Transform::_270,
+ Transform::Normal90 => niri_ipc::Transform::Normal90,
+ Transform::Normal180 => niri_ipc::Transform::Normal180,
+ Transform::Normal270 => niri_ipc::Transform::Normal270,
Transform::Flipped => niri_ipc::Transform::Flipped,
Transform::Flipped90 => niri_ipc::Transform::Flipped90,
Transform::Flipped180 => niri_ipc::Transform::Flipped180,
@@ -169,9 +169,9 @@ pub fn logical_output(output: &Output) -> niri_ipc::LogicalOutput {
pub fn ipc_transform_to_smithay(transform: niri_ipc::Transform) -> Transform {
match transform {
niri_ipc::Transform::Normal => Transform::Normal,
- niri_ipc::Transform::_90 => Transform::_90,
- niri_ipc::Transform::_180 => Transform::_180,
- niri_ipc::Transform::_270 => Transform::_270,
+ niri_ipc::Transform::Normal90 => Transform::Normal90,
+ niri_ipc::Transform::Normal180 => Transform::Normal180,
+ niri_ipc::Transform::Normal270 => Transform::Normal270,
niri_ipc::Transform::Flipped => Transform::Flipped,
niri_ipc::Transform::Flipped90 => Transform::Flipped90,
niri_ipc::Transform::Flipped180 => Transform::Flipped180,
--
2.47.2

View file

@ -0,0 +1,19 @@
{
niri,
fetchFromGitHub,
...
}:
niri.overrideAttrs (finalAttrs: {
src = fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
rev = "master";
hash = "sha256-BVTlrmelSAq+rlxwlRvsyZxHrmcviRu3aHJYG37Yq8c=";
};
patches =
(finalAttrs.patches or [])
++ [
./0001-ipc-_-90-180-270-Normal-90-180-270.patch
];
cargoHash = "";
})

View file

@ -0,0 +1,42 @@
From 8c96feb6397d4a5756dbeab1aedb7d2266c9218f Mon Sep 17 00:00:00 2001
From: Artur Manuel <balkenix@outlook.com>
Date: Tue, 11 Feb 2025 23:22:35 +0000
Subject: [PATCH] feat(config): add NUSHELL_CONFIG_DIR env var
---
crates/nu-path/src/helpers.rs | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/crates/nu-path/src/helpers.rs b/crates/nu-path/src/helpers.rs
index 931b3f9d0..cd3c07d95 100644
--- a/crates/nu-path/src/helpers.rs
+++ b/crates/nu-path/src/helpers.rs
@@ -1,4 +1,5 @@
use std::path::PathBuf;
+use std::env;
use crate::AbsolutePathBuf;
@@ -18,10 +19,15 @@ pub fn cache_dir() -> Option<AbsolutePathBuf> {
/// Return the nushell config directory.
pub fn nu_config_dir() -> Option<AbsolutePathBuf> {
- configurable_dir_path("XDG_CONFIG_HOME", dirs::config_dir).map(|mut p| {
- p.push("nushell");
- p
- })
+ let NUSHELL_CONFIG_DIR: Result<String, env::VarError> = env::var("NUSHELL_CONFIG_DIR");
+
+ match NUSHELL_CONFIG_DIR {
+ Ok(val) => Some(AbsolutePathBuf::try_from(val).unwrap()),
+ Err(_) => configurable_dir_path("XDG_CONFIG_HOME", dirs::config_dir).map(|mut p| {
+ p.push("nushell");
+ p
+ })
+ }
}
fn configurable_dir_path(
--
2.47.2

View file

@ -0,0 +1,54 @@
# config.nu
#
# Installed by:
# version = "0.101.0"
#
# This file is used to override default Nushell settings, define
# (or import) custom commands, or run any other startup tasks.
# See https://www.nushell.sh/book/configuration.html
#
# This file is loaded after env.nu and before login.nu
#
# You can open this file in your default editor using:
# config nu
#
# See `help config nu` for more options
#
# You can remove these comments if you want or leave
# them for future reference.
# Alias the built-in ls command to `ls!`, I like to pretend it's like the Nix/Haskell prime.
alias ls! = ls
# List the filenames, sizes, and modification times of items in a directory.
def ls [
--all (-a), # Show hidden files
--long (-l), # Get all available columns for each entry (slower; columns are platform-dependent)
--short-names (-s), # Only print the file names, and not the path
--full-paths (-f), # display paths as absolute paths
--du (-d), # Display the apparent directory size ("disk usage") in place of the directory metadata size
--directory (-D), # List the specified directory itself instead of its contents
--mime-type (-m), # Show mime-type in type column instead of 'file' (based on filenames only; files' contents are not examined)
--threads (-t), # Use multiple threads to list contents. Output will be non-deterministic.
...pattern: glob, # The glob pattern to use.
]: [ nothing -> table ] {
let pattern = if ($pattern | is-empty) { [ '.' ] } else { $pattern }
(ls!
--all=$all
--long=$long
--short-names=$short_names
--full-paths=$full_paths
--du=$du
--directory=$directory
--mime-type=$mime_type
--threads=$threads
...$pattern
) | sort-by type name -i
}
alias nos = nh os
alias e = ^$env.EDITOR
mkdir ($nu.data-dir | path join "vendor/autoload")
starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.nu")
zoxide init nushell --cmd j | save -f ($nu.data-dir | path join "vendor/autoload/zoxide.nu")

View file

@ -0,0 +1,37 @@
# env.nu
#
# Installed by:
# version = "0.101.0"
#
# Previously, environment variables were typically configured in `env.nu`.
# In general, most configuration can and should be performed in `config.nu`
# or one of the autoload directories.
#
# This file is generated for backwards compatibility for now.
# It is loaded before config.nu and login.nu
#
# See https://www.nushell.sh/book/configuration.html
#
# Also see `help config env` for more options.
#
# You can remove these comments if you want or leave
# them for future reference.
$env.config = {
hooks: {
pre_prompt: [{ ||
if (which direnv | is-empty) {
return
}
direnv export json | from json | default {} | load-env
if 'ENV_CONVERSIONS' in $env and 'PATH' in $env.ENV_CONVERSIONS {
$env.PATH = do $env.ENV_CONVERSIONS.PATH.from_string $env.PATH
}
}]
}
table: {
mode: "heavy"
}
show_banner: false
}

View file

@ -0,0 +1,38 @@
{
symlinkJoin,
nushell,
zoxide,
makeWrapper,
system,
inputs,
}:
symlinkJoin {
name = "nu";
paths = [
nushell
inputs.self.packages.${system}.amadaluzian-starship
zoxide
];
nativeBuildInputs = [
makeWrapper
];
passthru = {
inherit (nushell.passthru) shellPath;
};
meta = {
inherit (nushell.meta) mainProgram;
};
postBuild = ''
wrapProgram $out/bin/nu \
--set NUSHELL_CONFIG_DIR "${./cfg}" \
--add-flags "--env-config" \
--add-flags "${./cfg/env.nu}" \
--add-flags "--config" \
--add-flags "${./cfg/config.nu}" \
'';
}

View file

@ -0,0 +1,158 @@
{
symlinkJoin,
starship,
makeWrapper,
writers,
...
}: let
config = writers.writeTOML "starship.toml" {
aws = {symbol = "aws ";};
azure = {symbol = "az ";};
bun = {symbol = "bun ";};
c = {symbol = "C ";};
character = {
error_symbol = "[x](bold red)";
success_symbol = "[>](bold green)";
vimcmd_symbol = "[<](bold green)";
};
cmake = {symbol = "cmake ";};
cmd_duration = {format = "\\[[$duration]($style)\\] ";};
cobol = {symbol = "cobol ";};
conda = {symbol = "conda ";};
crystal = {symbol = "cr ";};
daml = {symbol = "daml ";};
dart = {symbol = "dart ";};
deno = {symbol = "deno ";};
directory = {
read_only = " ro";
format = ":[$path]($style) ";
};
docker_context = {symbol = "docker ";};
dotnet = {symbol = ".NET ";};
elixir = {symbol = "exs ";};
elm = {symbol = "elm ";};
fennel = {symbol = "fnl ";};
fossil_branch = {symbol = "fossil ";};
gcloud = {symbol = "gcp ";};
git_branch = {format = "\\[[$branch(:$remote_branch)]($style)\\] ";};
git_commit = {tag_symbol = " tag ";};
git_status = {
ahead = ">";
behind = "<";
deleted = "x";
diverged = "<>";
renamed = "r";
format = "\\[[$all_status$ahead_behind]($style)\\] ";
};
gleam = {symbol = "gleam ";};
golang = {symbol = "go ";};
gradle = {symbol = "gradle ";};
guix_shell = {symbol = "guix ";};
hg_branch = {symbol = "hg ";};
java = {symbol = "java ";};
julia = {symbol = "jl ";};
kotlin = {symbol = "kt ";};
lua = {symbol = "lua ";};
memory_usage = {symbol = "memory ";};
meson = {symbol = "meson ";};
nats = {symbol = "nats ";};
nim = {symbol = "nim ";};
nix_shell = {format = "\\[[$state( \($name\))]($style)\\] ";};
nodejs = {symbol = "nodejs ";};
ocaml = {symbol = "ml ";};
opa = {symbol = "opa ";};
os = {
disabled = false;
symbols = {
AIX = "aix ";
AlmaLinux = "alma ";
Alpaquita = "alq ";
Alpine = "alp ";
Amazon = "amz ";
Android = "andr ";
Arch = "rch ";
Artix = "atx ";
CentOS = "cent ";
Debian = "deb ";
DragonFly = "dfbsd ";
Emscripten = "emsc ";
EndeavourOS = "ndev ";
Fedora = "fed ";
FreeBSD = "fbsd ";
Garuda = "garu ";
Gentoo = "gent ";
HardenedBSD = "hbsd ";
Illumos = "lum ";
Kali = "kali ";
Linux = "lnx ";
Mabox = "mbox ";
Macos = "mac ";
Manjaro = "mjo ";
Mariner = "mrn ";
MidnightBSD = "mid ";
Mint = "mint ";
NetBSD = "nbsd ";
NixOS = "nix ";
OpenBSD = "obsd ";
OpenCloudOS = "ocos ";
OracleLinux = "orac ";
Pop = "pop ";
Raspbian = "rasp ";
RedHatEnterprise = "rhel ";
Redhat = "rhl ";
Redox = "redox ";
RockyLinux = "rky ";
SUSE = "suse ";
Solus = "sol ";
Ubuntu = "ubnt ";
Ultramarine = "ultm ";
Unknown = "unk ";
Void = "void ";
Windows = "win ";
openEuler = "oeul ";
openSUSE = "osuse ";
};
};
package = {symbol = "pkg ";};
perl = {symbol = "pl ";};
php = {symbol = "php ";};
pijul_channel = {symbol = "pijul ";};
pulumi = {symbol = "pulumi ";};
purescript = {symbol = "purs ";};
python = {symbol = "py ";};
quarto = {symbol = "quarto ";};
raku = {symbol = "raku ";};
ruby = {symbol = "rb ";};
rust = {symbol = "rs ";};
scala = {symbol = "scala ";};
solidity = {symbol = "solidity ";};
spack = {symbol = "spack ";};
status = {symbol = "[x](bold red) ";};
sudo = {symbol = "sudo ";};
swift = {symbol = "swift ";};
terraform = {symbol = "terraform ";};
typst = {symbol = "typst ";};
zig = {symbol = "zig ";};
username = {
show_always = true;
format = "[$user]($style)@";
};
hostname = {
ssh_only = false;
format = "[$ssh_symbol$hostname]($style)";
};
};
in
symlinkJoin {
name = "starship";
paths = [
starship
];
nativeBuildInputs = [
makeWrapper
];
postBuild = ''
wrapProgram $out/bin/starship \
--set STARSHIP_CONFIG ${config}
'';
}

View file

@ -0,0 +1 @@
execx($(zoxide init xonsh --cmd j), 'exec', __xonsh__.ctx, filename='zoxide')

View file

@ -0,0 +1,101 @@
{
makeWrapper,
fetchFromGitHub,
symlinkJoin,
python3,
inputs,
system,
zoxide,
}: let
xonsh =
python3
.withPackages (ps: [
ps.xonsh
(let
pname = "xontrib-fish-completer";
version = "0.0.1";
in
ps.buildPythonPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "xonsh";
repo = pname;
rev = version;
hash = "sha256-PhhdZ3iLPDEIG9uDeR5ctJ9zz2+YORHBhbsiLrJckyA=";
};
})
(let
pname = "xontrib-prompt-starship";
version = "0.3.6";
in
ps.buildPythonPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "anki-code";
repo = pname;
tag = version;
hash = "sha256-CLOvMa3L4XnH53H/k6/1W9URrPakPjbX1T1U43+eSR0=";
};
})
(let
pname = "xontrib-init-ssh-agent";
version = "1.0.1";
in
ps.buildPythonPackage {
inherit pname version;
pyproject = true;
build-system = [
ps.setuptools
ps.wheel
];
dependencies = [
ps.xonsh
];
src = fetchFromGitHub {
owner = "amadaluzia";
repo = pname;
rev = "cac9cfec70ec15b0ed4f1c8a18154ea9b4f8fb47";
hash = "sha256-UkRPdaZFNP8qv7lMwsTUalnre3k2UMfqMzmiTveLiBM=";
};
})
(let
pname = "xonsh-direnv";
version = "1.6.5";
in
ps.buildPythonPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "74th";
repo = pname;
tag = version;
hash = "sha256-huBJ7WknVCk+WgZaXHlL+Y1sqsn6TYqMP29/fsUPSyU=";
};
})
]);
in
symlinkJoin {
name = "xonsh";
paths = [
xonsh
inputs.self.packages.${system}.amadaluzian-starship
zoxide
];
nativeBuildInputs = [
makeWrapper
];
postBuild = ''
wrapProgram $out/bin/xonsh \
--set XONSH_CONFIG_DIR ${./cfg}
'';
passthru = {
shellPath = "/bin/xonsh";
};
meta = {
mainProgram = "xonsh";
};
}

View file

@ -0,0 +1,14 @@
{
colloid-icon-theme,
fetchFromGitHub,
...
}:
colloid-icon-theme.overrideAttrs (_finalAttrs: {
version = "master";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "Colloid-icon-theme";
rev = "main";
hash = "sha256-x2SSaIkKm1415avO7R6TPkpghM30HmMdjMFUUyPWZsk=";
};
})

View file

@ -0,0 +1,22 @@
{
stdenvNoCC,
fetchzip,
lib,
...
}:
stdenvNoCC.mkDerivation {
pname = "fairfax";
version = "20240601";
src = lib.cleanSourceWith {
filter = _path: type: type == "regular";
src = fetchzip {
url = "https://github.com/kreativekorp/open-relay/releases/download/2024-06-01/Fairfax.zip";
hash = "sha256-rUl/C250pJBal69ThtWhPMFe182nnZmk5UUA7eDrZeA=";
stripRoot = false;
};
};
installPhase = ''
mkdir -p $out/share/fonts/Fairfax
cp *.ttf $out/share/fonts/Fairfax
'';
}

View file

@ -0,0 +1,15 @@
{
symlinkJoin,
nicotine-plus,
makeWrapper,
...
}:
symlinkJoin {
name = "nicotine";
paths = [nicotine-plus];
nativeBuildInputs = [makeWrapper];
postBuild = ''
wrapProgram $out/bin/nicotine \
--set-default NICOTINE_LIBADWAITA 1
'';
}

View file

@ -0,0 +1,14 @@
# generated by zon2nix (https://github.com/nix-community/zon2nix)
{
linkFarm,
fetchzip,
}:
linkFarm "zig-packages" [
{
name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE=";
};
}
]

View file

@ -0,0 +1,39 @@
{
stdenv,
fetchgit,
zig_0_13,
callPackage,
wayland-scanner,
wayland-protocols,
wayland,
pkg-config,
...
}:
stdenv.mkDerivation (finalAttrs: {
pname = "river-bedload";
version = "0.1.1";
src = fetchgit {
url = "https://git.sr.ht/~novakane/${finalAttrs.pname}";
rev = "v${finalAttrs.version}";
hash = "sha256-AMxFdKVy4E1xVdimqxm8KZW39krk/Mt27MWLxEiq1JA=";
};
deps = callPackage ./build.zig.zon.nix {};
zigBuildFlags = [
"--system"
"${finalAttrs.deps}"
];
nativeBuildInputs = [
zig_0_13.hook
pkg-config
wayland-scanner
];
buildInputs = [
wayland
wayland-protocols
];
})

View file

@ -0,0 +1,14 @@
{
rose-pine-gtk-theme,
fetchFromGitHub,
...
}:
rose-pine-gtk-theme.overrideAttrs (_finalAttrs: {
version = "master";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "gtk";
tag = "master";
hash = "sha256-vCWs+TOVURl18EdbJr5QAHfB+JX9lYJ3TPO6IklKeFE=";
};
})

View file

@ -0,0 +1,81 @@
From a52410caac1d1e489c6379e95acadb4a93a40d16 Mon Sep 17 00:00:00 2001
From: Artur Manuel <balkenix@outlook.com>
Date: Sun, 9 Feb 2025 17:32:58 +0000
Subject: [PATCH] fix(links): remove symbolic links
---
links/24/panel/org.xfce.panel.showdesktop.svg | 1 -
links/24/panel/org.xfce.xfdesktop.svg | 1 -
links/24/panel/preferences-system-bluetooth-activated.svg | 1 -
links/24/panel/preferences-system-bluetooth-inactive.svg | 1 -
links/24/panel/preferences-system-bluetooth.svg | 1 -
links/scalable/apps/kerry.svg | 1 -
links/scalable/apps/org.kde.kfind.svg | 1 -
7 files changed, 7 deletions(-)
delete mode 120000 links/24/panel/org.xfce.panel.showdesktop.svg
delete mode 120000 links/24/panel/org.xfce.xfdesktop.svg
delete mode 120000 links/24/panel/preferences-system-bluetooth-activated.svg
delete mode 120000 links/24/panel/preferences-system-bluetooth-inactive.svg
delete mode 120000 links/24/panel/preferences-system-bluetooth.svg
delete mode 120000 links/scalable/apps/kerry.svg
delete mode 120000 links/scalable/apps/org.kde.kfind.svg
diff --git a/links/24/panel/org.xfce.panel.showdesktop.svg b/links/24/panel/org.xfce.panel.showdesktop.svg
deleted file mode 120000
index 8f1a5a03..00000000
--- a/links/24/panel/org.xfce.panel.showdesktop.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-desktop.svg
\ No newline at end of file
diff --git a/links/24/panel/org.xfce.xfdesktop.svg b/links/24/panel/org.xfce.xfdesktop.svg
deleted file mode 120000
index 8f1a5a03..00000000
--- a/links/24/panel/org.xfce.xfdesktop.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-desktop.svg
\ No newline at end of file
diff --git a/links/24/panel/preferences-system-bluetooth-activated.svg b/links/24/panel/preferences-system-bluetooth-activated.svg
deleted file mode 120000
index 6e9e06d1..00000000
--- a/links/24/panel/preferences-system-bluetooth-activated.svg
+++ /dev/null
@@ -1 +0,0 @@
-network-bluetooth-activated.svg
\ No newline at end of file
diff --git a/links/24/panel/preferences-system-bluetooth-inactive.svg b/links/24/panel/preferences-system-bluetooth-inactive.svg
deleted file mode 120000
index 148343d1..00000000
--- a/links/24/panel/preferences-system-bluetooth-inactive.svg
+++ /dev/null
@@ -1 +0,0 @@
-network-bluetooth-inactive.svg
\ No newline at end of file
diff --git a/links/24/panel/preferences-system-bluetooth.svg b/links/24/panel/preferences-system-bluetooth.svg
deleted file mode 120000
index 0ef23527..00000000
--- a/links/24/panel/preferences-system-bluetooth.svg
+++ /dev/null
@@ -1 +0,0 @@
-network-bluetooth.svg
\ No newline at end of file
diff --git a/links/scalable/apps/kerry.svg b/links/scalable/apps/kerry.svg
deleted file mode 120000
index f97340b8..00000000
--- a/links/scalable/apps/kerry.svg
+++ /dev/null
@@ -1 +0,0 @@
-search.svg
\ No newline at end of file
diff --git a/links/scalable/apps/org.kde.kfind.svg b/links/scalable/apps/org.kde.kfind.svg
deleted file mode 120000
index f97340b8..00000000
--- a/links/scalable/apps/org.kde.kfind.svg
+++ /dev/null
@@ -1 +0,0 @@
-search.svg
\ No newline at end of file
--
2.47.2

View file

@ -0,0 +1,8 @@
{tela-circle-icon-theme, ...}:
tela-circle-icon-theme.overrideAttrs (finalAttrs: {
patches =
(finalAttrs.patches or [])
++ [
./0001-fix-links-remove-symbolic-links.patch
];
})

View file

@ -0,0 +1,8 @@
{
vesktop,
electron_32,
...
}:
vesktop.override {
electron = electron_32;
}