Clean up system imports

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/configs/system/bluetooth/default.nix

@@ -13,4 +13,10 @@
   systemd.services.bluetooth.after = [
     config.environment.persistence."/persist"."/var/lib/bluetooth".mount
   ];
+
+  home-manager.sharedModules = [
+    {
+      services.mpris-proxy.enable = config.services.pipewire.enable;
+    }
+  ];
 }

hosts/common/configs/system/btop/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [ btop ];
-}

hosts/common/configs/system/fastfetch/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [ fastfetch ];
-}

hosts/common/configs/system/kubernetes/default.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    kubectl
-    kubernetes-helm
-    kind
-  ];
-}

hosts/common/configs/system/lsof/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [ lsof ];
-}

hosts/common/configs/system/ncdu/default.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-{
-  environment = {
-    systemPackages = with pkgs; [ ncdu ];
-
-    etc."ncdu.conf".text = ''
-      -1
-      -e
-      -t 0
-      --confirm-quit
-    '';
-  };
-}

hosts/common/configs/system/ranger/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [ ranger ];
-}

hosts/common/configs/user/console/bluetooth/default.nix

@@ -1,32 +0,0 @@
-{
-  user ? throw "user argument is required",
-  home ? throw "home argument is required",
-}:
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  home-manager.users.${user}.systemd.user.services.mpris-proxy = {
-    Unit = {
-      Description = "MPRIS proxy";
-      Requires = [ "sound.target" ];
-      After = [
-        "network.target"
-        "sound.target"
-      ];
-    };
-
-    Service.ExecStart = lib.meta.getExe (
-      pkgs.writeShellApplication {
-        name = "init-mpris-proxy";
-        runtimeInputs = with pkgs; [ bluez ];
-        text = "exec mpris-proxy";
-      }
-    );
-
-    Install.WantedBy = [ "default.target" ];
-  };
-}

hosts/common/configs/user/console/lsof/default.nix

@@ -0,0 +1,8 @@
+{
+  user ? throw "user argument is required",
+  home ? throw "home argument is required",
+}:
+{ pkgs, ... }:
+{
+  home-manager.users.${user}.home.packages = with pkgs; [ lsof ];
+}

hosts/eirene/default.nix

@@ -10,18 +10,14 @@
     ../common/configs/system/bluetooth
     ../common/configs/system/boot
     ../common/configs/system/brightnessctl
-    ../common/configs/system/btop
     ../common/configs/system/btrfs
     ../common/configs/system/cpu
     ../common/configs/system/docker
-    ../common/configs/system/fastfetch
     ../common/configs/system/getty
     ../common/configs/system/git
     ../common/configs/system/gpg-agent
     ../common/configs/system/impermanence
     ../common/configs/system/libvirt
-    ../common/configs/system/lsof
-    ../common/configs/system/ncdu
     ../common/configs/system/neovim
     ../common/configs/system/networking
     ../common/configs/system/nix
@@ -33,7 +29,6 @@
     ../common/configs/system/plymouth
     ../common/configs/system/powertop
     ../common/configs/system/printing
-    ../common/configs/system/ranger
     ../common/configs/system/sops
     ../common/configs/system/ssh
     ../common/configs/system/system

hosts/eirene/users/nick/default.nix

@@ -11,7 +11,6 @@ in
 
     (import ../../../common/configs/user/console/android { inherit user home; })
     (import ../../../common/configs/user/console/bashmount { inherit user home; })
-    (import ../../../common/configs/user/console/bluetooth { inherit user home; })
     (import ../../../common/configs/user/console/brightnessctl { inherit user home; })
     (import ../../../common/configs/user/console/btop { inherit user home; })
     (import ../../../common/configs/user/console/docker { inherit user home; })
@@ -23,6 +22,7 @@ in
     (import ../../../common/configs/user/console/imagemagick { inherit user home; })
     (import ../../../common/configs/user/console/jq { inherit user home; })
     (import ../../../common/configs/user/console/libvirt { inherit user home; })
