From f9016845d5cf535231febb6c98e8d2cd34457efa Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 1 Jul 2025 16:32:26 +0300 Subject: [PATCH] 123 --- devices/hardware/mini-pc.nix | 31 ++++++++++++----- devices/mini-pc.nix | 13 +++---- flake.lock | 66 ++++++++++++++++++------------------ 3 files changed, 61 insertions(+), 49 deletions(-) diff --git a/devices/hardware/mini-pc.nix b/devices/hardware/mini-pc.nix index 7fe4130..1288fed 100755 --- a/devices/hardware/mini-pc.nix +++ b/devices/hardware/mini-pc.nix @@ -1,17 +1,32 @@ # 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 = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "uas" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot = { + initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "thunderbolt" + "usb_storage" + "uas" + "usbhid" + "sd_mod" + ]; + kernelModules = [ "kvm-amd" ]; + extraModulePackages = [ ]; + }; fileSystems = { "/" = { diff --git a/devices/mini-pc.nix b/devices/mini-pc.nix index 15ec169..7950c9d 100755 --- a/devices/mini-pc.nix +++ b/devices/mini-pc.nix @@ -17,7 +17,6 @@ let ./hardware/mini-pc.nix ./hardware/logitech.nix self.nixosModules.default - #nixos-hardware.nixosModules.asus-fa506ic self.nixosModules.software.wine self.nixosModules.software.beets @@ -26,8 +25,7 @@ let self.homeConfigurations.root.nixosModule ] ++ builtins.attrValues inputs.self.nixosModules.extra.self; - - services.logrotate.checkConfig = false; + fileSystems = { "${inputs.zeroq.dirs.therima-drive}" = { device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44"; @@ -70,8 +68,8 @@ let }; boot = { - kernelPackages = lib.mkDefault pkgs.linuxPackages_xanmod_stable; - #kernelParams = [ #"usbcore.autosuspend=-1" ]; + kernelPackages = lib.mkDefault pkgs.linuxPackages_xanmod_latest; + #kernelParams = [ "usbcore.autosuspend=-1" ]; loader = { systemd-boot.enable = lib.mkDefault true; efi.canTouchEfiVariables = lib.mkDefault true; @@ -105,10 +103,11 @@ let }; services = { + #logrotate.checkConfig = false; + #power-profiles-daemon.enable = false; xserver = { videoDrivers = [ "amdgpu" - #"nvidia" ]; }; syncthing = { @@ -148,8 +147,6 @@ let }; nixpkgs.config.pulseaudio = true; - #services.power-profiles-daemon.enable = false; - security = { rtkit.enable = true; }; diff --git a/flake.lock b/flake.lock index e4fbb69..b8178fc 100755 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1750680230, - "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=", + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", "owner": "nix-community", "repo": "disko", - "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1750690749, - "narHash": "sha256-x6fRPeqdgDKVTCyvbp4J8Q5UQ3DV3oWYSoyM444N8cY=", + "lastModified": 1751336185, + "narHash": "sha256-ptnVr2x+sl7cZcTuGx/0BOE2qCAIYHTcgfA+/h60ml0=", "owner": "nix-community", "repo": "home-manager", - "rev": "05b8c9506452349d8be854ac46e5a7630fa7917d", + "rev": "96354906f58464605ff81d2f6c2ea23211cbf051", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750557776, - "narHash": "sha256-+BgqY5UK1moaknyb+yi6NOqx63e0lT7V6d2h6lhFQoQ=", + "lastModified": 1751335864, + "narHash": "sha256-gzOCRagb6AYmjw6pSKNAJUajnSk0gKNsfZYSbiyrBkM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "6bdd014132028f025d53059a40ce9489c070ca27", + "rev": "9ebdcaea0533a5277a65b4fc9935b66e0619e053", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1750565152, - "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", + "lastModified": 1751170039, + "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", + "rev": "9c932ae632d6b5150515e5749b198c175d8565db", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750386251, - "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", + "lastModified": 1750994206, + "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb", + "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf", "type": "github" }, "original": { @@ -266,11 +266,11 @@ }, "nixpkgs-fingerprint": { "locked": { - "lastModified": 1750330365, - "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750400657, - "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750605355, - "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", + "lastModified": 1751285371, + "narHash": "sha256-/hDU+2AUeFFu5qGHO/UyFMc4UG/x5Cw5uXO36KGTk6c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6", + "rev": "b9c03fbbaf84d85bb28eee530c7e9edc4021ca1b", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750605355, - "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", + "lastModified": 1751285371, + "narHash": "sha256-/hDU+2AUeFFu5qGHO/UyFMc4UG/x5Cw5uXO36KGTk6c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6", + "rev": "b9c03fbbaf84d85bb28eee530c7e9edc4021ca1b", "type": "github" }, "original": { @@ -367,11 +367,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750688320, - "narHash": "sha256-TJ9SOhBDuCvnjOsvimsQuhzeJTIz6qdv7IERYNWZhM4=", + "lastModified": 1751365625, + "narHash": "sha256-dfvkCvPyMGm7XZs15WRJc2ICNSU+Ec1iM1LnPwTDP/g=", "owner": "nix-community", "repo": "NUR", - "rev": "b8dcdcf7c54ec3be8a51be57907182dd3d05409a", + "rev": "efe71f285c504678cdca4f596b47e5012fda182a", "type": "github" }, "original": {