karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor flake patching/recursion

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-07-19 12:51:28 +01:00
parent a3d44b8b26
commit 1587967488
55 changed files with 303 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@@ -1,8 +0,0 @@
[submodule "submodules/nixpkgs"]
path = submodules/nixpkgs
url = git@github.com:karaolidis/nixpkgs.git
branch = integration
[submodule "submodules/home-manager"]
path = submodules/home-manager
url = git@github.com:karaolidis/home-manager.git
branch = integration

4
README.md
View File

@@ -27,9 +27,7 @@ NixOS dotfiles and configuration for various hosts and users.
- [`add-host.sh`](./lib/scripts/add-host.sh): Instantiate the keys for a new host configuration. - [`add-host.sh`](./lib/scripts/add-host.sh): Instantiate the keys for a new host configuration.
- [`remove-host.sh`](./lib/scripts/remove-host.sh): Remove references to a host. - [`remove-host.sh`](./lib/scripts/remove-host.sh): Remove references to a host.
- [`update-keys.sh`](./lib/scripts/update-keys.sh): Update the encryption keys in all relevant files using `sops.yaml` configurations. - [`update-keys.sh`](./lib/scripts/update-keys.sh): Update the encryption keys in all relevant files using `sops.yaml` configurations.
- [`update.sh`](./lib/scripts/update.sh): Update flake and all git submodules. - [`update.sh`](./lib/scripts/update.sh): Update flake and all packages.
- [`submodules/`](./submodules): Flake forks used in the repository, such as [`nixpkgs`](https://github.com/NixOS/nixpkgs) and [`home-manager`](https://github.com/nix-community/home-manager).
Any `options.nix` files create custom option definitions when present. Any `options.nix` files create custom option definitions when present.

152
flake.lock generated
View File

@@ -11,16 +11,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751930350, "lastModified": 1752328525,
"narHash": "sha256-hBIrzyrwG3XjeNyzVNWKDX+yYVlpwAqf9ovgF7qecug=", "narHash": "sha256-0aaVFLQxY1dKIS5jzwhbO847yIdr3U0o2heUzC5iat4=",
"owner": "aylur", "owner": "aylur",
"repo": "ags", "repo": "ags",
"rev": "22f37ccb0db58d9d8a11ad0054ab20ecfad005ad", "rev": "2eb3ea54311b0f7ba9d333d661d12cda1ed5507e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "aylur", "owner": "aylur",
"ref": "main",
"repo": "ags", "repo": "ags",
"type": "github" "type": "github"
} }
@@ -32,16 +31,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752227802, "lastModified": 1752404970,
"narHash": "sha256-5Nr80lTZJ8ewuxIzRHc6E8L4LW4rdGZukiZyL7nOVSE=", "narHash": "sha256-XULTToDUkIshNXEO+YP2mAHdQv8bxWDvKjbamBfOC8E=",
"owner": "aylur", "owner": "aylur",
"repo": "astal", "repo": "astal",
"rev": "81eb3770965190024803ed6dd0fe35318da64831", "rev": "2c5eb54f39e1710c6e2c80915a240978beb3269a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "aylur", "owner": "aylur",
"ref": "main",
"repo": "astal", "repo": "astal",
"type": "github" "type": "github"
} }
@@ -53,20 +51,43 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752113600, "lastModified": 1746728054,
"narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "79264292b7e3482e5702932949de9cbb69fedf6d", "rev": "ff442f5d1425feb86344c028298548024f21256d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "master", "ref": "latest",
"repo": "disko", "repo": "disko",
"type": "github" "type": "github"
} }
}, },
"flake-input-patcher": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1751871600,
"narHash": "sha256-I4/2ekJrbRMhOpKfzgnlrN45nQj9YQmZnoSeAaRa1SU=",
"owner": "jfly",
"repo": "flake-input-patcher",
"rev": "4ff068126d49829b106280738944bde91951d59d",
"type": "github"
},
"original": {
"owner": "jfly",
"repo": "flake-input-patcher",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@@ -104,7 +125,6 @@
}, },
"original": { "original": {
"owner": "numtide", "owner": "numtide",
"ref": "main",
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
@@ -132,32 +152,31 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752220369, "lastModified": 1752814804,
"narHash": "sha256-Fk4KFIfdq4iATbwojGQvHFly93mZJnGuD6k+P4YV/lE=", "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
"owner": "karaolidis", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "444d7a18b87260772c5293a10f998d3da67e5f44", "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "karaolidis", "owner": "nix-community",
"ref": "integration",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752234186, "lastModified": 1752687322,
"narHash": "sha256-v9iaBVKTk6vGVle8q6s22reTtl+BxJFA+i6Gs5YmMXo=", "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
"owner": "karaolidis", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b6fdd0939385dff89d6cfc5d2e125a392f7a107", "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "karaolidis", "owner": "NixOS",
"ref": "integration", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -170,16 +189,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752229622, "lastModified": 1752908641,
"narHash": "sha256-jGJH7ssNiuex4+FVOS97PRhmkMAeJreKfmEkWhka/Bc=", "narHash": "sha256-7fSP4+p5QjWXFbnD4NeVQjtdCSsTMX2yAP1eNDooq4E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b814b0f9755b2d58ecd69303cb438d0776ee49a5", "rev": "ea63ce63073a11274ef327c5eb7f2ebb67606ebe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "main",
"repo": "NUR", "repo": "NUR",
"type": "github" "type": "github"
} }
@@ -189,35 +207,35 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1752193435, "lastModified": 1752555591,
"narHash": "sha256-kEmmqqBoiB46HcFNYojiTAqZiCraaHMAbB5wxWg2/cU=", "narHash": "sha256-3u29/v6VCHnaXjkMmjgwIGzR4Oul9EVHqxgJB6xTN0w=",
"owner": "icewind1991", "owner": "icewind1991",
"repo": "nvidia-patch-nixos", "repo": "nvidia-patch-nixos",
"rev": "ab69bce4e85c45c356acbc9ab818fbbd646e44c3", "rev": "1140fd66d2f7e0be1a72ac9fdc32fffe4bb371e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "icewind1991", "owner": "icewind1991",
"ref": "main",
"repo": "nvidia-patch-nixos", "repo": "nvidia-patch-nixos",
"type": "github" "type": "github"
} }
}, },
"quadlet-nix": { "quadlet-nix": {
"locked": { "locked": {
"lastModified": 1751931728, "lastModified": 1752618481,
"narHash": "sha256-i4OALPUnFhe9j9NauZaszZZTgIYSaLHmCO2gp9MZYKQ=", "narHash": "sha256-8132xTqalZxJZbznHDNoia1UqjNdL/hIQD4IXnI9F58=",
"owner": "SEIAROTg", "owner": "SEIAROTg",
"repo": "quadlet-nix", "repo": "quadlet-nix",
"rev": "5cb4f185dc3722d589bdf238e6802c4c9f87994e", "rev": "0c1d64f360c1a3c3534f6b592ca3ed5d46cf8429",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "SEIAROTg", "owner": "SEIAROTg",
"ref": "main",
"repo": "quadlet-nix", "repo": "quadlet-nix",
"type": "github" "type": "github"
} }
@@ -227,6 +245,7 @@
"ags": "ags", "ags": "ags",
"astal": "astal", "astal": "astal",
"disko": "disko", "disko": "disko",
"flake-input-patcher": "flake-input-patcher",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@@ -235,7 +254,7 @@
"quadlet-nix": "quadlet-nix", "quadlet-nix": "quadlet-nix",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"systems": "systems_2", "systems": "systems",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }
}, },
@@ -246,16 +265,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751606940, "lastModified": 1752544651,
"narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "rev": "2c8def626f54708a9c38a5861866660395bb3461",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Mic92", "owner": "Mic92",
"ref": "master",
"repo": "sops-nix", "repo": "sops-nix",
"type": "github" "type": "github"
} }
@@ -270,16 +288,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751776600, "lastModified": 1752381641,
"narHash": "sha256-75wd/aSvSoXUVd/buwI+Gsqx6LdmBVMbdXw+tCV1u58=", "narHash": "sha256-R2iDZb94RosuCeuIukacZVVXxzWYr4jn/QI/ax15nW8=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "54fad36eeae085f4a6ce4522bc351705b9c0c58a", "rev": "8f9fd947c52aa6adb6bafe72516eccf186708954",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Gerg-L", "owner": "Gerg-L",
"ref": "master",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"type": "github" "type": "github"
} }
@@ -299,22 +316,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"ref": "main",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -322,37 +323,18 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752055615, "lastModified": 1752909129,
"narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "narHash": "sha256-Eh8FkMvGRaY71BU/oyZTTzt9RsBIq2E6j0r3eLZ/2kY=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "rev": "0043b95d80b5bf6d61e84d237e2007727f4dd38d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "numtide",
"ref": "main",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
},
"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"
}
} }
}, },
"root": "root", "root": "root",

