sanctureplicum
/
config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move most packages to NUR

main
Carsten Kragelund 2023-05-07 03:59:51 +02:00
parent 442b8a556b
commit ba3cd9ec46
Signed by: nyx
GPG Key ID: CADDADEEC9F753C0
10 changed files with 140 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
flake.lock
Unescape Escape View File

@ -82,6 +82,21 @@
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -126,6 +141,30 @@
"type": "github"
}
},
"mach-nix_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"sanctureplicum-nur",
"mach-nixpkgs"
],
"pypi-deps-db": "pypi-deps-db_2"
},
"locked": {
"lastModified": 1661359648,
"narHash": "sha256-BRz30Xg/g535oRJA3xEcXf0KM6GTJPugt2lgaom3D6g=",
"owner": "davhau",
"repo": "mach-nix",
"rev": "6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1",
"type": "github"
},
"original": {
"owner": "davhau",
"repo": "mach-nix",
"rev": "6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1",
"type": "github"
}
},
"mach-nixpkgs": {
"locked": {
"lastModified": 1670452817,
@ -142,9 +181,27 @@
"type": "github"
}
},
"mach-nixpkgs_2": {
"locked": {
"lastModified": 1670452817,
"narHash": "sha256-u5GnneIreydXauFCces/boSaj5+0ZgtBIlkOcwGriXY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9fd0585f7dc9b85eb5d426396004cc649261e60d",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9fd0585f7dc9b85eb5d426396004cc649261e60d",
"type": "github"
}
},
"nekowinston-nur": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1680788407,
@ -183,54 +240,6 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1679319606,
"narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8bc6945b1224a1cfa679d6801580b1054dba1a5c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1682173319,
"narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1681272286,
"narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6b70761ea8c896aff8994eb367d9526686501860",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1681759395,
"narHash": "sha256-7aaRtLxLAy8qFVIA26ulB+Q5nDVzuQ71qi0s0wMjAws=",
@ -245,17 +254,17 @@
"type": "indirect"
}
},
"nixpkgs_3": {
"nixpkgs-unstable": {
"locked": {
"lastModified": 1624561540,
"narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=",
"owner": "NixOS",
"lastModified": 1681272286,
"narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
"rev": "6b70761ea8c896aff8994eb367d9526686501860",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
@ -293,6 +302,22 @@
"type": "github"
}
},
"pypi-deps-db_2": {
"flake": false,
"locked": {
"lastModified": 1670518748,
"narHash": "sha256-pfUce0zlRI+tzxPgvRSKkusjxDCBVjCpkcDKWboHa+U=",
"owner": "davhau",
"repo": "pypi-deps-db",
"rev": "e9571cac25d2f509e44fec9dc94a3703a40126ff",
"type": "github"
},
"original": {
"owner": "DavHau",
"repo": "pypi-deps-db",
"type": "github"
}
},
"root": {
"inputs": {
"emacs-overlay": "emacs-overlay",
@ -301,7 +326,7 @@
"mach-nixpkgs": "mach-nixpkgs",
"nekowinston-nur": "nekowinston-nur",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur",
"sanctureplicum-nur": "sanctureplicum-nur",
@ -310,28 +335,34 @@
},
"sanctureplicum-nur": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"mach-nix": "mach-nix_2",
"mach-nixpkgs": "mach-nixpkgs_2",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1681311070,
"narHash": "sha256-xOTKoUb0ZovAqi7B1NAd6s4Xu0O9KjvdLVjbM/mlWIY=",
"owner": "nyxkrage",
"repo": "sanctureplicum-nur",
"rev": "bc23d8023f1b65f28fb761044533183edc2ca63c",
"type": "github"
"lastModified": 1683424668,
"narHash": "sha256-x8RSH08tS9nkvmSN1zWjzkl2md4hOo5sYfoZYbm48lA=",
"ref": "refs/heads/main",
"rev": "b0ee28f2abb6c40ccc1c8ca0d4232f9c3fede304",
"revCount": 5,
"type": "git",
"url": "https://gitea.pid1.sh/sanctureplicum/nur.git"
},
"original": {
"owner": "nyxkrage",
"repo": "sanctureplicum-nur",
"type": "github"
"type": "git",
"url": "https://gitea.pid1.sh/sanctureplicum/nur.git"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
"nixpkgs-unstable"
],
"nixpkgs-stable": "nixpkgs-stable"
"nixpkgs-stable": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1682338428,

53
flake.nix
Unescape Escape View File

@ -2,22 +2,43 @@
inputs = {
nixpkgs.url = "nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixos-wsl.url = "github:nix-community/nixos-wsl";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nur.url = "github:nix-community/nur";
sanctureplicum-nur.url = "github:nyxkrage/sanctureplicum-nur";
nekowinston-nur.url = "github:nekowinston/nur";
emacs-overlay.url = "github:nix-community/emacs-overlay";
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
mach-nixpkgs.url = "github:nixos/nixpkgs/9fd0585f7dc9b85eb5d426396004cc649261e60d";
mach-nix.url = "github:davhau/mach-nix/6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1";
mach-nix.inputs.nixpkgs.follows = "mach-nixpkgs";
mach-nix.inputs.pypi-deps-db.url = "github:davhau/pypi-deps-db/e9571cac25d2f509e44fec9dc94a3703a40126ff";
mach-nix.inputs.pypi-deps-db.inputs.nixpkgs.follows = "mach-nixpkgs";
nur.url = "github:nix-community/nur";
sanctureplicum-nur = {
url = "git+https://gitea.pid1.sh/sanctureplicum/nur.git";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
nekowinston-nur = {
url = "github:nekowinston/nur";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs = {
nixpkgs.follows = "nixpkgs-unstable";
nixpkgs-stable.follows = "nixpkgs";
};
};
nixos-wsl = {
url = "github:nix-community/nixos-wsl";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
mach-nix = {
url = "github:davhau/mach-nix/6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1";
inputs.nixpkgs.follows = "mach-nixpkgs";
inputs.pypi-deps-db = {
url = "github:davhau/pypi-deps-db/e9571cac25d2f509e44fec9dc94a3703a40126ff";
inputs.nixpkgs.follows = "mach-nixpkgs";
};
};
};
outputs =
@ -44,7 +65,7 @@
pkgs = prev;
repoOverrides = {
nekowinston = import nekowinston-nur { pkgs = prev; };
sanctureplicum = import sanctureplicum-nur { pkgs = prev; };
sanctureplicum = import sanctureplicum-nur { pkgs = prev; system = prev.system; mach-nixpkgs = import mach-nixpkgs { system = prev.system; }; inherit mach-nix; };
};
};
unstable = import nixpkgs-unstable {

45
hosts/gitea/pkgs/gitea/build.nix
Unescape Escape View File

@ -1,45 +0,0 @@
{ pkgs, giteaVersion, ... }:
let
giteaVersion = "1.19.3";
src = pkgs.fetchgit { url = "https://github.com/nyxkrage/gitea"; rev = giteaVersion; hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4="; };
nodeNix = (import ./node.nix { inherit pkgs giteaVersion src; });
nodeEnv = (pkgs.callPackage (nodeNix + "/default.nix") { });
in
pkgs.buildGoModule rec {
pname = "gitea-build";
version = "${giteaVersion}-nyx";
vendorSha256 = "sha256-gfHyssQrY5r3rQAzonM3Rv/BDIYGEY/PiOZEyoGGeiw=";
inherit src;
nativeBuildInputs = [
pkgs.gnumake
pkgs.go
pkgs.nodejs
pkgs.nodePackages.npm
pkgs.git
];
buildPhase = ''
ln -s ${nodeEnv.nodeDependencies}/lib/node_modules ./node_modules
export PATH="${nodeEnv.nodeDependencies}/bin:$PATH"
TAGS="bindata" VERSION="${version}" make frontend vendor generate release-sources
'';
installPhase = ''
mkdir -p $out
cp dist/release/gitea-src-${version}.tar.gz $out
'';
outputs = [ "out" ];
enableParallelBuilding = false;
meta = with pkgs.lib; {
description = "Build helper for Gitea";
homepage = "https://gitea.com/";
license = licenses.mit;
maintainers = with maintainers; [ nyxkrage ];
platforms = platforms.all;
};
}

6
hosts/gitea/pkgs/gitea/default.nix
Unescape Escape View File

@ -1,6 +0,0 @@
{ pkgs, ... }: pkgs.unstable.gitea.overrideAttrs (old: rec {
pname = "gitea";
version = "1.19.3";
src = "${import ./build.nix { inherit pkgs; giteaVersion = version; }}/gitea-src-${version}-nyx.tar.gz";
})

23
hosts/gitea/pkgs/gitea/node.nix
Unescape Escape View File

@ -1,23 +0,0 @@
{ pkgs, giteaVersion, src, ... }:
let
escapeSlash = str: builtins.replaceStrings [ "/" ] [ "\\/"] str;
in
pkgs.stdenv.mkDerivation rec {
pname = "gitea-node-env";
version = "${giteaVersion}-nyx";
inherit src;
nativeBuildInputs = [ pkgs.node2nix ];
buildPhase = ''
mkdir nix
node2nix -i ${src}/package.json -l ${src}/package-lock.json
sed -r -i 's/src = .+?nix\/store.+?;/src = fetchgit { url = "${escapeSlash src.url}"; rev = "${escapeSlash src.rev}"; hash = "${escapeSlash src.outputHash}"; };/' node-packages.nix
'';
installPhase = ''
mkdir $out
cp *.nix $out
'';
}

2
hosts/gitea/services/gitea.nix
Unescape Escape View File

@ -2,7 +2,7 @@
services.gitea = rec {
enable = true;
appName = "Init System: Gitea";
package = import ../pkgs/gitea { inherit pkgs; };
package = pkgs.nur.repos.sanctureplicum.gitea-nyx;
database = {
type = "postgres";
host = "unix:///var/run/postgresql/";

5
users/carsten/pkgs/default.nix
Unescape Escape View File

@ -8,7 +8,7 @@
epkgs.vterm
epkgs.pdf-tools
epkgs.auctex
(pkgs.callPackage ./spectre-el.nix {})
pkgs.nur.repos.sanctureplicum.emacsPackages.spectre-el
];
};
@ -225,7 +225,8 @@
wireplumber
# Local
(callPackage ./areon-pro {})
(callPackage ./rec-mono-nyx.nix {})
pkgs.nur.repos.sanctureplicum.rec-mono-nyx
gnomeExtensions.color-picker
gnomeExtensions.just-perfection

40
users/carsten/pkgs/libspectre.nix
Unescape Escape View File

@ -1,40 +0,0 @@
{ lib, stdenv, fetchgit, libsodium, meson, pkg-config, ninja }:
stdenv.mkDerivation rec {
pname = "libspectre";
version = "1.0.0";
src = fetchgit {
url = "https://github.com/nyxkrage/spectre-lib";
rev = "da65b8ac4502eb7ec0f0ce57c5d6d6bf79b1d3e4";
sha256 = "sha256-iHhUPNl1GkVLRJNAMqvyDpTU1dXUDWnwgFOnRGo7Ikc=";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
pkg-config
ninja
];
buildInputs = [
libsodium
];
outputs = [ "out" "dev" ];
enableParallelBuilding = true;
doCheck = true;
meta = with lib; {
description = "A modern and easy-to-use crypto library";
homepage = "https://spectre.app/";
license = licenses.gpl3;
maintainers = with maintainers; [ nyxkrage ];
platforms = platforms.all;
};
}

56
users/carsten/pkgs/rec-mono-nyx.nix
Unescape Escape View File

@ -1,56 +0,0 @@
{ pkgs
, lib
, stdenv
, fetchgit
, fetchurl
}: stdenv.mkDerivation rec
{
pname = "rec-mono-nyx";
version = "1.0.0";
src = fetchgit {
url = "https://github.com/arrowtype/recursive-code-config.git";
rev = "c20977eb1f3cd59ca7ce03a740b4745f0d299b27";
sha256 = "sha256-OaYhOCpjOZI3cIPUNhppqGAQOrGwuQ09tl1pXCtNj5s=";
};
recConfig = fetchurl {
url = "https://gist.github.com/nyxkrage/4b93ee0c8ce9c0cc76c0449d496fafae/raw/fa272d0543859e9303a1ccebc4ad770d167c6a26/RecMonoNyx";
sha256 = "sha256-AuV49/Zik9O5KpzILk6hcmjCuff1bbogjrbz8qCydyE=";
};
nativeBuildInputs = with pkgs.mach-nix.pkgs; [
(pkgs.mach-nix.mach-nix.lib."${pkgs.system}".mkPython {
requirements = builtins.readFile "${src}/requirements.txt";
_.pyyaml.doInstallCheck = false;
ignoreDataOutdated = true;
python = "python39";
})
python39Packages.pip
python39Packages.setuptools
];
outputs = [ "out" ];
phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ];
patchPhase = ''
cp ${recConfig} config.yaml
'';
buildPhase = ''
python3 scripts/instantiate-code-fonts.py
'';
installPhase = ''
mkdir -p $out/share/fonts/truetype/
cp fonts/RecMonoNyx/* $out/share/fonts/truetype/
'';
meta = with lib; {
description = "Recusrive Mono - Nyx Style";
homepage = "https://spectre.app/";
license = licenses.gpl3;
maintainers = with maintainers; [ nyxkrage ];
platforms = platforms.all;
};
}

50
users/carsten/pkgs/spectre-el.nix
Unescape Escape View File

@ -1,50 +0,0 @@
{ lib, stdenv, fetchgit, meson, ninja, pkg-config, callPackage, emacs }:
stdenv.mkDerivation rec {
pname = "spectre-emacs";
version = "0.3.0";
src = fetchgit {
url = "https://github.com/nyxkrage/spectre-emacs";
rev = "41a9258710ec21fcbb94c80f456da04c9760cf45";
sha256 = "sha256-zd2yR3y0GnCC0CGx8ij+Kag+8TRRxOqhUwQ2T5ncDEI=";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
pkg-config
ninja
emacs
];
buildInputs = [
(callPackage ./libspectre.nix {})
];
configurePhase = ''
meson setup build --libdir $out/share/emacs/site-lisp/elpa/${pname}-${version}
cd build
'';
buildPhase = ''
ninja
'';
installPhase = ''
mkdir -p $out/share/emacs/site-lisp/elpa/${pname}-${version}
ninja install
cd ..
cp spectre.el $out/share/emacs/site-lisp/elpa/${pname}-${version}
'';
outputs = [ "out" ];
enableParallelBuilding = true;
doCheck = true;
}