From e34a1c4dbca5f1d7566bf694519e6349ee858c4a Mon Sep 17 00:00:00 2001 From: xunuwu Date: Wed, 5 Feb 2025 15:52:28 +0100 Subject: [PATCH] small things idk --- .../programs/desktop/sway/default.nix | 4 ++- home/profiles/programs/music/beets.nix | 25 +++++++++++++++++++ home/suites/nixdesk/default.nix | 23 +++++++++-------- sys/machines/nixdesk/default.nix | 2 +- sys/machines/nixdesk/hardware.nix | 2 +- 5 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 home/profiles/programs/music/beets.nix diff --git a/home/profiles/programs/desktop/sway/default.nix b/home/profiles/programs/desktop/sway/default.nix index 3e607c8..79ed4db 100644 --- a/home/profiles/programs/desktop/sway/default.nix +++ b/home/profiles/programs/desktop/sway/default.nix @@ -14,7 +14,7 @@ services.cliphist = { enable = true; - systemdTarget = "sway-session.target"; + systemdTargets = ["sway-session.target"]; extraOptions = ["-max-items" "150"]; }; @@ -41,6 +41,7 @@ }; }; + wayland.systemd.target = "sway-session.target"; wayland.windowManager.sway = { enable = true; checkConfig = false; # doesnt work with custom wallpaper @@ -134,6 +135,7 @@ "XF86AudioStop" = "exec ${lib.getExe pkgs.playerctl} stop"; "XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next"; "XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous"; + "XF86AudioMute" = "exec ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SINK@ toggle"; } // (let inherit (builtins) foldl'; diff --git a/home/profiles/programs/music/beets.nix b/home/profiles/programs/music/beets.nix new file mode 100644 index 0000000..86601a8 --- /dev/null +++ b/home/profiles/programs/music/beets.nix @@ -0,0 +1,25 @@ +{pkgs, ...}: let + musicDir = "/home/xun/music/test"; +in { + programs.beets = { + enable = true; + package = pkgs.beets-unstable; + settings = { + directory = "${musicDir}/tagged"; + library = "${musicDir}/beets/beets.db"; + + # import = { + # }; + + plugins = [ + "rewrite" + ]; + rewrite = { + "artist GHOST" = "Ghost and Pals"; + }; + + # plugins = [ + # ]; + }; + }; +} diff --git a/home/suites/nixdesk/default.nix b/home/suites/nixdesk/default.nix index c0862be..10e100a 100644 --- a/home/suites/nixdesk/default.nix +++ b/home/suites/nixdesk/default.nix @@ -67,9 +67,12 @@ programs.misc.pwvucontrol programs.misc.qpwgraph programs.misc.libreoffice + programs.music.puddletag programs.music.picard + # programs.music.beets programs.music.cmus + programs.media.mpv programs.media.jellyfin @@ -85,14 +88,14 @@ services.udiskie # although i dont need this for usb memory, it is quite convenient for flashing qmk ]; - qt = { - enable = true; - platformTheme = { - name = "gtk3"; - package = [ - pkgs.libsForQt5.qtstyleplugins - pkgs.qt6.qtbase - ]; - }; - }; + # qt = { + # enable = true; + # platformTheme = { + # name = "gtk3"; + # package = [ + # pkgs.libsForQt5.qtstyleplugins + # pkgs.qt6.qtbase + # ]; + # }; + # }; } diff --git a/sys/machines/nixdesk/default.nix b/sys/machines/nixdesk/default.nix index 0ab6dac..632e096 100644 --- a/sys/machines/nixdesk/default.nix +++ b/sys/machines/nixdesk/default.nix @@ -88,7 +88,7 @@ networking.hostName = "nixdesk"; nixpkgs.config = { - rocmSupport = true; + # rocmSupport = true; allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "apple_cursor" diff --git a/sys/machines/nixdesk/hardware.nix b/sys/machines/nixdesk/hardware.nix index 687236a..8b3ad1b 100644 --- a/sys/machines/nixdesk/hardware.nix +++ b/sys/machines/nixdesk/hardware.nix @@ -27,7 +27,7 @@ }; kernelModules = ["kvm-amd"]; extraModulePackages = with config.boot.kernelPackages; [ - rtl88xxau-aircrack # usb wifi card + # rtl88xxau-aircrack # usb wifi card ]; loader = { timeout = 10;