From 5b43ec3e71f99de4750d1aee8b54325ce3fc6b3b Mon Sep 17 00:00:00 2001 From: oqyude Date: Sat, 17 May 2025 14:50:15 +0300 Subject: [PATCH] 123 --- devices/laptop.nix | 8 ++++-- flake.lock | 54 +++++++++++++++++------------------ flake.nix | 1 + home/modules/packages.nix | 1 + modules/essentials/users.nix | 1 + modules/extra/self/zapret.nix | 1 + modules/software/beets.nix | 21 ++++++++++++++ 7 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 modules/software/beets.nix diff --git a/devices/laptop.nix b/devices/laptop.nix index 3e19486..03042e0 100755 --- a/devices/laptop.nix +++ b/devices/laptop.nix @@ -20,6 +20,7 @@ let nixos-hardware.nixosModules.asus-fa506ic self.nixosModules.software.wine + self.nixosModules.software.beets self.nixosModules.desktop self.homeConfigurations.main.nixosModule self.homeConfigurations.root.nixosModule @@ -128,7 +129,7 @@ let pipewire = { enable = lib.mkDefault true; systemWide = true; - alsa.enable = true; + alsa.enable = false; alsa.support32Bit = true; pulse.enable = true; jack.enable = true; @@ -143,7 +144,7 @@ let ]; "default.clock.quantum" = 256; "default.clock.min-quantum" = 64; - "default.clock.max-quantum" = 1024; + "default.clock.max-quantum" = 2048; }; }; }; @@ -152,6 +153,9 @@ let earlyoom.enable = true; preload.enable = true; }; + nixpkgs.config.pulseaudio = true; + + #services.power-profiles-daemon.enable = false; security = { rtkit.enable = true; diff --git a/flake.lock b/flake.lock index c9ffe78..eb41a45 100755 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1746729224, - "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", + "lastModified": 1747274630, + "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", "owner": "nix-community", "repo": "disko", - "rev": "85555d27ded84604ad6657ecca255a03fd878607", + "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1747155932, - "narHash": "sha256-NnPzzXEqfYjfrimLzK0JOBItfdEJdP/i6SNTuunCGgw=", + "lastModified": 1747439237, + "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d832ddfda9facf538f3dda9b6985fb0234f151c", + "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747101345, - "narHash": "sha256-IjktcMUVCez262VtDAh9U9FCs8Cur+yagZpcJzDwdFY=", + "lastModified": 1747273974, + "narHash": "sha256-2OzfizT3iwD+2dO1Fl4T6+52XBbviq4DuTMTGRK3P9k=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "3b8f27e4a0b894dedc07f398b5ef1a747861fea3", + "rev": "bafc474d9d2ac0f97411b48679b00811fff39cfa", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1746934494, - "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", + "lastModified": 1747470409, + "narHash": "sha256-R9TP2//BDKyjNzuZybplIZm7HQEnwL8khs7EmmTPYP4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", + "rev": "c1f63a0c3bf1b2fe05124ccb099333163e2184a7", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747209494, + "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "5d736263df906c5da72ab0f372427814de2f52f8", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747060738, - "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "lastModified": 1747312588, + "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "rev": "b1bebd0fe266bbd1820019612ead889e96a8fa2d", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747060738, - "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "lastModified": 1747312588, + "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "rev": "b1bebd0fe266bbd1820019612ead889e96a8fa2d", "type": "github" }, "original": { @@ -367,11 +367,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747151055, - "narHash": "sha256-zCGpF8BREFvzkSqgfEBgIcqtrnT8e9IqNQ3Zqe+OOk4=", + "lastModified": 1747469876, + "narHash": "sha256-UXsEg6uVP9wnnYW4izqhJXapqWTLnTSSDryUthlYnfM=", "owner": "nix-community", "repo": "NUR", - "rev": "33dadfb985b667b866d1175a8519b7583a38ef63", + "rev": "8ad37799ad1e8cd37dc1dbc267e1f6ecb559808b", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "zapret": { "locked": { - "lastModified": 1745932796, - "narHash": "sha256-nbQNqqtLUF7FNg0FfT+V/qvRtTanSA4O3c3e/lto5oU=", + "lastModified": 1747470474, + "narHash": "sha256-S+vGlg+3ACev+pn+QaeN719NSDRXXnAdwKPMhgg23Nc=", "owner": "oqyude", "repo": "zapret-easyflake", - "rev": "dd2c75127343d08cf0a5fa8d15bdfe016d2691c5", + "rev": "a60b28a36f59a4d9a43fff3ba06d98689a1e709f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 68dd5dc..b1c60ce 100755 --- a/flake.nix +++ b/flake.nix @@ -94,6 +94,7 @@ default = import ./modules/default.nix flakeContext; desktop = import ./modules/desktop/default.nix flakeContext; software = { + beets = import ./modules/software/beets.nix flakeContext; daw = import ./modules/software/daw.nix flakeContext; virtual = import ./modules/software/virtual.nix flakeContext; wine = import ./modules/software/wine.nix flakeContext; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index dbf1259..389b390 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -52,6 +52,7 @@ in # Workflow _64gram discord + vesktop gramps kdePackages.filelight libreoffice-qt6 diff --git a/modules/essentials/users.nix b/modules/essentials/users.nix index 0807095..b3a4524 100644 --- a/modules/essentials/users.nix +++ b/modules/essentials/users.nix @@ -18,6 +18,7 @@ "pipewire" "qemu-libvirtd" "wheel" + "beets" ]; }; }; diff --git a/modules/extra/self/zapret.nix b/modules/extra/self/zapret.nix index a52c59b..ef3e429 100644 --- a/modules/extra/self/zapret.nix +++ b/modules/extra/self/zapret.nix @@ -6,6 +6,7 @@ }: { systemd.services.zapret = { + enable = false; description = "zapret complete"; unitConfig = { After = [ "network-online.target" ]; diff --git a/modules/software/beets.nix b/modules/software/beets.nix new file mode 100644 index 0000000..eeaeb88 --- /dev/null +++ b/modules/software/beets.nix @@ -0,0 +1,21 @@ +{ inputs, ... }@flakeContext: +{ + config, + lib, + pkgs, + ... +}: +{ + users = { + users = { + beets = { + #isNormalUser = true; + description = "beets service"; + #initialPassword = "1234"; + extraGroups = [ + "beets" + ]; + }; + }; + }; +}