diff --git a/hosts/common/configs/system/bluetooth/default.nix b/hosts/common/configs/system/bluetooth/default.nix index 125e224..2ef3069 100644 --- a/hosts/common/configs/system/bluetooth/default.nix +++ b/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; + } + ]; } diff --git a/hosts/common/configs/system/btop/default.nix b/hosts/common/configs/system/btop/default.nix deleted file mode 100644 index 589fd7f..0000000 --- a/hosts/common/configs/system/btop/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ btop ]; -} diff --git a/hosts/common/configs/system/fastfetch/default.nix b/hosts/common/configs/system/fastfetch/default.nix deleted file mode 100644 index b25ccc6..0000000 --- a/hosts/common/configs/system/fastfetch/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ fastfetch ]; -} diff --git a/hosts/common/configs/system/kubernetes/default.nix b/hosts/common/configs/system/kubernetes/default.nix deleted file mode 100644 index daabd08..0000000 --- a/hosts/common/configs/system/kubernetes/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - kubectl - kubernetes-helm - kind - ]; -} diff --git a/hosts/common/configs/system/lsof/default.nix b/hosts/common/configs/system/lsof/default.nix deleted file mode 100644 index adb89ab..0000000 --- a/hosts/common/configs/system/lsof/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ lsof ]; -} diff --git a/hosts/common/configs/system/ncdu/default.nix b/hosts/common/configs/system/ncdu/default.nix deleted file mode 100644 index 4d5dc42..0000000 --- a/hosts/common/configs/system/ncdu/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: -{ - environment = { - systemPackages = with pkgs; [ ncdu ]; - - etc."ncdu.conf".text = '' - -1 - -e - -t 0 - --confirm-quit - ''; - }; -} diff --git a/hosts/common/configs/system/ranger/default.nix b/hosts/common/configs/system/ranger/default.nix deleted file mode 100644 index 0b3f4a9..0000000 --- a/hosts/common/configs/system/ranger/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ ranger ]; -} diff --git a/hosts/common/configs/user/console/bluetooth/default.nix b/hosts/common/configs/user/console/bluetooth/default.nix deleted file mode 100644 index ad479b6..0000000 --- a/hosts/common/configs/user/console/bluetooth/default.nix +++ /dev/null @@ -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" ]; - }; -} diff --git a/hosts/common/configs/user/console/lsof/default.nix b/hosts/common/configs/user/console/lsof/default.nix new file mode 100644 index 0000000..a8df201 --- /dev/null +++ b/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 ]; +} diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix index 0f0a434..2cfa9f3 100644 --- a/hosts/eirene/default.nix +++ b/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 diff --git a/hosts/eirene/users/nick/default.nix b/hosts/eirene/users/nick/default.nix index 50b9d94..ed7a054 100644 --- a/hosts/eirene/users/nick/default.nix +++ b/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; }) diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix index 5ec7d88..efaa0e2 100644 --- a/hosts/elara/default.nix +++ b/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 diff --git a/hosts/elara/users/nikara/default.nix b/hosts/elara/users/nikara/default.nix index 0c9ca16..cb4b49e 100644 --- a/hosts/elara/users/nikara/default.nix +++ b/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; }) diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix index e071022..8f39e31 100644 --- a/hosts/installer/default.nix +++ b/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 diff --git a/hosts/installer/users/nick/default.nix b/hosts/installer/users/nick/default.nix index 0e7cd50..190153d 100644 --- a/hosts/installer/users/nick/default.nix +++ b/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; })