From 421b9a7cd63288f5881a2c2260dd8b4dae268715 Mon Sep 17 00:00:00 2001 From: KeksNino Date: Tue, 28 Jul 2026 20:27:55 +0200 Subject: [PATCH] remove slskd patch since patches are now in upstream format all files with nixfmt --- configuration.nix | 11 ++++--- flake.nix | 7 +--- hardware-configuration.nix | 67 +++++++++++++++++++++++--------------- home-manager/beets.nix | 1 - modules/slskd.nix | 2 +- packages.nix | 1 - 6 files changed, 50 insertions(+), 39 deletions(-) diff --git a/configuration.nix b/configuration.nix index 0b3a650..7e822f4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -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"; }; diff --git a/flake.nix b/flake.nix index d9ec5df..a6c57c9 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 7114f67..4f0d529 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,43 +1,58 @@ # 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"; - fsType = "zfs"; - }; + fileSystems."/" = { + device = "zpool/root"; + fsType = "zfs"; + }; - fileSystems."/var" = - { device = "zpool/var"; - fsType = "zfs"; - }; + fileSystems."/var" = { + device = "zpool/var"; + fsType = "zfs"; + }; - fileSystems."/nix" = - { device = "zpool/nix"; - fsType = "zfs"; - }; + fileSystems."/nix" = { + device = "zpool/nix"; + fsType = "zfs"; + }; - fileSystems."/home" = - { device = "zpool/home"; - fsType = "zfs"; - }; + fileSystems."/home" = { + device = "zpool/home"; + fsType = "zfs"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/FCFD-4472"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/FCFD-4472"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; swapDevices = [ ]; diff --git a/home-manager/beets.nix b/home-manager/beets.nix index 28114a9..55c32c7 100644 --- a/home-manager/beets.nix +++ b/home-manager/beets.nix @@ -1,4 +1,3 @@ -{ pkgs, ...}: { programs.beets.enable = true; diff --git a/modules/slskd.nix b/modules/slskd.nix index b13605d..3a9f7e4 100644 --- a/modules/slskd.nix +++ b/modules/slskd.nix @@ -1,4 +1,4 @@ -{config, pkgs, ...}: +{pkgs, ...}: { services.slskd = { diff --git a/packages.nix b/packages.nix index 4a31122..56d5ae3 100644 --- a/packages.nix +++ b/packages.nix @@ -13,7 +13,6 @@ aria2 nodejs gomi - slskd bun croc mp3val