187
flake.nix
View File

@@ -1,110 +1,64 @@
{ {
inputs = { inputs = {
nixpkgs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# --- Official
# type = "github";
# owner = "NixOS";
# repo = "nixpkgs";
# ref = "master";
# --- Fork
type = "github";
owner = "karaolidis";
repo = "nixpkgs";
ref = "integration";
# --- Local
# url = "git+file:./submodules/nixpkgs";
};
home-manager = { home-manager = {
# --- Official url = "github:nix-community/home-manager";
# type = "github";
# owner = "nix-community"
# repo = "home-manager";
# --- Fork
type = "github";
owner = "karaolidis";
repo = "home-manager";
ref = "integration";
# --- Local
# url = "git+file:./submodules/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko = {
type = "github"; url = "github:nix-community/disko/latest";
owner = "nix-community";
repo = "disko";
ref = "master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sops-nix = { sops-nix = {
type = "github"; url = "github:Mic92/sops-nix";
owner = "Mic92";
repo = "sops-nix";
ref = "master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
systems = { systems.url = "github:nix-systems/default";
type = "github";
owner = "nix-systems";
repo = "default";
ref = "main";
};
nur = { nur = {
type = "github"; url = "github:nix-community/NUR";
owner = "nix-community";
repo = "NUR";
ref = "main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils = { flake-utils = {
type = "github"; url = "github:numtide/flake-utils";
owner = "numtide";
repo = "flake-utils";
ref = "main";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
}; };
treefmt-nix = { treefmt-nix = {
type = "github"; url = "github:numtide/treefmt-nix";
owner = "numtide";
repo = "treefmt-nix";
ref = "main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
quadlet-nix = { flake-input-patcher = {
type = "github"; url = "github:jfly/flake-input-patcher";
owner = "SEIAROTg"; inputs = {
repo = "quadlet-nix"; nixpkgs.follows = "nixpkgs";
ref = "main"; systems.follows = "systems";
};
};
quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
nvidia-patch = {
url = "github:icewind1991/nvidia-patch-nixos";
inputs = {
nixpkgs.follows = "nixpkgs";
utils.follows = "flake-utils";
};
}; };
astal = { astal = {
type = "github"; url = "github:aylur/astal";
owner = "aylur";
repo = "astal";
ref = "main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
ags = { ags = {
type = "github"; url = "github:aylur/ags";
owner = "aylur";
repo = "ags";
ref = "main";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
astal.follows = "astal"; astal.follows = "astal";
@@ -112,66 +66,37 @@
}; };
spicetify-nix = { spicetify-nix = {
type = "github"; url = "github:Gerg-L/spicetify-nix";
owner = "Gerg-L";
repo = "spicetify-nix";
ref = "master";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
systems.follows = "systems"; systems.follows = "systems";
}; };
}; };
nvidia-patch = {
type = "github";
owner = "icewind1991";
repo = "nvidia-patch-nixos";
ref = "main";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
{ self, nixpkgs, ... }@inputs: inputs:
{ let
nixosConfigurations = { mkInputs =
installer = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [ ./hosts/installer ];
specialArgs = { inherit inputs system; };
};
himalia = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [ ./hosts/himalia ];
specialArgs = { inherit inputs system; };
};
elara = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [ ./hosts/elara ];
specialArgs = { inherit inputs system; };
};
jupiter = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [ ./hosts/jupiter ];
specialArgs = { inherit inputs system; };
};
jupiter-vps = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [ ./hosts/jupiter-vps ];
specialArgs = { inherit inputs system; };
};
};
}
// inputs.flake-utils.lib.eachSystem [ "x86_64-linux" ] (
system: system:
let let
pkgs = import nixpkgs { patcher = inputs.flake-input-patcher.lib.${system};
in
patcher.patch inputs (import ./patches.nix { inherit patcher; });
mkNixosConfiguration =
inputs: system: modules:
inputs.nixpkgs.lib.nixosSystem {
inherit system modules;
specialArgs = { inherit inputs system; };
};
in
(
let
system = "x86_64-linux";
inputs = mkInputs system;
pkgs = import inputs.nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@@ -179,12 +104,20 @@
treefmt = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix; treefmt = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
in in
{ {
devShells = import ./hosts/common/shells { inherit pkgs; }; nixosConfigurations = {
lib = import ./lib { inherit pkgs; }; installer = mkNixosConfiguration inputs system [ ./hosts/installer ];
packages = import ./packages { inherit pkgs inputs system; }; himalia = mkNixosConfiguration inputs system [ ./hosts/himalia ];
elara = mkNixosConfiguration inputs system [ ./hosts/elara ];
jupiter = mkNixosConfiguration inputs system [ ./hosts/jupiter ];
jupiter-vps = mkNixosConfiguration inputs system [ ./hosts/jupiter-vps ];
};
formatter = treefmt.config.build.wrapper; devShells.${system} = import ./hosts/common/shells { inherit pkgs; };
checks.formatting = treefmt.config.build.check self; lib.${system} = import ./lib { inherit pkgs; };
packages.${system} = import ./packages { inherit pkgs inputs system; };
formatter.${system} = treefmt.config.build.wrapper;
checks.formatting.${system} = treefmt.config.build.check inputs.self;
} }
); );
} }

10
hosts/himalia/hardware/gu605c-spi-cs-gpio/default.nix
View File

@@ -1,5 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "asus-gu605c-acpi"; pname = "asus-gu605c-acpi";
version = "0.0.1"; version = "0.0.1";
@@ -17,12 +17,12 @@ pkgs.stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
mkdir -p kernel/firmware/acpi mkdir -p kernel/firmware/acpi
iasl -we -p kernel/firmware/acpi/${pname} ${src} iasl -we -p kernel/firmware/acpi/${finalAttrs.pname} ${finalAttrs.src}
find kernel | cpio -H newc -o > ${pname}.cpio find kernel | cpio -H newc -o > ${finalAttrs.pname}.cpio
''; '';
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp ${pname}.cpio $out/ cp ${finalAttrs.pname}.cpio $out/
''; '';
} })

5
hosts/jupiter/configs/wireguard/default.nix
View File

