remove slskd patch since patches are now in upstream

format all files with nixfmt
This commit is contained in:
2026-07-28 20:27:55 +02:00
parent 0a770e4094
commit 421b9a7cd6
6 changed files with 50 additions and 39 deletions
+7 -4
View File
@@ -1,6 +1,4 @@
{
config,
lib,
pkgs,
...
}:
@@ -20,8 +18,13 @@
"flakes"
];
fileSystems."/media/music" =
{ device = "/dev/disk/by-uuid/8e6ae06e-a4b5-4ac8-ad15-cb288b14715f";
fileSystems."/media/music" = {
device = "/dev/disk/by-uuid/8e6ae06e-a4b5-4ac8-ad15-cb288b14715f";
fsType = "ext4";
};
fileSystems."/home/user/backup" = {
device = "/dev/disk/by-uuid/db7d96f1-5c72-42dc-abc1-00de9b73f017";
fsType = "ext4";
};
+1 -6
View File
@@ -6,10 +6,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs-patcher.url = "github:gepbird/nixpkgs-patcher";
nixpkgs-patch-slskd = {
url = "https://github.com/NixOS/nixpkgs/pull/544340.diff";
flake = false;
};
nixpkgs-patch-filetote = {
url = "https://github.com/NixOS/nixpkgs/pull/543082.diff";
flake = false;
@@ -21,9 +17,8 @@
self,
nixpkgs,
home-manager,
nixpkgs-patch-slskd,
nixpkgs-patch-filetote,
nixpkgs-patcher
nixpkgs-patcher,
}@inputs:
let
system = "x86_64-linux";
+30 -15
View File
@@ -1,42 +1,57 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "uas" "sd_mod" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"usb_storage"
"uas"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "zpool/root";
fileSystems."/" = {
device = "zpool/root";
fsType = "zfs";
};
fileSystems."/var" =
{ device = "zpool/var";
fileSystems."/var" = {
device = "zpool/var";
fsType = "zfs";
};
fileSystems."/nix" =
{ device = "zpool/nix";
fileSystems."/nix" = {
device = "zpool/nix";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "zpool/home";
fileSystems."/home" = {
device = "zpool/home";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/FCFD-4472";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/FCFD-4472";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
options = [
"fmask=0022"
"dmask=0022"
];
};
swapDevices = [ ];
-1
View File
@@ -1,4 +1,3 @@
{ pkgs, ...}:
{
programs.beets.enable = true;
+1 -1
View File
@@ -1,4 +1,4 @@
{config, pkgs, ...}:
{pkgs, ...}:
{
services.slskd = {
-1
View File
@@ -13,7 +13,6 @@
aria2
nodejs
gomi
slskd
bun
croc
mp3val