Sound module

5 files changed, 36 insertions, 57 deletions

diff --git a/configuration.nix b/configuration.nix
index 7c14db0..561266a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -18,6 +18,7 @@
     ./modules/thunderbird/default.nix
     ./modules/clamav.nix
     ./modules/lockscreen.nix
+    ./modules/sound/default.nix
   ];
 
   nixpkgs.config = {
@@ -45,16 +46,6 @@
 
   programs.kdeconnect.enable = true;
 
-  # Enable sound.
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    jack.enable = true;
-    wireplumber.enable = true;
-  };
-
   # Network
   networking = {
     hostName = "smartfridge";
@@ -108,25 +99,11 @@
     };
   };
 
-  # programs.tmux = {
-  #   enable = true;
-  #   secureSocket = true;
-  #   terminal = "tmux-direct"; # st-256color
-  #   shortcut = "0";
-  # };
-
   # I18n and keyboard layout
   time.timeZone = "Asia/Kolkata";
   i18n.defaultLocale = "en_GB.UTF-8";
   services.xserver.xkb.layout = "us";
 
-  home-manager.useGlobalPkgs = true;
-  # Home manager
-  home-manager.users.imsohexy = { pkgs, ... }: {
-    imports = [ ./home.nix ];
-    home = { stateVersion = "21.03"; };
-  };
-
   # X11 config
   services.xserver = {
     enable = true;
@@ -161,6 +138,13 @@
     suspendKey = "ignore";
   };
 
+  # Home manager
+  home-manager.useGlobalPkgs = true;
+  home-manager.users.imsohexy = { pkgs, ... }: {
+    imports = [ ./home.nix ];
+    home = { stateVersion = "21.03"; };
+  };
+
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
     auto-optimise-store = true;
diff --git a/home.nix b/home.nix
index 7df00a2..54374fb 100644
--- a/home.nix
+++ b/home.nix
@@ -63,11 +63,6 @@ in
     ];
   };
 
-  services.easyeffects = {
-    enable = true;
-    # preset = "default";
-  };
-
   services.syncthing = {
     enable = true;
     tray = false;
diff --git a/modules/sound/default.nix b/modules/sound/default.nix
new file mode 100644
index 0000000..aed4f94
--- /dev/null
+++ b/modules/sound/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+{
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    pulse.enable = true;
+    jack.enable = true;
+    wireplumber.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    alsa-utils
+    qjackctl
+    ardour
+    fluidsynth
+    a2jmidid
+    pavucontrol
+    audacity
+    easyeffects
+  ];
+}
diff --git a/packages.nix b/packages.nix
index 95bdf57..294a64f 100644
--- a/packages.nix
+++ b/packages.nix
@@ -81,12 +81,11 @@ let
     imagemagick
     ffmpeg-full
     feh
-    # obs-studio
-    inkscape
-    krita
     zathura
-    blender
-    j4-dmenu-desktop
+    inkscape
+    # obs-studio
+    # krita
+    # blender
 
     # chiaki # PS remote play
 
@@ -95,16 +94,6 @@ let
     dunst
     newsboat
 
-    # Audio
-    qjackctl
-    ardour
-    fluidsynth
-    a2jmidid
-    pavucontrol
-    audacity
-    # guitarix
-    # easyeffects
-
     # TUI stuff
     lf
     bottom
@@ -112,8 +101,8 @@ let
     wyrd
     dua
 
-    (builtins.getFlake "github:phenax/chelleport/5262d942c4c2c36529fbe704e7de165044e6dc99").packages.x86_64-linux.default
-    (builtins.getFlake "github:phenax/draw-stuff-on-your-screen/6e0e1f6ee603045cac5bb5d9d75d80c9ddef6c6e").packages.x86_64-linux.default
+    # (builtins.getFlake "github:phenax/chelleport/5262d942c4c2c36529fbe704e7de165044e6dc99").packages.x86_64-linux.default
+    # (builtins.getFlake "github:phenax/draw-stuff-on-your-screen/6e0e1f6ee603045cac5bb5d9d75d80c9ddef6c6e").packages.x86_64-linux.default
     (pkgs.writeShellScriptBin
       "null-browser"
       ''exec /home/imsohexy/dev/projects/web-browser/result/bin/null-browser "$@"'')
@@ -153,12 +142,6 @@ let
       }
     ) {}).wineWowPackages.stable
 
-    # wineWowPackages.stable
-    # appimage-run
-
-    # Audio
-    alsa-utils
-
     # X stuff
     picom
     brightnessctl
@@ -208,11 +191,6 @@ in
   hardware.steam-hardware.enable = true;
   programs.gamemode.enable = true;
 
-  programs.alvr = {
-    enable = false;
-    openFirewall = false;
-  };
-
   programs._1password.enable = true;
   programs._1password-gui.enable = true;
 }
diff --git a/packages/shotkey/source b/packages/shotkey/source
-Subproject e453b9654279a20ffcd59d80ba5b35649a59422
+Subproject 8bc06c025219e7bb48151b1affb74d2bf463e1e