@@ -24,8 +24,9 @@ in
wireguard.interfaces.wg0 = wireguard.interfaces.wg0 =
let let
ip = "${pkgs.iproute2}/bin/ip"; ip = "${pkgs.iproute2}/bin/ip";
table = "wireguard";
in in
rec { {
ips = [ ips = [
"10.0.0.2/24" "10.0.0.2/24"
"${jupiterPublicIPv4}/32" "${jupiterPublicIPv4}/32"
@@ -33,7 +34,7 @@ in
privateKeyFile = config.sops.secrets."wireguard/client/vps".path; privateKeyFile = config.sops.secrets."wireguard/client/vps".path;
table = "wireguard"; inherit table;
postSetup = [ "${ip} rule add from ${jupiterPublicIPv4} table ${table}" ]; postSetup = [ "${ip} rule add from ${jupiterPublicIPv4} table ${table}" ];
postShutdown = [ "${ip} rule del from ${jupiterPublicIPv4} table ${table}" ]; postShutdown = [ "${ip} rule del from ${jupiterPublicIPv4} table ${table}" ];

6
lib/scripts/add-host.sh
View File

@@ -192,11 +192,7 @@ cat <<EOF > "./hosts/$host/README.md"
EOF EOF
sed -i "/nixosConfigurations = {/a\\ sed -i "/nixosConfigurations = {/a\\
$host = nixpkgs.lib.nixosSystem rec {\\ $host = mkNixosConfiguration inputs system [ ./hosts/$host ];\n" flake.nix
system = \"x86_64-linux\";\\
modules = [ ./hosts/$host ];\\
specialArgs = { inherit inputs system; };\\
};\n\n" flake.nix
sed -i "/knownHosts = {/a\\ $host.publicKeyFile = ../../../../$host/secrets/ssh_host_ed25519_key.pub;" ./hosts/common/configs/system/ssh/default.nix sed -i "/knownHosts = {/a\\ $host.publicKeyFile = ../../../../$host/secrets/ssh_host_ed25519_key.pub;" ./hosts/common/configs/system/ssh/default.nix

5
lib/scripts/remove-host.sh
View File

@@ -18,9 +18,8 @@ find . -type f -name "sops.yaml" | while IFS= read -r sops_file; do
sed -i "/ - \*$host/d" "$sops_file" sed -i "/ - \*$host/d" "$sops_file"
done done
sed -i "/$host/d" ./hosts/common/configs/system/ssh/default.nix sed -i "/$host = mkNixosConfiguration/d" flake.nix
sed -i "/$host = nixpkgs.lib.nixosSystem rec {/,/^[[:space:]]*};/d" flake.nix sed -i "/`$host`/d" ./README.md
sed -i "/$host/d" ./README.md
rm -rf "./hosts/$host" rm -rf "./hosts/$host"

39
lib/scripts/update.sh
View File

@@ -4,43 +4,6 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
echo "Updating submodules..."
paths=$(git config --file .gitmodules --name-only --get-regexp path | while read -r line; do
path=$(git config --file .gitmodules --get "$line")
url=$(git config --file .gitmodules --get "${line%.*}.url")
if [[ $url == *"karaolidis"* ]]; then
echo "$path"
fi
done)
for path in $paths; do
echo "Processing submodule: $path"
cd "$path" || exit
default_branch=$(git remote show origin | awk '/HEAD branch/ {print $NF}')
git checkout "$default_branch"
git fetch upstream
git merge "upstream/$default_branch"
branches=$(git for-each-ref --format='%(refname:short)' refs/heads/ | grep -v "^${default_branch}$")
for branch in $branches; do
git checkout "$branch"
git rebase "$default_branch"
done
git checkout integration
git push origin --all --force-with-lease
git push origin --tags --force-with-lease
cd - > /dev/null || exit
done
echo "All submodules updated successfully."
echo "Updating packages..."
find packages -type f -name "*.nix" | while read -r file; do find packages -type f -name "*.nix" | while read -r file; do
update_command=$(grep -oP '^#\s*AUTO-UPDATE:\s*\K.+' "$file" || true) update_command=$(grep -oP '^#\s*AUTO-UPDATE:\s*\K.+' "$file" || true)
if [[ -n "$update_command" ]]; then if [[ -n "$update_command" ]]; then
@@ -49,6 +12,4 @@ find packages -type f -name "*.nix" | while read -r file; do
fi fi
done done
echo "All packages updated successfully."
nix flake update nix flake update

18
packages/darktable/ghost-cms-publish/default.nix
View File

@@ -1,19 +1,19 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake --version=branch=main darktable-ghost-cms-publish --subpackage npmSrc # AUTO-UPDATE: nix-update --flake --version=branch=main darktable-ghost-cms-publish --subpackage npmSrc
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "darktable-ghost-cms-publish"; pname = "darktable-ghost-cms-publish";
version = "0-unstable-2025-02-23"; version = "0-unstable-2025-02-23";
src = pkgs.fetchFromGitLab { src = pkgs.fetchFromGitLab {
domain = "git.karaolidis.com"; domain = "git.karaolidis.com";
owner = "karaolidis"; owner = "karaolidis";
repo = pname; repo = finalAttrs.pname;
rev = "26780273b2a093c6e6a3140d0220d252f0bc709e"; rev = "26780273b2a093c6e6a3140d0220d252f0bc709e";
hash = "sha256-5aoGkqxMyvyK8EDsSE6kZa+dpExxVH2GRx2n87VusKE="; hash = "sha256-5aoGkqxMyvyK8EDsSE6kZa+dpExxVH2GRx2n87VusKE=";
}; };
npmSrc = pkgs.buildNpmPackage { npmSrc = pkgs.buildNpmPackage {
inherit src pname version; inherit (finalAttrs) src pname version;
npmDepsHash = "sha256-K/x9ZEMNO8D+SkvVPfqVJtZaDXY5gDApRRocg/POY68="; npmDepsHash = "sha256-K/x9ZEMNO8D+SkvVPfqVJtZaDXY5gDApRRocg/POY68=";
dontNpmBuild = true; dontNpmBuild = true;
@@ -25,16 +25,16 @@ pkgs.stdenv.mkDerivation rec {
# FIXME: https://github.com/NixOS/nixpkgs/issues/255890 # FIXME: https://github.com/NixOS/nixpkgs/issues/255890
wrapper = pkgs.writeShellApplication { wrapper = pkgs.writeShellApplication {
name = pname; name = finalAttrs.pname;
runtimeInputs = with pkgs; [ bun ]; runtimeInputs = with pkgs; [ bun ];
text = '' text = ''
exec bun ${npmSrc}/src/index.ts "$@" exec bun ${finalAttrs.npmSrc}/src/index.ts "$@"
''; '';
}; };
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/lib/${pname} mkdir -p $out/bin $out/lib/${finalAttrs.pname}
cp publish.lua $out/lib/${pname}/ cp publish.lua $out/lib/${finalAttrs.pname}/
cp ${wrapper}/bin/${pname} $out/bin/ cp ${finalAttrs.wrapper}/bin/${finalAttrs.pname} $out/bin/
''; '';
} })

4
packages/darktable/hald-clut/default.nix
View File

@@ -1,12 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake --version=branch=master darktable-hald-clut # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-hald-clut
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "hald-clut"; pname = "hald-clut";
version = "0-unstable-2019-03-21"; version = "0-unstable-2019-03-21";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "cedeber"; owner = "cedeber";
repo = pname; repo = "hald-clut";
rev = "3b3180f82d4dcea1e6e8c5648473539a910d7f49"; rev = "3b3180f82d4dcea1e6e8c5648473539a910d7f49";
hash = "sha256-R8vyYmcsfk49QsSV3v0QblXcO6U0oIfDyxbHPLwSMdo="; hash = "sha256-R8vyYmcsfk49QsSV3v0QblXcO6U0oIfDyxbHPLwSMdo=";
}; };

4
packages/darktable/lua-scripts/default.nix
View File

@@ -1,12 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "lua-scripts"; pname = "lua-scripts";
version = "release-2.0.0-unstable-2025-07-05"; version = "release-2.0.0-unstable-2025-07-05";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "darktable-org"; owner = "darktable-org";
repo = pname; repo = "lua-scripts";
rev = "aed3275943f218e559c58b98579ceafb02e220da"; rev = "aed3275943f218e559c58b98579ceafb02e220da";
hash = "sha256-vRE0kxqbjdjwU+S0Eu44ctYulYPgD0XsrTsz1ESq6t0="; hash = "sha256-vRE0kxqbjdjwU+S0Eu44ctYulYPgD0XsrTsz1ESq6t0=";
}; };

11
packages/docker/jellyseerr/default.nix
View File

@@ -8,20 +8,25 @@ let
}; };
# FIXME: https://github.com/fallenbagel/jellyseerr/pull/1505 # FIXME: https://github.com/fallenbagel/jellyseerr/pull/1505
jellyseerr = pkgs.jellyseerr.overrideAttrs (oldAttrs: rec { jellyseerr = pkgs.jellyseerr.overrideAttrs (
oldAttrs:
let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "Fallenbagel"; owner = "Fallenbagel";
repo = "jellyseerr"; repo = "jellyseerr";
tag = "preview-OIDC"; tag = "preview-OIDC";
hash = "sha256-iBnO0WjNqvXfuJMoS6z/NmYgtW5FQ9Ptp9uV5rODIf8="; hash = "sha256-iBnO0WjNqvXfuJMoS6z/NmYgtW5FQ9Ptp9uV5rODIf8=";
}; };
in
{
inherit src;
pnpmDeps = (pkgs.pnpm_9.override { nodejs = pkgs.nodejs_22; }).fetchDeps { pnpmDeps = (pkgs.pnpm_9.override { nodejs = pkgs.nodejs_22; }).fetchDeps {
inherit src; inherit src;
inherit (oldAttrs) pname version; inherit (oldAttrs) pname version;
hash = "sha256-lq/b2PqQHsZmnw91Ad4h1uxZXsPATSLqIdb/t2EsmMI="; hash = "sha256-lq/b2PqQHsZmnw91Ad4h1uxZXsPATSLqIdb/t2EsmMI=";
}; };
}); }
);
in in
pkgs.dockerTools.buildImage { pkgs.dockerTools.buildImage {
name = "jellyseerr"; name = "jellyseerr";

4
packages/docker/traefik/default.nix
View File

@@ -11,6 +11,10 @@ pkgs.dockerTools.buildImage {
config = { config = {
Entrypoint = [ "traefik" ]; Entrypoint = [ "traefik" ];
Volumes = {
"/var/lib/traefik" = { };
};
WorkingDir = "/var/lib/traefik";
ExposedPorts = { ExposedPorts = {
"80/tcp" = { }; "80/tcp" = { };
}; };

6
packages/jellyfin/plugins/bookshelf/default.nix
View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-bookshelf # AUTO-UPDATE: nix-update --flake jellyfin-plugin-bookshelf
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "bookshelf"; pname = "bookshelf";
version = "12"; version = "12";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/jellyfin/jellyfin-plugin-bookshelf/releases/download/v${version}/bookshelf_${version}.0.0.0.zip"; url = "https://github.com/jellyfin/jellyfin-plugin-bookshelf/releases/download/v${finalAttrs.version}/bookshelf_${finalAttrs.version}.0.0.0.zip";
sha256 = "sha256-P85SLXaJuFIv9AmAE6mPbxZDMBhqEt+88dZiPUKu2iQ="; sha256 = "sha256-P85SLXaJuFIv9AmAE6mPbxZDMBhqEt+88dZiPUKu2iQ=";
stripRoot = false; stripRoot = false;
}; };
@@ -13,4 +13,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

8
packages/jellyfin/plugins/intro-skipper/default.nix
View File

@@ -1,16 +1,16 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-intro-skipper # AUTO-UPDATE: nix-update --flake jellyfin-plugin-intro-skipper
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "intro-skipper"; pname = "intro-skipper";
version = "10.10/v1.10.10.20"; version = "10.10/v1.10.10.20";
src = src =
let let
parts = pkgs.lib.strings.splitString "/" version; parts = pkgs.lib.strings.splitString "/" finalAttrs.version;
full = builtins.elemAt parts 1; full = builtins.elemAt parts 1;
in in
pkgs.fetchzip { pkgs.fetchzip {
url = "https://github.com/intro-skipper/intro-skipper/releases/download/${version}/intro-skipper-${full}.zip"; url = "https://github.com/intro-skipper/intro-skipper/releases/download/${finalAttrs.version}/intro-skipper-${full}.zip";
sha256 = "sha256-RlrZkE8108Uj5V90+jw2o5fXb+K+9/hoDcEaSkKLDGg="; sha256 = "sha256-RlrZkE8108Uj5V90+jw2o5fXb+K+9/hoDcEaSkKLDGg=";
stripRoot = false; stripRoot = false;
}; };
@@ -18,4 +18,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

6
packages/jellyfin/plugins/opensubtitles/default.nix
View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-opensubtitles # AUTO-UPDATE: nix-update --flake jellyfin-plugin-opensubtitles
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "opensubtitles"; pname = "opensubtitles";
version = "20"; version = "20";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/jellyfin/jellyfin-plugin-opensubtitles/releases/download/v${version}/open-subtitles_${version}.0.0.0.zip"; url = "https://github.com/jellyfin/jellyfin-plugin-opensubtitles/releases/download/v${finalAttrs.version}/open-subtitles_${finalAttrs.version}.0.0.0.zip";
sha256 = "sha256-U17wQn32GB4nh05ExYJhzRw4nDvYOCB4EJtDoaaUnjI="; sha256 = "sha256-U17wQn32GB4nh05ExYJhzRw4nDvYOCB4EJtDoaaUnjI=";
stripRoot = false; stripRoot = false;
}; };
@@ -13,4 +13,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

6
packages/jellyfin/plugins/playbackreporting/default.nix
View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-playbackreporting # AUTO-UPDATE: nix-update --flake jellyfin-plugin-playbackreporting
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "playbackreporting"; pname = "playbackreporting";
version = "16"; version = "16";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/jellyfin/jellyfin-plugin-playbackreporting/releases/download/v${version}/playback-reporting_${version}.0.0.0.zip"; url = "https://github.com/jellyfin/jellyfin-plugin-playbackreporting/releases/download/v${finalAttrs.version}/playback-reporting_${finalAttrs.version}.0.0.0.zip";
sha256 = "sha256-UrWxS0CpeeW4nYNyRNxnK0jqiAqXwfLv3YfFokfVH0A="; sha256 = "sha256-UrWxS0CpeeW4nYNyRNxnK0jqiAqXwfLv3YfFokfVH0A=";
stripRoot = false; stripRoot = false;
}; };
@@ -13,4 +13,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

