From f8069d23f84b33c6a7d00d3480bb0d1955b3ab33 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 10 Nov 2023 01:24:35 +0800 Subject: [PATCH] home: added ./resources/media/nixos --- users/guanranwang/home-manager/nixos/home.nix | 10 ---------- .../home-manager/nixos/presets/desktop.nix | 3 +-- .../resources/media/nixos/default.nix | 8 ++++++++ .../resources/media/nixos/music.nix | 17 +++++++++++++++++ .../resources/media/nixos/photo.nix | 5 +++++ .../{ => resources/media}/nixos/spicetify.nix | 0 .../resources/media/nixos/video.nix | 5 +++++ 7 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 users/guanranwang/home-manager/resources/media/nixos/default.nix create mode 100644 users/guanranwang/home-manager/resources/media/nixos/music.nix create mode 100644 users/guanranwang/home-manager/resources/media/nixos/photo.nix rename users/guanranwang/home-manager/{ => resources/media}/nixos/spicetify.nix (100%) create mode 100644 users/guanranwang/home-manager/resources/media/nixos/video.nix diff --git a/users/guanranwang/home-manager/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix index 2658c52..d3a5ea8 100644 --- a/users/guanranwang/home-manager/nixos/home.nix +++ b/users/guanranwang/home-manager/nixos/home.nix @@ -8,7 +8,6 @@ # gui gparted timeshift - mpv ### matrix #fluffychat @@ -16,18 +15,11 @@ cinny-desktop #nheko - ### music - easyeffects - yesplaymusic - amberol - netease-cloud-music-gtk - ### misc bitwarden #discord #qq tuba - mousai protonup-qt piper telegram-desktop @@ -36,14 +28,12 @@ dippi obs-studio gnome.seahorse - gnome.eog gnome.file-roller gnome.gnome-weather gnome.gnome-calculator gnome.dconf-editor # TUI - cava joshuto # rs bottom helix diff --git a/users/guanranwang/home-manager/nixos/presets/desktop.nix b/users/guanranwang/home-manager/nixos/presets/desktop.nix index 80b6c7d..407c081 100644 --- a/users/guanranwang/home-manager/nixos/presets/desktop.nix +++ b/users/guanranwang/home-manager/nixos/presets/desktop.nix @@ -11,14 +11,13 @@ ../../resources/browser/librewolf.nix ../../resources/lang/nix.nix ../../resources/lang/go.nix - + ../../resources/media/nixos ../../resources/wm/sway.nix ../xdg ../home.nix ../fonts.nix ../i18n.nix - ../spicetify.nix ../theme.nix ]; } diff --git a/users/guanranwang/home-manager/resources/media/nixos/default.nix b/users/guanranwang/home-manager/resources/media/nixos/default.nix new file mode 100644 index 0000000..43557a3 --- /dev/null +++ b/users/guanranwang/home-manager/resources/media/nixos/default.nix @@ -0,0 +1,8 @@ +{...}: { + ### For NixOS + imports = [ + ./music.nix + ./photo.nix + ./video.nix + ]; +} diff --git a/users/guanranwang/home-manager/resources/media/nixos/music.nix b/users/guanranwang/home-manager/resources/media/nixos/music.nix new file mode 100644 index 0000000..1c18d0b --- /dev/null +++ b/users/guanranwang/home-manager/resources/media/nixos/music.nix @@ -0,0 +1,17 @@ +{pkgs, ...}: { + imports = [./spicetify.nix]; + home.packages = with pkgs; [ + ### Local + mpv + amberol + + ### Streaming + yesplaymusic + netease-cloud-music-gtk + + ### Misc + mousai + cava + easyeffects + ]; +} diff --git a/users/guanranwang/home-manager/resources/media/nixos/photo.nix b/users/guanranwang/home-manager/resources/media/nixos/photo.nix new file mode 100644 index 0000000..a54d1a0 --- /dev/null +++ b/users/guanranwang/home-manager/resources/media/nixos/photo.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + gnome.eog + ]; +} diff --git a/users/guanranwang/home-manager/nixos/spicetify.nix b/users/guanranwang/home-manager/resources/media/nixos/spicetify.nix similarity index 100% rename from users/guanranwang/home-manager/nixos/spicetify.nix rename to users/guanranwang/home-manager/resources/media/nixos/spicetify.nix diff --git a/users/guanranwang/home-manager/resources/media/nixos/video.nix b/users/guanranwang/home-manager/resources/media/nixos/video.nix new file mode 100644 index 0000000..38566c0 --- /dev/null +++ b/users/guanranwang/home-manager/resources/media/nixos/video.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + mpv + ]; +}