add a few more modules to home/ and delete stuff

6 files changed, 62 insertions, 3 deletions

diff --git a/home/default.nix b/home/default.nix
index 8fdc93f..ef9830d 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./beets
+    ./element
     ./emacs
     ./feh
     ./firefox
@@ -13,13 +14,16 @@
     ./gpg
     ./gtk
     ./mail
+    ./mpv
     ./packages
     ./pass
     ./python
     ./scanner
     ./ssh
+    ./sublime-music
     ./terminal
     ./tmux
+    ./vlc
     ./wm
     ./xdg
     ./yt-dlp
diff --git a/home/element/default.nix b/home/element/default.nix
new file mode 100644
index 0000000..44fa583
--- /dev/null
+++ b/home/element/default.nix
@@ -0,0 +1,10 @@
+{ lib, config, ... }:
+let cfg = config.my.home.element;
+in {
+  options.my.home.element = with lib; {
+    enable = mkEnableOption "element configuration";
+  };
+
+  config =
+    lib.mkIf cfg.enable { home.packages = with pkgs; [ element-desktop ]; };
+}
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index b6c07d3..17b44c5 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -5,10 +5,16 @@ in {
     enable = mkEnableOption "emacs configuration";
   };
 
-  config.home.packages = with pkgs;
-    lib.mkIf cfg.enable ([
+  config.home = lib.mkIf cfg.enable {
+    packages = with pkgs; [
       emacsPgtkGcc
       # see https://github.com/hlissner/doom-emacs/issues/4138
       (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]))
-    ]);
+    ];
+
+    sessionVariables = {
+      EDITOR = "emacsclient -c -a=";
+      VISUAL = "emacsclient -c -a=";
+    };
+  };
 }
diff --git a/home/mpv/default.nix b/home/mpv/default.nix
new file mode 100644
index 0000000..7013c0b
--- /dev/null
+++ b/home/mpv/default.nix
@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+let cfg = config.my.home.mpv;
+in {
+  options.my.home.mpv = with lib; {
+    enable = mkEnableOption "mpv configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.mpv = {
+      enable = true;
+      config = {
+        sub-auto = "fuzzy";
+        vo = "gpu";
+        hwdec = "auto-safe";
+        gpu-context = "wayland";
+      };
+      scripts = lib.attrVals [ "sponsorblock" ] pkgs.mpvScripts;
+    };
+  };
+}
diff --git a/home/sublime-music/default.nix b/home/sublime-music/default.nix
new file mode 100644
index 0000000..93b5c98
--- /dev/null
+++ b/home/sublime-music/default.nix
@@ -0,0 +1,10 @@
+{ lib, config, ... }:
+let cfg = config.my.home.sublime-music;
+in {
+  options.my.home.sublime-music = with lib; {
+    enable = mkEnableOption "sublime-music configuration";
+  };
+
+  config =
+    lib.mkIf cfg.enable { home.packages = with pkgs; [ sublime-music ]; };
+}
diff --git a/home/vlc/default.nix b/home/vlc/default.nix
new file mode 100644
index 0000000..0afd3b7
--- /dev/null
+++ b/home/vlc/default.nix
@@ -0,0 +1,9 @@
+{ lib, config, ... }:
+let cfg = config.my.home.vlc;
+in {
+  options.my.home.vlc = with lib; {
+    enable = mkEnableOption "vlc configuration";
+  };
+
+  config = lib.mkIf cfg.enable { home.packages = with pkgs; [ vlc ]; };
+}