Compare commits

4 Commits
Author SHA1 Message Date
Olaf 421f42e5f5 comment on how to test the overlay is needed. 2026-09-30 20:41:34 +02:00
Olaf 12f04133c2 Pinned Zotero after a compile time error. 2026-09-30 20:21:53 +02:00
Olaf 92fa9b7456 authorized keys and gpg/common CNC.js removed 2026-09-25 15:28:46 +02:00
Olaf 8b48e295c6 CNCjs and update 2026-09-25 12:49:11 +02:00
6 changed files with 54 additions and 31 deletions
+1
View File
@@ -14,6 +14,7 @@ _:
"inkscape"
"vcv-rack"
"affinity"
# Communication Tools
"adium"
+1 -1
View File
@@ -1,7 +1,7 @@
{ config, pkgs, ... }:
let
emacsOverlaySha256 = "0h15850dpx3p2jr5g4nv0gir0w9dgml1mqzc5yq8686y246r33br";
emacsOverlaySha256 = "1smprpp3zqh04jdv0b7ibc69n025j1bnpp76lnwyvidilf055g2h";
in
{
home-manager.backupFileExtension = "nix-backup";
+24
View File
@@ -9,11 +9,32 @@ let
xdg_configHome = "${config.users.users.${user}.home}/.config";
xdg_dataHome = "${config.users.users.${user}.home}/.local/share";
xdg_stateHome = "${config.users.users.${user}.home}/.local/state";
inkscapeExtensionsHome = "${config.users.users.${user}.home}/Library/Application Support/org.inkscape.Inkscape/config/inkscape/extensions";
hatchFillSource = pkgs.fetchzip {
url = "https://gitlab.com/moini_ink/hatch_fill/-/archive/master/hatch_fill-master.tar.gz";
sha256 = "1m3qhvf158dngg7shwd33xhn3bawn9yxw2srv2k8qjn889wjvi82";
};
in
{
# Shared file definitions moved into the Darwin module set.
"${config.users.users.${user}.home}/.gnupg/common.conf" = {
text = ''
# keyboxd configuration collides with gpg keymanager.app
# use-keyboxd
'';
};
"${config.users.users.${user}.home}/.ssh/authorized_keys" = {
text = ''
sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILVdAx+U1xhcJmh1hRaF0CVB0ivIF/U0oIbAWYPwko4iAAAABHNzaDo= Yubikey 35775013
sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIjnJyJUDnia6ZWPRa5iSBKCb+DMGmFtiFa+9gkeiTwQAAAABHNzaDo= Yubikey 36431751
sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIFhuPQUHUHchx8wHVCciMi6etzZStkpECbG/r/1imy+kAAAABHNzaDo= Yubikey 36431881
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILCEBZrQ9F3nLhEM9uqdPijut11vhYkdmLtj7gT/zgV3 Key Nov 2024
'';
};
# Raycast script so that "Run Emacs" is available and uses Emacs daemon
"${xdg_dataHome}/bin/emacsclient" = {
executable = true;
@@ -39,4 +60,7 @@ in
fi
'';
};
"${inkscapeExtensionsHome}/hatch_fill.inx".source = "${hatchFillSource}/hatch_fill.inx";
"${inkscapeExtensionsHome}/hatch_fill.py".source = "${hatchFillSource}/hatch_fill.py";
}
+1
View File
@@ -110,6 +110,7 @@ with pkgs;
flask-socketio
h11
idna
intelhex
importlib-metadata
itsdangerous
jinja2
-30
View File
@@ -1,30 +0,0 @@
self: super: with super; {
feather-font = let
version = "1.0";
pname = "feather-font";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchzip {
url = "https://github.com/dustinlyons/feather-font/archive/refs/tags/${version}.zip";
sha256 = "sha256-Zsz8/qn7XAG6BVp4XdqooEqioFRV7bLH0bQkHZvFbsg=";
};
buildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp $src/feather.ttf $out/share/fonts/truetype/
'';
meta = with lib; {
homepage = "https://www.feathericons.com/";
description = "Set of font icons from the open source collection Feather Icons";
license = licenses.mit;
maintainers = [ maintainers.dlyons ];
platforms = [ platforms.x86_64-darwin ];
};
};
}
+27
View File
@@ -0,0 +1,27 @@
# To test if a new Zotero package works without the overlay try
# nix --extra-experimental-features 'nix-command flakes' eval --raw --impure --expr '
# let
# flake = builtins.getFlake (toString ./.);
# pkgs = import flake.inputs.nixpkgsAarch64 {
# system = "aarch64-darwin";
# config.allowUnfree = true;
# };
# in
# pkgs.zotero.version
# '
final: prev:
let
pinnedPkgs = import (builtins.fetchTarball {
# Last nixpkgs Zotero package revision before 10.0.2.
url = "https://github.com/NixOS/nixpkgs/archive/4118d63e017feb54b48e7341e4b6f0ac5348f074.tar.gz";
sha256 = "1w33226pjk7hs9hbzy0ghcvgps0yicm0r2zxnnrzsr26pzvjjm6z";
}) {
system = prev.stdenv.hostPlatform.system;
config = prev.config;
};
in
{
zotero = pinnedPkgs.zotero;
}