6
packages/jellyfin/plugins/reports/default.nix
View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-reports # AUTO-UPDATE: nix-update --flake jellyfin-plugin-reports
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "reports"; pname = "reports";
version = "17"; version = "17";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/jellyfin/jellyfin-plugin-reports/releases/download/v${version}/reports_${version}.0.0.0.zip"; url = "https://github.com/jellyfin/jellyfin-plugin-reports/releases/download/v${finalAttrs.version}/reports_${finalAttrs.version}.0.0.0.zip";
sha256 = "sha256-kN1UDhx5/1sw3PO5co2YkfbZNiDj56F2YAT8S/0EdZM="; sha256 = "sha256-kN1UDhx5/1sw3PO5co2YkfbZNiDj56F2YAT8S/0EdZM=";
stripRoot = false; stripRoot = false;
}; };
@@ -13,4 +13,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

6
packages/jellyfin/plugins/sso/default.nix
View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-sso # AUTO-UPDATE: nix-update --flake jellyfin-plugin-sso
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "sso"; pname = "sso";
version = "3.5.2.4"; version = "3.5.2.4";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/9p4/jellyfin-plugin-sso/releases/download/v${version}/sso-authentication_${version}.zip"; url = "https://github.com/9p4/jellyfin-plugin-sso/releases/download/v${finalAttrs.version}/sso-authentication_${finalAttrs.version}.zip";
sha256 = "sha256-e+w5m6/7vRAynStDj34eBexfCIEgDJ09huHzi5gQEbo="; sha256 = "sha256-e+w5m6/7vRAynStDj34eBexfCIEgDJ09huHzi5gQEbo=";
stripRoot = false; stripRoot = false;
}; };
@@ -13,4 +13,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

6
packages/jellyfin/plugins/subtitleextract/default.nix
View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-subtitleextract # AUTO-UPDATE: nix-update --flake jellyfin-plugin-subtitleextract
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "subtitleextract"; pname = "subtitleextract";
version = "4"; version = "4";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/jellyfin/jellyfin-plugin-subtitleextract/releases/download/v${version}/subtitle-extract_${version}.0.0.0.zip"; url = "https://github.com/jellyfin/jellyfin-plugin-subtitleextract/releases/download/v${finalAttrs.version}/subtitle-extract_${finalAttrs.version}.0.0.0.zip";
sha256 = "sha256-FstPWUYsZg416DNshIV4yOvbg6U21cRxKse8hITUyBY="; sha256 = "sha256-FstPWUYsZg416DNshIV4yOvbg6U21cRxKse8hITUyBY=";
stripRoot = false; stripRoot = false;
}; };
@@ -13,4 +13,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

