wymiller/nur
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

base: wymiller/nur:ea7094e4e33fbb030edf28383de37073fc8b84e0
Branches Tags
wymiller/nur:master wymiller/nur:ani-cli-rs-package wymiller/nur:overlay-atuin
..
compare: wymiller/nur:overlay-atuin
Branches Tags
wymiller/nur:ani-cli-rs-package wymiller/nur:master wymiller/nur:overlay-atuin
1 Commits
ea7094e4e3 .. overlay-atuin
Author SHA1 Message Date
wymiller d76f1d6453 add: added atuin overlay 2026-08-09 14:46:33 -04:00
8 changed files with 91 additions and 118 deletions
Expand all files Collapse all files
.gitea/workflows/publish-attic.yaml
+1 -1
View File
@@ -63,11 +63,11 @@ jobs:
system="$(nix eval --impure --raw --expr builtins.currentSystem)"
NIXPKGS_ALLOW_UNFREE=1 nix build --impure --accept-flake-config --no-link --print-out-paths -L \
".#packages.${system}.atuinLatest" \
".#packages.${system}.musicpresence" \
".#packages.${system}.vintage-story" \
".#packages.${system}.swaytreesave" \
".#packages.${system}.archon" \
".#packages.${system}.ani-cli-rs" \
| tee built-paths.txt
- name: Push packages to Attic
flake.lock
Generated
+7 -56
View File
@@ -20,20 +20,6 @@
"type": "github"
}
},
"flake-schemas": {
"locked": {
"lastModified": 1780327564,
"narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=",
"rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6",
"revCount": 149,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -52,29 +38,9 @@
"type": "github"
}
},
"hildibrand": {
"inputs": {
"flake-schemas": "flake-schemas",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1785717646,
"narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=",
"ref": "refs/heads/master",
"rev": "9588520925513ed0e47711a5798c6e9958143a0a",
"revCount": 5,
"type": "git",
"url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
},
"original": {
"type": "git",
"url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
}
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1779507042,
@@ -91,20 +57,6 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1784280462,
"narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=",
"rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f",
"revCount": 1009740,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1778443072,
"narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
@@ -120,7 +72,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_2": {
"locked": {
"lastModified": 1780902259,
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
@@ -140,24 +92,23 @@
"inputs": {
"darwin": "darwin",
"flake-utils": "flake-utils",
"hildibrand": "hildibrand",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"hildibrand",
"nixpkgs"
]
},
"locked": {
"lastModified": 1784438913,
"narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
"lastModified": 1786247265,
"narHash": "sha256-cVTcTqAhzSNMOVddtBhFpuv+Vx6/SgrhgZWJiI61H24=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
"rev": "6df7076ea0f5697e3242719a4c71211f00411cf5",
"type": "github"
},
"original": {
flake.nix
+28 -14
View File
@@ -7,10 +7,22 @@
home-manager.url = "github:nix-community/home-manager";
darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs";
hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs@{ self, nixpkgs, flake-utils, home-manager, darwin, ... }:
outputs =
inputs@{
self,
nixpkgs,
flake-utils,
home-manager,
darwin,
rust-overlay,
...
}:
let
systems = [
"x86_64-linux"
@@ -20,33 +32,35 @@
forAllSystems = f: nixpkgs.lib.genAttrs systems f;
in
{
packages = forAllSystems (system:
packages = forAllSystems (
system:
let
pkgs = import nixpkgs {
inherit system;
overlays = [ self.overlays.default ];
};
in
import ./pkgs {
inherit pkgs;
# packages that are already built with Nix go here
hildibrand = inputs.hildibrand.packages.${system}.default;
}
import ./pkgs { inherit pkgs; }
);
devShells = forAllSystems (system:
let pkgs = import nixpkgs { inherit system; }; in
devShells = forAllSystems (
system:
let
pkgs = import nixpkgs { inherit system; };
in
{
default = pkgs.mkShell {
packages = with pkgs; [
nixfmt-rfc-style
packages = with pkgs; [
nixfmt-rfc-style
];
};
}
);
overlays.default = import ./overlays;
overlays.default = nixpkgs.lib.composeManyExtensions [
rust-overlay.overlays.default
(import ./overlays)
];
homeManagerModules = import ./modules/home-manager self;
nixosModules.default = import ./modules/nixos;
darwinModules.default = import ./modules/darwin;
overlays/default.nix
+43 -1
View File
@@ -1 +1,43 @@
final: prev: { }
final: prev:
let
rustLatest = prev.rust-bin.stable.latest.default;
rustPlatform = prev.makeRustPlatform {
cargo = rustLatest;
rustc = rustLatest;
};
in
{
atuinLatest = (prev.atuin.override { inherit rustPlatform; }).overrideAttrs (oldAttrs: rec {
version = "18.19.0";
src = prev.fetchFromGitHub {
owner = "atuinsh";
repo = "atuin";
rev = "v${version}";
hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
};
cargoBuildFeatures = [
"ai"
"client"
"clipboard"
"daemon"
"hex"
"sync"
];
cargoCheckFeatures = cargoBuildFeatures;
preCheck = (oldAttrs.preCheck or "") + ''
export HOME="$TMPDIR"
export XDG_CONFIG_HOME="$TMPDIR/.config"
export XDG_DATA_HOME="$TMPDIR/.local/share"
export XDG_STATE_HOME="$TMPDIR/.local/state"
mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
'';
});
}
pkgs/default.nix
+6 -10
View File
@@ -1,14 +1,10 @@
{ pkgs, hildibrand }:
{ pkgs }:
{
# any packages that are added to pkgs and are inputs, we inherit them here
inherit hildibrand;
# any packages that build instructions are in this repo, they go here
atuinLatest = pkgs.atuinLatest;
# sable-web = pkgs.callPackage ./common/sable.nix {};
swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix {};
musicpresence = pkgs.callPackage ./linux/musicpresence.nix {};
vintage-story = pkgs.callPackage ./linux/vintage-story.nix {};
archon = pkgs.callPackage ./linux/archon.nix {};
swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };
archon = pkgs.callPackage ./linux/archon.nix { };
yubilock = pkgs.callPackage ./linux/yubilock/default.nix { };
ani-cli-rs = pkgs.callPackage ./linux/ani-cli-rs.nix { };
}
pkgs/linux/ani-cli-rs.nix
-27
View File
@@ -1,27 +0,0 @@
{ pkgs }:
let
pname = "ani-cli-rs";
version = "0.9.3";
src = pkgs.fetchFromGitHub {
owner = "vorlie";
repo = "ani-cli-rs";
rev = "${version}";
sha256 = "sha256-4JjCe9dCggLtETmH8yWYyn1tkHimPYtTp0BLQML3NKY=";
};
in pkgs.rustPlatform.buildRustPackage {
inherit pname version src;
cargoLock = { lockFile = "${src}/Cargo.lock"; };
# tests make this package fail to build, this line skips them
doCheck = false;
meta = {
description = "A cross-platform Rust port of ani-cli with two independent Anikoto catalogs and native MegaPlay/KotoCDN playback";
mainProgram = "ani-cli-rs";
homepage = "https://github.com/vorlie/ani-cli-rs";
maintainers = [ "wymillerlinux" ];
platforms = [ "x86_64-linux" ];
changelog = "https://github.com/vorlie/ani-cli-rs/releases/tag/${version}";
};
}
pkgs/linux/archon.nix
+4 -7
View File
@@ -1,11 +1,11 @@
{ pkgs }:
let
pname = "archon";
version = "9.5.8";
version = "9.3.119";
src = pkgs.fetchurl {
url = "https://github.com/RPGLogs/Uploaders-archon/releases/download/v${version}/${pname}-v${version}.AppImage";
hash = "sha256-tEMfDK0BCBvNWFlA78FKWcOvU1wzIorBM4ZmLQ+6hzU=";
hash = "sha256-mUsmaIxm3DZ1vvcwxpmDTWTj+UlFSv+jYkBrteL8xQk=";
};
appimageContents = pkgs.appimageTools.extract {
@@ -17,11 +17,8 @@ pkgs.appimageTools.wrapType2 {
nativeBuildInputs = with pkgs; [ makeWrapper ];
extraInstallCommands = ''
install -Dm444 "${appimageContents}/archon.desktop" "$out/share/applications/archon.desktop"
install -Dm444 "${appimageContents}/archon.png" "$out/share/icons/hicolor/512x512/apps/archon.png"
substituteInPlace "$out/share/applications/archon.desktop" \
--replace-fail "Exec=AppRun --no-sandbox %U" "Exec=archon --no-sandbox %U"
install -Dm444 "${appimageContents}/Archon App.desktop" "$out/share/applications/archon.desktop"
install -Dm444 "${appimageContents}/Archon App.png" "$out/share/icons/hicolor/256x256/apps/archon.png"
'';
meta = with pkgs.lib; {
pkgs/linux/vintage-story.nix
+2 -2
View File
@@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null;
stdenv.mkDerivation (finalAttrs: {
pname = "vintagestory";
version = "1.22.6";
version = "1.22.3";
src = fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
hash = "sha256-xJPyaYklEq2BeUX9+7hNPI6WC6ibcQDS+sKeqKYSh3A=";
hash = "sha256-sa4Pj1DwT6W6LJCAYznmbyqPtMUTaLSNTkXS1imQp04=";
};
__structuredAttrs = true;