From 95e94d41f29df561ab339693f81e4a4d2c5c845e Mon Sep 17 00:00:00 2001 From: oqyude Date: Sun, 18 May 2025 00:02:31 +0300 Subject: [PATCH] 123 --- home/modules/default.nix | 1 + modules/essentials/default.nix | 21 +++++++++++++++++++++ modules/essentials/users.nix | 26 -------------------------- modules/software/beets/default.nix | 19 ++++++++++++------- 4 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 modules/essentials/users.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index fb2c914..dda24ab 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -9,5 +9,6 @@ home = { stateVersion = lib.mkDefault "25.05"; homeDirectory = lib.mkDefault "/home/${config.home.username}"; + enableNixpkgsReleaseCheck = false; }; } diff --git a/modules/essentials/default.nix b/modules/essentials/default.nix index 00243a2..ca25976 100644 --- a/modules/essentials/default.nix +++ b/modules/essentials/default.nix @@ -11,4 +11,25 @@ ./tty.nix ./users.nix ]; + + users = { + users = { + "${inputs.zeroq.devices.admin}" = { + isNormalUser = true; + description = "Jor Oqyude"; + initialPassword = "1234"; + extraGroups = [ + "beets" + "audio" + "disk" + "gamemode" + "libvirtd" + "networkmanager" + "pipewire" + "qemu-libvirtd" + "wheel" + ]; + }; + }; + }; } diff --git a/modules/essentials/users.nix b/modules/essentials/users.nix deleted file mode 100644 index eaafd14..0000000 --- a/modules/essentials/users.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - config, - ... -}: -{ - users = { - users = { - oqyude = { - isNormalUser = true; - description = "Jor Oqyude"; - initialPassword = "1234"; - extraGroups = [ - "beets" - "audio" - "disk" - "gamemode" - "libvirtd" - "networkmanager" - "pipewire" - "qemu-libvirtd" - "wheel" - ]; - }; - }; - }; -} diff --git a/modules/software/beets/default.nix b/modules/software/beets/default.nix index 99e0320..c0e4f7a 100644 --- a/modules/software/beets/default.nix +++ b/modules/software/beets/default.nix @@ -17,12 +17,6 @@ let beetsEnv = python3.withPackages (ps: [ ps.beets ]); in { - - environment.systemPackages = [ - beetsEnv - pkgs.imagemagick - ]; - fileSystems."/mnt/beets/music" = { device = "${inputs.zeroq.dirs.music-library}"; options = [ @@ -34,9 +28,20 @@ in systemd.tmpfiles.rules = [ # "d /var/lib/beets 0770 beets beets -" # "d /mnt/beets 0770 beets beets -" - "z /mnt/beets 0755 oqyude users -" # beets absolute paths + "z /mnt/beets 0700 ${inputs.zeroq.dirs.music-library} users -" # beets absolute paths ]; + users = { + users = { + "${inputs.zeroq.devices.admin}" = { + packages = [ + beetsEnv + pkgs.imagemagick + ]; + }; + }; + }; + # users = { # groups = { # beets = { };