+    (import ../../../common/configs/user/console/lsof { inherit user home; })
     (import ../../../common/configs/user/console/ncdu { inherit user home; })
     (import ../../../common/configs/user/console/neovim { inherit user home; })
     (import ../../../common/configs/user/console/nix { inherit user home; })

hosts/elara/default.nix

@@ -14,19 +14,14 @@
     ../common/configs/system/bluetooth
     ../common/configs/system/boot
     ../common/configs/system/brightnessctl
-    ../common/configs/system/btop
     ../common/configs/system/btrfs
     ../common/configs/system/cloudflared
     ../common/configs/system/cpu
     ../common/configs/system/docker
-    ../common/configs/system/fastfetch
     ../common/configs/system/getty
     ../common/configs/system/git
     ../common/configs/system/gpg-agent
     ../common/configs/system/impermanence
-    ../common/configs/system/kubernetes
-    ../common/configs/system/lsof
-    ../common/configs/system/ncdu
     ../common/configs/system/neovim
     ../common/configs/system/networking
     ../common/configs/system/nix
@@ -38,7 +33,6 @@
     ../common/configs/system/plymouth
     ../common/configs/system/powertop
     ../common/configs/system/printing
-    ../common/configs/system/ranger
     ../common/configs/system/sops
     ../common/configs/system/ssh
     ../common/configs/system/system

hosts/elara/users/nikara/default.nix

@@ -9,7 +9,6 @@ in
   imports = [
     ../../../common/configs/user/options.nix
     (import ../../../common/configs/user/console/bashmount { inherit user home; })
-    (import ../../../common/configs/user/console/bluetooth { inherit user home; })
     (import ../../../common/configs/user/console/brightnessctl { inherit user home; })
     (import ../../../common/configs/user/console/btop { inherit user home; })
     (import ../../../common/configs/user/console/docker { inherit user home; })
@@ -21,6 +20,7 @@ in
     (import ../../../common/configs/user/console/jq { inherit user home; })
     (import ../../../common/configs/user/console/kubernetes { inherit user home; })
     (import ../../../common/configs/user/console/libvirt { inherit user home; })
+    (import ../../../common/configs/user/console/lsof { inherit user home; })
     (import ../../../common/configs/user/console/ncdu { inherit user home; })
     (import ../../../common/configs/user/console/neovim { inherit user home; })
     (import ../../../common/configs/user/console/nix { inherit user home; })

hosts/installer/default.nix

@@ -10,15 +10,11 @@
     ./hardware
 
     ../common/configs/system/boot
-    ../common/configs/system/btop
     ../common/configs/system/btrfs
-    ../common/configs/system/fastfetch
     ../common/configs/system/getty
     ../common/configs/system/git
     ../common/configs/system/gpg-agent
     ../common/configs/system/impermanence
-    ../common/configs/system/lsof
-    ../common/configs/system/ncdu
     ../common/configs/system/neovim
     ../common/configs/system/networking
     ../common/configs/system/nix
@@ -26,7 +22,6 @@
     ../common/configs/system/nix-ld
     ../common/configs/system/nixpkgs
     ../common/configs/system/ntp
-    ../common/configs/system/ranger
     ../common/configs/system/sops
     ../common/configs/system/ssh
     ../common/configs/system/system

hosts/installer/users/nick/default.nix

@@ -15,6 +15,7 @@ in
     (import ../../../common/configs/user/console/git { inherit user home; })
     (import ../../../common/configs/user/console/gpg-agent { inherit user home; })
     (import ../../../common/configs/user/console/home-manager { inherit user home; })
+    (import ../../../common/configs/user/console/lsof { inherit user home; })
     (import ../../../common/configs/user/console/ncdu { inherit user home; })
     (import ../../../common/configs/user/console/neovim { inherit user home; })
     (import ../../../common/configs/user/console/nix-develop { inherit user home; })