6
packages/jellyfin/plugins/tmdbboxsets/default.nix
View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-tmdbboxsets # AUTO-UPDATE: nix-update --flake jellyfin-plugin-tmdbboxsets
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "tmdbboxsets"; pname = "tmdbboxsets";
version = "11"; version = "11";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/jellyfin/jellyfin-plugin-tmdbboxsets/releases/download/v${version}/tmdb-box-sets_${version}.0.0.0.zip"; url = "https://github.com/jellyfin/jellyfin-plugin-tmdbboxsets/releases/download/v${finalAttrs.version}/tmdb-box-sets_${finalAttrs.version}.0.0.0.zip";
sha256 = "sha256-cO3hpjFacS62kdXn8ebS7oMtFT9LJAt8Q4b36aSxwCQ="; sha256 = "sha256-cO3hpjFacS62kdXn8ebS7oMtFT9LJAt8Q4b36aSxwCQ=";
stripRoot = false; stripRoot = false;
}; };
@@ -13,4 +13,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

6
packages/jellyfin/plugins/tvdb/default.nix
View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake jellyfin-plugin-tvdb # AUTO-UPDATE: nix-update --flake jellyfin-plugin-tvdb
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "tvdb"; pname = "tvdb";
version = "19"; version = "19";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/jellyfin/jellyfin-plugin-tvdb/releases/download/v${version}/thetvdb_${version}.0.0.0.zip"; url = "https://github.com/jellyfin/jellyfin-plugin-tvdb/releases/download/v${finalAttrs.version}/thetvdb_${finalAttrs.version}.0.0.0.zip";
sha256 = "sha256-011wpVwQy562XDAwAQ44GJTbu/ESHcyo5F/wrtNBAcs="; sha256 = "sha256-011wpVwQy562XDAwAQ44GJTbu/ESHcyo5F/wrtNBAcs=";
stripRoot = false; stripRoot = false;
}; };
@@ -13,4 +13,4 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

4
packages/linux-firmware-latest/default.nix
View File

@@ -1,12 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake --version=branch=main linux-firmware-latest # AUTO-UPDATE: nix-update --flake --version=branch=main linux-firmware-latest
pkgs.stdenvNoCC.mkDerivation rec { pkgs.stdenvNoCC.mkDerivation {
pname = "linux-firmware"; pname = "linux-firmware";
version = "20250708-unstable-2025-07-08"; version = "20250708-unstable-2025-07-08";
src = pkgs.fetchFromGitLab { src = pkgs.fetchFromGitLab {
owner = "kernel-firmware"; owner = "kernel-firmware";
repo = pname; repo = "linux-firmware";
rev = "99d64b4f788c16e81b6550ef94f43c6b91cfad2d"; rev = "99d64b4f788c16e81b6550ef94f43c6b91cfad2d";
hash = "sha256-TJ97A9I0ipsqgg7ex3pAQgdhDJcLbkNCvuLppt9a07o="; hash = "sha256-TJ97A9I0ipsqgg7ex3pAQgdhDJcLbkNCvuLppt9a07o=";
}; };

20
packages/littlelink-server/default.nix
View File

@@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake --version=branch=main littlelink-server --subpackage yarnSrc # AUTO-UPDATE: nix-update --flake --version=branch=main littlelink-server --subpackage yarnSrc
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "littlelink-server"; pname = "littlelink-server";
version = "0-unstable-2025-07-16"; version = "0-unstable-2025-07-16";
@@ -12,10 +12,10 @@ pkgs.stdenv.mkDerivation rec {
}; };
yarnSrc = pkgs.stdenv.mkDerivation { yarnSrc = pkgs.stdenv.mkDerivation {
inherit src pname version; inherit (finalAttrs) src pname version;
offlineCache = pkgs.fetchYarnDeps { offlineCache = pkgs.fetchYarnDeps {
yarnLock = src + "/yarn.lock"; yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-nv1NgMm56wWlAYqqdH9UKTnWNhjxWBs1lmG+UCCQAzk="; hash = "sha256-nv1NgMm56wWlAYqqdH9UKTnWNhjxWBs1lmG+UCCQAzk=";
}; };
@@ -29,24 +29,24 @@ pkgs.stdenv.mkDerivation rec {
yarnBuildFlags = [ "--noninteractive" ]; yarnBuildFlags = [ "--noninteractive" ];
installPhase = '' installPhase = ''
mkdir -p $out/lib/${pname} mkdir -p $out/lib/${finalAttrs.pname}
cp -r build node_modules $out/lib/${pname} cp -r build node_modules $out/lib/${finalAttrs.pname}
''; '';
}; };
wrapper = pkgs.writeShellApplication { wrapper = pkgs.writeShellApplication {
name = pname; name = finalAttrs.pname;
runtimeInputs = with pkgs; [ nodejs_20 ]; runtimeInputs = with pkgs; [ nodejs_20 ];
text = '' text = ''
cd ${yarnSrc}/lib/${pname} cd ${finalAttrs.yarnSrc}/lib/${finalAttrs.pname}
exec node build/server.js "$@" exec node build/server.js "$@"
''; '';
}; };
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp ${wrapper}/bin/${pname} $out/bin/ cp ${finalAttrs.wrapper}/bin/${finalAttrs.pname} $out/bin/
''; '';
meta.mainProgram = pname; meta.mainProgram = finalAttrs.pname;
} })

8
packages/obsidian/plugins/better-word-count/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-better-word-count # AUTO-UPDATE: nix-update --flake obsidian-plugin-better-word-count
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "better-word-count"; pname = "better-word-count";
version = "0.10.1"; version = "0.10.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lukeleppan"; owner = "lukeleppan";
repo = pname; repo = "better-word-count";
rev = version; rev = finalAttrs.version;
hash = "sha256-+z31nYnCrHjuV4ICVO+cKBM5q/zYA7Ju+J+6eU7t9Bo="; hash = "sha256-+z31nYnCrHjuV4ICVO+cKBM5q/zYA7Ju+J+6eU7t9Bo=";
}; };
@@ -23,4 +23,4 @@ pkgs.buildNpmPackage rec {
cp ./dist/main.js $out/main.js cp ./dist/main.js $out/main.js
cp ./src/styles.css $out/styles.css cp ./src/styles.css $out/styles.css
''; '';
} })

6
packages/obsidian/plugins/dataview/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-dataview # AUTO-UPDATE: nix-update --flake obsidian-plugin-dataview
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "dataview"; pname = "dataview";
version = "0.5.70"; version = "0.5.70";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "blacksmithgu"; owner = "blacksmithgu";
repo = "obsidian-dataview"; repo = "obsidian-dataview";
rev = version; rev = finalAttrs.version;
hash = "sha256-qz2Un5r4bZyX0mZ7J7Yvd/gSWKn/GxUUrC7OF2jTL3c="; hash = "sha256-qz2Un5r4bZyX0mZ7J7Yvd/gSWKn/GxUUrC7OF2jTL3c=";
}; };
@@ -23,4 +23,4 @@ pkgs.buildNpmPackage rec {
cp ./build/main.js $out/main.js cp ./build/main.js $out/main.js
cp ./styles.css $out/styles.css cp ./styles.css $out/styles.css
''; '';
} })

