about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--hosts/aptos/home.nix3
-rw-r--r--hosts/aptos/profile.nix1
-rw-r--r--hosts/carmel/home.nix9
-rw-r--r--profiles/default.nix2
-rw-r--r--profiles/multimedia/default.nix12
5 files changed, 10 insertions, 17 deletions
diff --git a/hosts/aptos/home.nix b/hosts/aptos/home.nix
index d7a6545..c7ef977 100644
--- a/hosts/aptos/home.nix
+++ b/hosts/aptos/home.nix
@@ -10,5 +10,8 @@
     scanner.enable = true;
     tmux.enable = true;
     yt-dlp.enable = true;
+    vlc.enable = true;
+    mpv.enable = true;
+    sublime-music.enable = true;
   };
 }
diff --git a/hosts/aptos/profile.nix b/hosts/aptos/profile.nix
index b807f24..3195d52 100644
--- a/hosts/aptos/profile.nix
+++ b/hosts/aptos/profile.nix
@@ -2,7 +2,6 @@
 
   my.profiles = {
     desktop.enable = true;
-    multimedia.enable = true;
     trusted.enable = true;
   };
 }
diff --git a/hosts/carmel/home.nix b/hosts/carmel/home.nix
index 231aebd..c7ef977 100644
--- a/hosts/carmel/home.nix
+++ b/hosts/carmel/home.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
-
-{
+{ pkgs, ... }: {
   my.home = {
     packages.enable = true;
+    bluetooth.enable = true;
+    element.enable = true;
     zsh.enable = true;
     git.enable = true;
     go.enable = true;
@@ -10,5 +10,8 @@
     scanner.enable = true;
     tmux.enable = true;
     yt-dlp.enable = true;
+    vlc.enable = true;
+    mpv.enable = true;
+    sublime-music.enable = true;
   };
 }
diff --git a/profiles/default.nix b/profiles/default.nix
index df86fe6..059b945 100644
--- a/profiles/default.nix
+++ b/profiles/default.nix
@@ -1 +1 @@
-{ ... }: { imports = [ ./gtk ./trusted ./wm ./desktop ./multimedia ]; }
+{ ... }: { imports = [ ./gtk ./trusted ./wm ./desktop ]; }
diff --git a/profiles/multimedia/default.nix b/profiles/multimedia/default.nix
deleted file mode 100644
index 4c1d3fe..0000000
--- a/profiles/multimedia/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, ... }:
-let cfg = config.my.profiles.multimedia;
-in {
-  options.my.profiles.multimedia = with lib; {
-    enable = mkEnableOption "multimedia profile";
-  };
-  config = lib.mkIf cfg.enable {
-    my.home.vlc.enable = true;
-    my.home.mpv.enable = true;
-    my.home.sublime-music.enable = true;
-  };
-}