From bcadad2420115d11a02ca5f4063ddf489f94cd8c Mon Sep 17 00:00:00 2001 From: Jimbo Date: Sun, 29 Dec 2024 09:47:44 -0500 Subject: [PATCH] Move MPD to home manager --- flake.lock | 36 +++++++++---------- modules/home/services/default.nix | 1 + modules/home/services/mpd/default.nix | 15 ++++++++ modules/home/wms/programs/wpaperd/default.nix | 1 + .../disks/impermanence/jimbo/default.nix | 3 ++ modules/system/services/general/default.nix | 1 - .../system/services/general/mpd/default.nix | 25 ------------- .../services/general/portals/default.nix | 1 - .../server/social/lemmy/nginx/default.nix | 4 +-- .../matrix/{synapse => }/coturn/default.nix | 0 .../{synapse => }/coturn/nginx/default.nix | 0 .../services/server/social/matrix/default.nix | 4 ++- .../{synapse => }/slidingsync/default.nix | 0 .../server/social/matrix/synapse/default.nix | 6 ---- modules/system/settings/security/default.nix | 1 - .../settings/security/rtprio/default.nix | 11 ------ 16 files changed, 43 insertions(+), 66 deletions(-) create mode 100644 modules/home/services/mpd/default.nix delete mode 100644 modules/system/services/general/mpd/default.nix rename modules/system/services/server/social/matrix/{synapse => }/coturn/default.nix (100%) rename modules/system/services/server/social/matrix/{synapse => }/coturn/nginx/default.nix (100%) rename modules/system/services/server/social/matrix/{synapse => }/slidingsync/default.nix (100%) delete mode 100644 modules/system/settings/security/rtprio/default.nix diff --git a/flake.lock b/flake.lock index 10cfaf0..0d551b6 100644 --- a/flake.lock +++ b/flake.lock @@ -229,11 +229,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -315,11 +315,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1735091106, - "narHash": "sha256-EDjfstpI7/RqzF1FHhUS43o3cPin5q2OUUfs26xrVto=", + "lastModified": 1735263966, + "narHash": "sha256-/HP7IySllvThIeyGLQhP2Cmiv9i1YFYk5fBgY6BOxs8=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "c4e70d41cbae819d01ca8b2c0ac1e6976fdf2abb", + "rev": "e030d9dbae3804c4faef9b7cd47b879b47c3e465", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735141468, + "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", "type": "github" }, "original": { @@ -421,11 +421,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735108957, - "narHash": "sha256-mbaC0wtoHF7msHk/URWp+a5avfT/R33R+0uzg+2p6zI=", + "lastModified": 1735337462, + "narHash": "sha256-B+PNIYtTmgnTV/wdA/qrYohmeBHaYrDwVAueODdvtlo=", "owner": "nix-community", "repo": "NUR", - "rev": "76a7bc7f0cde12611fd4bd720e8d3ffd48772fe2", + "rev": "538f624930cdfb852e4e3dd055f79e932d5b3c16", "type": "github" }, "original": { @@ -589,11 +589,11 @@ }, "unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { diff --git a/modules/home/services/default.nix b/modules/home/services/default.nix index a2efd96..40c203a 100644 --- a/modules/home/services/default.nix +++ b/modules/home/services/default.nix @@ -3,6 +3,7 @@ imports = [ ./easyeffects ./gnome-keyring + ./mpd ./udiskie ]; } diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix new file mode 100644 index 0000000..e389fff --- /dev/null +++ b/modules/home/services/mpd/default.nix @@ -0,0 +1,15 @@ +{ config, lib, ... }: +{ + services.mpd = { + enable = true; + network.startWhenNeeded = true; + musicDirectory = "/home/jimbo/JimboNFS/Music/JimBops"; + playlistDirectory = "/home/jimbo/JimboNFS/Music/JimBops/Playlists"; + extraConfig = '' + audio_output { + type "pipewire" + name "Local Pipewire" + } + ''; + }; +} diff --git a/modules/home/wms/programs/wpaperd/default.nix b/modules/home/wms/programs/wpaperd/default.nix index fb55007..f88e2dc 100644 --- a/modules/home/wms/programs/wpaperd/default.nix +++ b/modules/home/wms/programs/wpaperd/default.nix @@ -3,6 +3,7 @@ programs.wpaperd = { enable = true; settings = { + default.mode = "center"; any.path = "~/.assets/wallpapers/1.png"; "${config.displays.d2}".path = "~/.assets/wallpapers/2.png"; "${config.displays.d3}".path = "~/.assets/wallpapers/3.png"; diff --git a/modules/system/devices/disks/impermanence/jimbo/default.nix b/modules/system/devices/disks/impermanence/jimbo/default.nix index 2dd3a93..d645c4a 100644 --- a/modules/system/devices/disks/impermanence/jimbo/default.nix +++ b/modules/system/devices/disks/impermanence/jimbo/default.nix @@ -22,12 +22,15 @@ ".config/heroic" ".config/obs-studio" + ".local/share/mpd" ".local/share/nvim/undo" ".local/share/fractal" ".local/share/PrismLauncher" ".local/share/Steam" ".local/share/TelegramDesktop" + ".local/state/wireplumber" + { directory = ".ssh"; mode = "0700"; } { directory = ".gnupg"; mode = "0700"; } { directory = ".local/share/keyrings"; mode = "0700"; } diff --git a/modules/system/services/general/default.nix b/modules/system/services/general/default.nix index 73f051d..6e4b51a 100644 --- a/modules/system/services/general/default.nix +++ b/modules/system/services/general/default.nix @@ -7,7 +7,6 @@ ./gvfs ./keyd ./libvirtd - ./mpd ./portals ./snowflake ./ssh diff --git a/modules/system/services/general/mpd/default.nix b/modules/system/services/general/mpd/default.nix deleted file mode 100644 index f86b87f..0000000 --- a/modules/system/services/general/mpd/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, lib, ... }: -{ - config = lib.mkIf config.system.desktop.enable { - services.mpd = { - enable = true; - startWhenNeeded = true; - user = "jimbo"; - group = "users"; - musicDirectory = "/home/jimbo/JimboNFS/Music/JimBops"; - playlistDirectory = "/home/jimbo/JimboNFS/Music/JimBops/Playlists"; - extraConfig = '' - audio_output { - type "pipewire" - name "Local Pipewire" - } - ''; - }; - - systemd.services.mpd.environment = { - XDG_RUNTIME_DIR = "/run/user/${toString config.users.users.jimbo.uid}"; - }; - - environment.persistence."/persist".directories = [ "/var/lib/mpd" ]; - }; -} diff --git a/modules/system/services/general/portals/default.nix b/modules/system/services/general/portals/default.nix index 43649a0..578b25e 100644 --- a/modules/system/services/general/portals/default.nix +++ b/modules/system/services/general/portals/default.nix @@ -12,7 +12,6 @@ }; extraPortals = with pkgs; [ xdg-desktop-portal-gnome - xdg-desktop-portal-hyprland ]; }; }; diff --git a/modules/system/services/server/social/lemmy/nginx/default.nix b/modules/system/services/server/social/lemmy/nginx/default.nix index 60d6c03..f59b5bb 100644 --- a/modules/system/services/server/social/lemmy/nginx/default.nix +++ b/modules/system/services/server/social/lemmy/nginx/default.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ config, lib, ... }: { - services.nginx.virtualHosts."lemmy.${config.domains.jim1}" = { + services.nginx.virtualHosts."lemmy.${config.domains.jim1}" = lib.mkIf config.services.lemmy.enable { enableACME = true; forceSSL = true; }; diff --git a/modules/system/services/server/social/matrix/synapse/coturn/default.nix b/modules/system/services/server/social/matrix/coturn/default.nix similarity index 100% rename from modules/system/services/server/social/matrix/synapse/coturn/default.nix rename to modules/system/services/server/social/matrix/coturn/default.nix diff --git a/modules/system/services/server/social/matrix/synapse/coturn/nginx/default.nix b/modules/system/services/server/social/matrix/coturn/nginx/default.nix similarity index 100% rename from modules/system/services/server/social/matrix/synapse/coturn/nginx/default.nix rename to modules/system/services/server/social/matrix/coturn/nginx/default.nix diff --git a/modules/system/services/server/social/matrix/default.nix b/modules/system/services/server/social/matrix/default.nix index daef3a9..a36a3b2 100644 --- a/modules/system/services/server/social/matrix/default.nix +++ b/modules/system/services/server/social/matrix/default.nix @@ -1,7 +1,9 @@ { ... }: { imports = [ - ./synapse + ./coturn ./element + ./slidingsync + ./synapse ]; } diff --git a/modules/system/services/server/social/matrix/synapse/slidingsync/default.nix b/modules/system/services/server/social/matrix/slidingsync/default.nix similarity index 100% rename from modules/system/services/server/social/matrix/synapse/slidingsync/default.nix rename to modules/system/services/server/social/matrix/slidingsync/default.nix diff --git a/modules/system/services/server/social/matrix/synapse/default.nix b/modules/system/services/server/social/matrix/synapse/default.nix index 2fb7b5e..bd22d6e 100644 --- a/modules/system/services/server/social/matrix/synapse/default.nix +++ b/modules/system/services/server/social/matrix/synapse/default.nix @@ -1,11 +1,5 @@ { pkgs, config, ... }: { - imports = [ - ./coturn - ./slidingsync - ./nginx - ]; - services.matrix-synapse = { enable = true; settings = { diff --git a/modules/system/settings/security/default.nix b/modules/system/settings/security/default.nix index c1e14e8..e187a55 100644 --- a/modules/system/settings/security/default.nix +++ b/modules/system/settings/security/default.nix @@ -4,6 +4,5 @@ ./apparmor ./polkit ./privilege - ./rtprio ]; } diff --git a/modules/system/settings/security/rtprio/default.nix b/modules/system/settings/security/rtprio/default.nix deleted file mode 100644 index 3ff7add..0000000 --- a/modules/system/settings/security/rtprio/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib, config, ... }: -{ - security.pam.loginLimits = lib.mkIf config.system.desktop.enable [ - { - domain = "@users"; - item = "rtprio"; - type = "-"; - value = 1; - } - ]; -}