12
packages/obsidian/plugins/excalidraw/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-excalidraw --subpackage mathjaxToSVG # AUTO-UPDATE: nix-update --flake obsidian-plugin-excalidraw --subpackage mathjaxToSVG
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "obsidian.plugins.excalidraw"; pname = "obsidian.plugins.excalidraw";
version = "2.13.0"; version = "2.13.0";
pkg = pkgs.fetchFromGitHub { pkg = pkgs.fetchFromGitHub {
owner = "zsviczian"; owner = "zsviczian";
repo = "obsidian-excalidraw-plugin"; repo = "obsidian-excalidraw-plugin";
rev = version; rev = finalAttrs.version;
hash = "sha256-zZDKgVQDwa2Mb5DQtu5/QUQnMbBudQxhrVSNr8Xi44o="; hash = "sha256-zZDKgVQDwa2Mb5DQtu5/QUQnMbBudQxhrVSNr8Xi44o=";
}; };
@@ -15,7 +15,7 @@ pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.excalidraw.mathjaxToSVG"; pname = "obsidian.plugins.excalidraw.mathjaxToSVG";
version = "1.0.0"; version = "1.0.0";
src = "${pkg}/MathjaxToSVG"; src = "${finalAttrs.pkg}/MathjaxToSVG";
npmDepsHash = "sha256-AosKWlX08dpXNQ2YlrfR6jEInmU02Ztf26nmV19Jxok="; npmDepsHash = "sha256-AosKWlX08dpXNQ2YlrfR6jEInmU02Ztf26nmV19Jxok=";
configurePhase = '' configurePhase = ''
@@ -28,7 +28,7 @@ pkgs.buildNpmPackage rec {
''; '';
}; };
src = pkg; src = finalAttrs.pkg;
npmDepsHash = "sha256-Cb8PTYW2fxYLlvCrDJhtV5KnOMkSTlBO8QJR4p6wyr8="; npmDepsHash = "sha256-Cb8PTYW2fxYLlvCrDJhtV5KnOMkSTlBO8QJR4p6wyr8=";
npmPackFlags = [ "--ignore-scripts" ]; npmPackFlags = [ "--ignore-scripts" ];
@@ -36,7 +36,7 @@ pkgs.buildNpmPackage rec {
configurePhase = '' configurePhase = ''
mkdir dist mkdir dist
mkdir -p ./MathjaxToSVG/dist mkdir -p ./MathjaxToSVG/dist
cp ${mathjaxToSVG}/index.js ./MathjaxToSVG/dist/index.js cp ${finalAttrs.mathjaxToSVG}/index.js ./MathjaxToSVG/dist/index.js
''; '';
installPhase = '' installPhase = ''
@@ -45,4 +45,4 @@ pkgs.buildNpmPackage rec {
cp ./dist/main.js $out/main.js cp ./dist/main.js $out/main.js
cp ./dist/styles.css $out/styles.css cp ./dist/styles.css $out/styles.css
''; '';
} })

8
packages/obsidian/plugins/kanban/default.nix
View File

@@ -1,18 +1,18 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-kanban # AUTO-UPDATE: nix-update --flake obsidian-plugin-kanban
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "kanban"; pname = "kanban";
version = "2.0.51"; version = "2.0.51";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mgmeyers"; owner = "mgmeyers";
repo = "obsidian-kanban"; repo = "obsidian-kanban";
rev = version; rev = finalAttrs.version;
hash = "sha256-NahypggwPrub2KxRBAn54ZpEInP1V+6l/xmUKUt6myA="; hash = "sha256-NahypggwPrub2KxRBAn54ZpEInP1V+6l/xmUKUt6myA=";
}; };
offlineCache = pkgs.fetchYarnDeps { offlineCache = pkgs.fetchYarnDeps {
yarnLock = src + "/yarn.lock"; yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-eof2W9Ja4RlmjQ0SnaF/jadHX3GRkCRrMwZU2z0M/Jk="; hash = "sha256-eof2W9Ja4RlmjQ0SnaF/jadHX3GRkCRrMwZU2z0M/Jk=";
}; };
@@ -29,4 +29,4 @@ pkgs.stdenv.mkDerivation rec {
cp ./main.js $out/main.js cp ./main.js $out/main.js
cp ./styles.css $out/styles.css cp ./styles.css $out/styles.css
''; '';
} })

8
packages/obsidian/plugins/languagetool/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-languagetool # AUTO-UPDATE: nix-update --flake obsidian-plugin-languagetool
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "languagetool"; pname = "languagetool";
version = "0.3.7"; version = "0.3.7";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "Clemens-E"; owner = "Clemens-E";
repo = "obsidian-languagetool-plugin"; repo = "obsidian-languagetool-plugin";
rev = version; rev = finalAttrs.version;
hash = "sha256-OsdOOrXNoraKuFPqvgn6pj6ZagEbiFCJyQ529eyZXUU="; hash = "sha256-OsdOOrXNoraKuFPqvgn6pj6ZagEbiFCJyQ529eyZXUU=";
}; };
@@ -17,7 +17,7 @@ pkgs.stdenv.mkDerivation rec {
]; ];
offlineCache = pkgs.fetchYarnDeps { offlineCache = pkgs.fetchYarnDeps {
yarnLock = src + "/yarn.lock"; yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-749RGQmg9Mte7TR6k3qP6xcb8+rj/C60LYLbF8j8gNc="; hash = "sha256-749RGQmg9Mte7TR6k3qP6xcb8+rj/C60LYLbF8j8gNc=";
}; };
@@ -34,4 +34,4 @@ pkgs.stdenv.mkDerivation rec {
cp ./main.js $out/main.js cp ./main.js $out/main.js
cp ./styles.css $out/styles.css cp ./styles.css $out/styles.css
''; '';
} })

6
packages/obsidian/plugins/linter/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-linter # AUTO-UPDATE: nix-update --flake obsidian-plugin-linter
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "linter"; pname = "linter";
version = "1.29.2"; version = "1.29.2";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "platers"; owner = "platers";
repo = "obsidian-linter"; repo = "obsidian-linter";
rev = version; rev = finalAttrs.version;
hash = "sha256-I60nP99bdQfvq+GYtUvHPpYqp/nqpn3BqrgZzgPzRpI="; hash = "sha256-I60nP99bdQfvq+GYtUvHPpYqp/nqpn3BqrgZzgPzRpI=";
}; };
@@ -20,4 +20,4 @@ pkgs.buildNpmPackage rec {
cp ./main.js $out/main.js cp ./main.js $out/main.js
cp ./src/styles.css $out/styles.css cp ./src/styles.css $out/styles.css
''; '';
} })

6
packages/obsidian/plugins/map-view/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-map-view # AUTO-UPDATE: nix-update --flake obsidian-plugin-map-view
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "map-view"; pname = "map-view";
version = "5.5.0"; version = "5.5.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "esm7"; owner = "esm7";
repo = "obsidian-map-view"; repo = "obsidian-map-view";
rev = version; rev = finalAttrs.version;
hash = "sha256-HiH6KPLnCNyidp6TI7HJK4aj5SL0B0xO6HOWUgjVdd4="; hash = "sha256-HiH6KPLnCNyidp6TI7HJK4aj5SL0B0xO6HOWUgjVdd4=";
}; };
@@ -25,4 +25,4 @@ pkgs.buildNpmPackage rec {
cp ./dist/main.js $out/main.js cp ./dist/main.js $out/main.js
cp ./dist/styles.css $out/styles.css cp ./dist/styles.css $out/styles.css
''; '';
} })

6
packages/obsidian/plugins/minimal-settings/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-minimal-settings # AUTO-UPDATE: nix-update --flake obsidian-plugin-minimal-settings
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "minimal-settings"; pname = "minimal-settings";
version = "8.1.1"; version = "8.1.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "kepano"; owner = "kepano";
repo = "obsidian-minimal-settings"; repo = "obsidian-minimal-settings";
rev = version; rev = finalAttrs.version;
hash = "sha256-JcWqSVgSRJAm0QiLnGuPpv0S9SVZw7UdtuKnvUAKiwQ="; hash = "sha256-JcWqSVgSRJAm0QiLnGuPpv0S9SVZw7UdtuKnvUAKiwQ=";
}; };
@@ -22,4 +22,4 @@ pkgs.buildNpmPackage rec {
cp ./main.js $out/main.js cp ./main.js $out/main.js
cp ./styles.css $out/styles.css cp ./styles.css $out/styles.css
''; '';
} })

6
packages/obsidian/plugins/outliner/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-outliner # AUTO-UPDATE: nix-update --flake obsidian-plugin-outliner
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "outliner"; pname = "outliner";
version = "4.9.0"; version = "4.9.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "vslinko"; owner = "vslinko";
repo = "obsidian-outliner"; repo = "obsidian-outliner";
rev = version; rev = finalAttrs.version;
hash = "sha256-W8cEAuFwGZUJvJgZo9Yz5aJV7xfm5kFZ9bpvwSPWhmE="; hash = "sha256-W8cEAuFwGZUJvJgZo9Yz5aJV7xfm5kFZ9bpvwSPWhmE=";
}; };
@@ -20,4 +20,4 @@ pkgs.buildNpmPackage rec {
cp ./main.js $out/main.js cp ./main.js $out/main.js
cp ./styles.css $out/styles.css cp ./styles.css $out/styles.css
''; '';
} })

10
packages/obsidian/plugins/style-settings/default.nix
View File

