Compare commits

..
7 Commits
7 changed files with 33 additions and 78 deletions
Generated
+24 -24
View File
@@ -67,11 +67,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1789074092, "lastModified": 1790193712,
"narHash": "sha256-QCXTUbd4FuwOHO7LgJws78YTRcco4xgR8RoYgKLvd9w=", "narHash": "sha256-f9ri1oARsL50D9mowaBGx2mmcbekvqRoxb9p8owXrVg=",
"owner": "sadjow", "owner": "sadjow",
"repo": "claude-code-nix", "repo": "claude-code-nix",
"rev": "1f88b393ac054378c393f914dc83d08a6ef5daeb", "rev": "a4ada6cadb755b6fb9f225fe77d5b8211d0d969a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -242,11 +242,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789071706, "lastModified": 1790265244,
"narHash": "sha256-S+oyh2YSP9V5bSjWbbK0N7GxdxxMwgBfUOtUdVcAWc4=", "narHash": "sha256-PFNTZbWRxWk5/JreN2mB8e2ED3s/KiwGuBjl0Vg9pbw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "150f9ce4ddd41544ea42eb9d6043a75bd615fa24", "rev": "e3b0881f91f42bea70bcc516220880cce9daf122",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -307,11 +307,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1789070668, "lastModified": 1790196063,
"narHash": "sha256-Zel41jsQnKlZQHBFndBoRCJ3WfJCXknV2jL0GJbLy9k=", "narHash": "sha256-FJY+wE3p1u0OpY53KKFHbQMDu10HW4s/n+xS68F+KN4=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "b8538a38adfd2a443aa0f8f3d506c29161f71f5f", "rev": "2db198e0d9d85b0e75295f1e34101015cb6069b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -364,11 +364,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789063032, "lastModified": 1789756059,
"narHash": "sha256-QHJcFCNEf7gqOzwClCIyAnU24Q2OUQS9WJTduZgnkxs=", "narHash": "sha256-/3LGjypiubcRL3h0rrx+hXvEctNRjGDIiMzog/v6fMw=",
"owner": "sudosubin", "owner": "sudosubin",
"repo": "nix-skills", "repo": "nix-skills",
"rev": "f3305681ea01e147fc65fa16d55df81fab28c6f7", "rev": "3f79cccf12afbd556a7c58111682c6cb6f1905fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -386,11 +386,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777567981, "lastModified": 1789921895,
"narHash": "sha256-8ZVUoerhitQdBRtQalX0US1Nmc4c9cRGDhBpfAPH51w=", "narHash": "sha256-9EhZeHAafVjvHYXM8ZwSx55Yt7KxGEa4y32z8WET9ic=",
"owner": "jzbor", "owner": "jzbor",
"repo": "nix-sweep", "repo": "nix-sweep",
"rev": "b3f71b38917ec9701a505ae3caa6907ccc6b5380", "rev": "9c66ccb60ce5b1a1b8e0d03d994b793803cfa529",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -407,11 +407,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1788942796, "lastModified": 1789978172,
"narHash": "sha256-CLoJCCRi9sogsyGXYn8rOCWBLKAntfKUB9Rli/YXgEY=", "narHash": "sha256-FIRXajv1pPZ+l6On6ekkmcQ6le0Zi0ncRUoR3nB0vKA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "83bbc895120516d6e86885a188c04beced6535d9", "rev": "9ebcb7766700d7e006d9505247bd7ce0426f4232",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -423,11 +423,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1789034407, "lastModified": 1790163306,
"narHash": "sha256-7X4GZ0KK5qHF9lppR9IlfXShYGcxxw1Kcjj8m5+19H0=", "narHash": "sha256-p3t7gWoWwCxI9Q+uCfRcObpoerQqc18MfwncJTXZzAA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3824e02a19d7dccf95c30aa1cab8c857323d2201", "rev": "208cb4803da35b9c6dcf385154c5d6d94323bfb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -470,11 +470,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1789006805, "lastModified": 1790185690,
"narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=", "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe", "rev": "4975466d324710c576dc11ad614684e6bd8cad8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
-1
View File
@@ -18,7 +18,6 @@
system/ipv6-mostly.nix system/ipv6-mostly.nix
system/nix.nix system/nix.nix
system/zfs.nix system/zfs.nix
system/ntfsplus.nix
desktop/plasma.nix desktop/plasma.nix
desktop/touchpad.nix desktop/touchpad.nix
+2
View File
@@ -23,6 +23,8 @@ in
keepMin = if keepGenerations != null then keepGenerations else 10; keepMin = if keepGenerations != null then keepGenerations else 10;
gc = true; # Run GC afterwards gc = true; # Run GC afterwards
gcBigger = 150; # Run GC only if store is bigger than 150 GiB
gcModest = true; # Stop gc once store meets quota
}; };
services.peerix = { services.peerix = {
@@ -1,13 +0,0 @@
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -91,7 +91,7 @@ static const struct fs_parameter_spec ntfs_parameters[] = {
fsparam_flag("sys_immutable", Opt_sys_immutable),
fsparam_flag("nohidden", Opt_nohidden),
fsparam_flag("hide_dot_files", Opt_hide_dot_files),
- fsparam_flag("windows_names", Opt_check_windows_names),
+ fsparam_bool("windows_names", Opt_check_windows_names),
fsparam_flag("acl", Opt_acl),
fsparam_flag("discard", Opt_discard),
fsparam_flag("sparse", Opt_sparse),
@@ -1,20 +0,0 @@
diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c
--- a/fs/ntfs/namei.c
+++ b/fs/ntfs/namei.c
@@ -61,12 +61,12 @@ static int ntfs_check_bad_windows_name(struct ntfs_volume *vol,
const __le16 *wc,
unsigned int wc_len)
{
- if (ntfs_check_bad_char(wc, wc_len))
- return -EINVAL;
-
if (!NVolCheckWindowsNames(vol))
return 0;
+ if (ntfs_check_bad_char(wc, wc_len))
+ return -EINVAL;
+
/* Check for trailing space or dot. */
if (wc_len > 0 &&
(wc[wc_len - 1] == cpu_to_le16(' ') ||
-13
View File
@@ -1,13 +0,0 @@
{ config, lib, pkgs, ... }:
{
boot.extraModulePackages = [
((pkgs.callPackage ../../pkgs/ntfs/package.nix { kernel = config.boot.kernelPackages.kernel; }).overrideAttrs {
patches = [
./ntfsplus-patches/0001-fix-windows_names-option.patch
./ntfsplus-patches/0002-gate-bad-character-check-by-windows_names.patch
];
})
];
}
+7 -7
View File
@@ -14,13 +14,13 @@ in
# Install system-wide docker because rootless causes issues with binfmt # Install system-wide docker because rootless causes issues with binfmt
virtualisation.docker.enable = config.lumpiasty.pc; virtualisation.docker.enable = config.lumpiasty.pc;
# Binfmt for aarch64 emulation # # Binfmt for aarch64 emulation
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; # boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
boot.binfmt.preferStaticEmulators = true; # boot.binfmt.preferStaticEmulators = true;
# Pass the binary to the interpreter as an open file descriptor, instead of a path. # # Pass the binary to the interpreter as an open file descriptor, instead of a path.
# Fixes issue inside containers. # # Fixes issue inside containers.
boot.binfmt.registrations.aarch64-linux.openBinary = true; # boot.binfmt.registrations.aarch64-linux.openBinary = true;
boot.binfmt.registrations.aarch64-linux.fixBinary = true; # boot.binfmt.registrations.aarch64-linux.fixBinary = true;
# Libvirt # Libvirt
virtualisation.libvirtd = lib.mkIf config.lumpiasty.pc { virtualisation.libvirtd = lib.mkIf config.lumpiasty.pc {