@@ -1,24 +1,24 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-style-settings --src-attr unpatchedSrc # AUTO-UPDATE: nix-update --flake obsidian-plugin-style-settings --src-attr unpatchedSrc
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "style-settings"; pname = "style-settings";
version = "1.0.9"; version = "1.0.9";
unpatchedSrc = pkgs.fetchFromGitHub { unpatchedSrc = pkgs.fetchFromGitHub {
owner = "mgmeyers"; owner = "mgmeyers";
repo = "obsidian-style-settings"; repo = "obsidian-style-settings";
rev = version; rev = finalAttrs.version;
hash = "sha256-eNbZQ/u3mufwVX+NRJpMSk5uGVkWfW0koXKq7wg9d+I="; hash = "sha256-eNbZQ/u3mufwVX+NRJpMSk5uGVkWfW0koXKq7wg9d+I=";
}; };
# Wrap in applyPatches so that offlineCache below is built correctly # Wrap in applyPatches so that offlineCache below is built correctly
src = pkgs.applyPatches { src = pkgs.applyPatches {
src = unpatchedSrc; src = finalAttrs.unpatchedSrc;
patches = [ ./package-lock.patch ]; patches = [ ./package-lock.patch ];
}; };
offlineCache = pkgs.fetchYarnDeps { offlineCache = pkgs.fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-tqX09XWI3ZL9bXVdjgsAEuvfCAjnyWj5uSWGFbNApds="; hash = "sha256-tqX09XWI3ZL9bXVdjgsAEuvfCAjnyWj5uSWGFbNApds=";
}; };
@@ -35,4 +35,4 @@ pkgs.stdenv.mkDerivation rec {
cp ./main.js $out/main.js cp ./main.js $out/main.js
cp ./styles.css $out/styles.css cp ./styles.css $out/styles.css
''; '';
} })

8
packages/obsidian/plugins/tasks/default.nix
View File

@@ -1,18 +1,18 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-tasks # AUTO-UPDATE: nix-update --flake obsidian-plugin-tasks
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "tasks"; pname = "tasks";
version = "7.20.0"; version = "7.20.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "obsidian-tasks-group"; owner = "obsidian-tasks-group";
repo = "obsidian-tasks"; repo = "obsidian-tasks";
rev = version; rev = finalAttrs.version;
hash = "sha256-K9/H2BgruB1O9KwW+xoiCsuXFfu6o4xZDCI40OEmh+o="; hash = "sha256-K9/H2BgruB1O9KwW+xoiCsuXFfu6o4xZDCI40OEmh+o=";
}; };
offlineCache = pkgs.fetchYarnDeps { offlineCache = pkgs.fetchYarnDeps {
yarnLock = src + "/yarn.lock"; yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-ecPZvpMQkL2o0X4qx6h1jwQVZrtTC3+Aj7n/SBLRQbo="; hash = "sha256-ecPZvpMQkL2o0X4qx6h1jwQVZrtTC3+Aj7n/SBLRQbo=";
}; };
@@ -29,4 +29,4 @@ pkgs.stdenv.mkDerivation rec {
cp ./main.js $out/main.js cp ./main.js $out/main.js
cp ./styles.css $out/styles.css cp ./styles.css $out/styles.css
''; '';
} })

6
packages/obsidian/plugins/url-into-selection/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-plugin-url-into-selection # AUTO-UPDATE: nix-update --flake obsidian-plugin-url-into-selection
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "url-into-selection"; pname = "url-into-selection";
version = "1.7.0"; version = "1.7.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "denolehov"; owner = "denolehov";
repo = "obsidian-url-into-selection"; repo = "obsidian-url-into-selection";
rev = version; rev = finalAttrs.version;
hash = "sha256-xmKJOuXirg/LFVK/0925fazW+cm+XUlLpAUgpAS6bZI="; hash = "sha256-xmKJOuXirg/LFVK/0925fazW+cm+XUlLpAUgpAS6bZI=";
}; };
@@ -21,4 +21,4 @@ pkgs.buildNpmPackage rec {
cp ./manifest.json $out/manifest.json cp ./manifest.json $out/manifest.json
cp ./main.js $out/main.js cp ./main.js $out/main.js
''; '';
} })

6
packages/obsidian/themes/minimal/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake obsidian-theme-minimal # AUTO-UPDATE: nix-update --flake obsidian-theme-minimal
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "minimal"; pname = "minimal";
version = "8.0.1"; version = "8.0.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "kepano"; owner = "kepano";
repo = "obsidian-minimal"; repo = "obsidian-minimal";
rev = version; rev = finalAttrs.version;
hash = "sha256-9FHkJ47R+cy2Pq62OuUUZQLSxd929xUIsQcpFGb4rso="; hash = "sha256-9FHkJ47R+cy2Pq62OuUUZQLSxd929xUIsQcpFGb4rso=";
}; };
@@ -25,4 +25,4 @@ pkgs.buildNpmPackage rec {
cp ./manifest.json $out/manifest.json cp ./manifest.json $out/manifest.json
cp ./theme.css $out/theme.css cp ./theme.css $out/theme.css
''; '';
} })

8
packages/oidcwarden/default.nix
View File

@@ -1,21 +1,21 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake oidcwarden # AUTO-UPDATE: nix-update --flake oidcwarden
# FIXME: https://github.com/dani-garcia/vaultwarden/pull/3899 # FIXME: https://github.com/dani-garcia/vaultwarden/pull/3899
pkgs.rustPlatform.buildRustPackage rec { pkgs.rustPlatform.buildRustPackage (finalAttrs: {
pname = "oidcwarden"; pname = "oidcwarden";
version = "2025.6.1-2"; version = "2025.6.1-2";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "Timshel"; owner = "Timshel";
repo = "OIDCWarden"; repo = "OIDCWarden";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-wpb+7/a8TEaLvOiMt/POLvl+rb6hHG99audNghSJvII="; hash = "sha256-wpb+7/a8TEaLvOiMt/POLvl+rb6hHG99audNghSJvII=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-fMePvMnefdcN90Y3BPqcKNXyg7tUd64IOUnOQis/qTU="; cargoHash = "sha256-fMePvMnefdcN90Y3BPqcKNXyg7tUd64IOUnOQis/qTU=";
env.VW_VERSION = version; env.VW_VERSION = finalAttrs.version;
nativeBuildInputs = with pkgs; [ pkg-config ]; nativeBuildInputs = with pkgs; [ pkg-config ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
@@ -31,4 +31,4 @@ pkgs.rustPlatform.buildRustPackage rec {
}; };
meta.mainProgram = "oidcwarden"; meta.mainProgram = "oidcwarden";
} })

10
packages/prometheus-fail2ban-exporter/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake prometheus-fail2ban-exporter # AUTO-UPDATE: nix-update --flake prometheus-fail2ban-exporter
pkgs.buildGoModule rec { pkgs.buildGoModule (finalAttrs: {
pname = "prometheus-fail2ban-exporter"; pname = "prometheus-fail2ban-exporter";
version = "0.10.3"; version = "0.10.3";
src = pkgs.fetchFromGitLab { src = pkgs.fetchFromGitLab {
owner = "hctrdev"; owner = "hctrdev";
repo = "fail2ban-prometheus-exporter"; repo = "fail2ban-prometheus-exporter";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-CyYGY6SovnvgExB22G+LEKRDRzbDZWhWUjctJMkprYs="; hash = "sha256-CyYGY6SovnvgExB22G+LEKRDRzbDZWhWUjctJMkprYs=";
}; };
@@ -18,8 +18,8 @@ pkgs.buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X main.version=${version}" "-X main.version=${finalAttrs.version}"
"-X main.commit=${version}" "-X main.commit=${finalAttrs.version}"
"-X main.date=1970-01-01T00:00:00Z" "-X main.date=1970-01-01T00:00:00Z"
"-X main.builtBy=NixOS" "-X main.builtBy=NixOS"
]; ];
@@ -28,4 +28,4 @@ pkgs.buildGoModule rec {
mkdir -p $out/bin mkdir -p $out/bin
cp -r "$GOPATH/bin/fail2ban-prometheus-exporter" $out/bin/prometheus-fail2ban-exporter cp -r "$GOPATH/bin/fail2ban-prometheus-exporter" $out/bin/prometheus-fail2ban-exporter
''; '';
} })

10
packages/prometheus-podman-exporter/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake prometheus-podman-exporter # AUTO-UPDATE: nix-update --flake prometheus-podman-exporter
pkgs.buildGoModule rec { pkgs.buildGoModule (finalAttrs: {
pname = "prometheus-podman-exporter"; pname = "prometheus-podman-exporter";
version = "1.17.2"; version = "1.17.2";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "prometheus-podman-exporter"; repo = "prometheus-podman-exporter";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-TlQQbeYcCTZKF6DUKM+UE8iU9KC5tLpCtee62sNbW8s="; hash = "sha256-TlQQbeYcCTZKF6DUKM+UE8iU9KC5tLpCtee62sNbW8s=";
}; };
@@ -31,8 +31,8 @@ pkgs.buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X github.com/containers/prometheus-podman-exporter/cmd.buildVersion=${version}" "-X github.com/containers/prometheus-podman-exporter/cmd.buildVersion=${finalAttrs.version}"
"-X github.com/containers/prometheus-podman-exporter/cmd.buildRevision=${builtins.head (pkgs.lib.strings.splitString "." version)}" "-X github.com/containers/prometheus-podman-exporter/cmd.buildRevision=${builtins.head (pkgs.lib.strings.splitString "." finalAttrs.version)}"
"-X github.com/containers/prometheus-podman-exporter/cmd.buildBranch=HEAD" "-X github.com/containers/prometheus-podman-exporter/cmd.buildBranch=HEAD"
]; ];
@@ -48,4 +48,4 @@ pkgs.buildGoModule rec {
fi fi
' '
''; '';
} })

2
packages/sas/cacert/default.nix
View File

@@ -1,5 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "sas-cacert"; pname = "sas-cacert";
version = "0-unstable-2025-05-13"; version = "0-unstable-2025-05-13";

8
packages/sas/viya4-orders-cli/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake viya4-orders-cli # AUTO-UPDATE: nix-update --flake viya4-orders-cli
pkgs.buildGoModule rec { pkgs.buildGoModule (finalAttrs: {
pname = "viya4-orders-cli"; pname = "viya4-orders-cli";
version = "1.7.0"; version = "1.7.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "sassoftware"; owner = "sassoftware";
repo = "viya4-orders-cli"; repo = "viya4-orders-cli";
rev = version; rev = finalAttrs.version;
hash = "sha256-0AZBKxQC3NDgwtdnso0zEd4h9PBexFzqig4tWoHJTFM="; hash = "sha256-0AZBKxQC3NDgwtdnso0zEd4h9PBexFzqig4tWoHJTFM=";
}; };
@@ -18,11 +18,11 @@ pkgs.buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X github.com/sassoftware/viya4-orders-cli/cmd.version=${version}" "-X github.com/sassoftware/viya4-orders-cli/cmd.version=${finalAttrs.version}"
]; ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp "$GOPATH/bin/viya4-orders-cli" $out/bin/viya4-orders-cli cp "$GOPATH/bin/viya4-orders-cli" $out/bin/viya4-orders-cli
''; '';
} })

10
packages/shlink-web-client/default.nix
View File

@@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake shlink-web-client # AUTO-UPDATE: nix-update --flake shlink-web-client
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage (finalAttrs: {
pname = "shlink-web-client"; pname = "shlink-web-client";
version = "4.4.1"; version = "4.4.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "shlinkio"; owner = "shlinkio";
repo = pname; repo = finalAttrs.pname;
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-qq683pLqbQ6kMAzc9QOrUdGh67joCy401h3OOr270qQ="; hash = "sha256-qq683pLqbQ6kMAzc9QOrUdGh67joCy401h3OOr270qQ=";
}; };
@@ -19,11 +19,11 @@ pkgs.buildNpmPackage rec {
postPatch = '' postPatch = ''
tmpfile=$(mktemp) tmpfile=$(mktemp)
${pkgs.lib.meta.getExe pkgs.jq} '.homepage = "${homepage}"' package.json > "$tmpfile" ${pkgs.lib.meta.getExe pkgs.jq} '.homepage = "${finalAttrs.homepage}"' package.json > "$tmpfile"
mv "$tmpfile" package.json mv "$tmpfile" package.json
''; '';
installPhase = '' installPhase = ''
cp -r build $out cp -r build $out
''; '';
} })

6
packages/shlink/default.nix
View File

@@ -1,15 +1,15 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake shlink # AUTO-UPDATE: nix-update --flake shlink
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "shlink"; pname = "shlink";
version = "4.4.6"; version = "4.4.6";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/shlinkio/shlink/releases/download/v${version}/shlink${version}_php8.4_dist.zip"; url = "https://github.com/shlinkio/shlink/releases/download/v${finalAttrs.version}/shlink${finalAttrs.version}_php8.4_dist.zip";
sha256 = "sha256-fjGUQoIKAiB45jeCnbOjMnDOFIadWXdsdn/d8tRuJP8="; sha256 = "sha256-fjGUQoIKAiB45jeCnbOjMnDOFIadWXdsdn/d8tRuJP8=";
}; };
installPhase = '' installPhase = ''
cp -r $src $out cp -r $src $out
''; '';
} })

2
packages/ssh/known-hosts/github/default.nix
View File

@@ -4,7 +4,7 @@
system, system,
... ...
}: }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "ssh-known-hosts-github"; pname = "ssh-known-hosts-github";
version = "0-unstable-2025-02-25"; version = "0-unstable-2025-02-25";

2
packages/ssh/known-hosts/sas/artifact/default.nix
View File

@@ -4,7 +4,7 @@
system, system,
... ...
}: }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "ssh-known-hosts-sas-artifact"; pname = "ssh-known-hosts-sas-artifact";
version = "0-unstable-2025-03-14"; version = "0-unstable-2025-03-14";

2
packages/ssh/known-hosts/sas/cldlgn/default.nix
View File

@@ -4,7 +4,7 @@
system, system,
... ...
}: }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "ssh-known-hosts-sas-cldlgn"; pname = "ssh-known-hosts-sas-cldlgn";
version = "0-unstable-2025-02-25"; version = "0-unstable-2025-02-25";

2
packages/ssh/known-hosts/sas/gerrit/default.nix
View File

@@ -4,7 +4,7 @@
system, system,
... ...
}: }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "ssh-known-hosts-sas-gerrit"; pname = "ssh-known-hosts-sas-gerrit";
version = "0-unstable-2025-02-25"; version = "0-unstable-2025-02-25";

2
packages/ssh/known-hosts/sas/gitlab/default.nix
View File

@@ -4,7 +4,7 @@
system, system,
... ...
}: }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "ssh-known-hosts-sas-gitlab"; pname = "ssh-known-hosts-sas-gitlab";
version = "0-unstable-2025-02-25"; version = "0-unstable-2025-02-25";

2
packages/yazi/plugins/custom-shell/default.nix
View File

@@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
# AUTO-UPDATE: nix-update --flake --version=branch=main yazi-plugin-custom-shell # AUTO-UPDATE: nix-update --flake --version=branch=main yazi-plugin-custom-shell
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation {
pname = "custom-shell"; pname = "custom-shell";
version = "0-unstable-2025-06-07"; version = "0-unstable-2025-06-07";

10
patches.nix Normal file
View File

@@ -0,0 +1,10 @@
{ patcher, ... }:
{
home-manager.patches = [
(patcher.fetchpatch {
name = "ssh: make userKnownHostsFiles consistent with nixpkgs";
url = "https://github.com/nix-community/home-manager/compare/master...karaolidis:home-manager:consistent-ssh-known-hosts-files.diff";
hash = "sha256-5EHdNqezDVF1xOO8g+qQj40GuS8XR1Vgm4D5zlDQo4I=";
})
];
}

1
submodules/home-manager

Submodule submodules/home-manager deleted from 444d7a18b8

1
submodules/nixpkgs

Submodule submodules/nixpkgs deleted from 5b6fdd0939

2
treefmt.nix
View File

@@ -16,8 +16,6 @@
settings = { settings = {
global = { global = {
excludes = [ excludes = [
# Third-party
"submodules/*"
# Binary Files # Binary Files
"*.jpg" "*.jpg"
"*.png" "*.png"