diff --git a/flake.nix b/flake.nix index 3aab5fbb..8b022db9 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,6 @@ homeModules = [ ./home/accounts/default.nix ./home/hyprland/default.nix - ./home/media/default.nix ./home/nyxt/default.nix ./home/alacritty.nix ./home/default.nix diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index e6f344ed..f217293b 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,11 +1,4 @@ { config, lib, pkgs, ... }: { - home.packages = with pkgs; [ - grim - slurp - signal-desktop - whatsapp-for-linux - webcord - ]; imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ]; services = { avizo.enable = true; diff --git a/home/hyprland/gtk.nix b/home/hyprland/gtk.nix index 9ad54619..02654ff6 100644 --- a/home/hyprland/gtk.nix +++ b/home/hyprland/gtk.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { gtk = { enable = true; cursorTheme = { diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix index 2b8d2d0a..8caa1777 100644 --- a/home/hyprland/waybar/default.nix +++ b/home/hyprland/waybar/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: { - home.packages = with pkgs; [ networkmanagerapplet bluez ]; +{ config, ... }: { systemd.user.targets.tray.Unit = { Description = "Home Manager System Tray"; Requires = [ "graphical-session-pre.target" ]; diff --git a/home/media/default.nix b/home/media/default.nix deleted file mode 100644 index 396af556..00000000 --- a/home/media/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ tagger ]; - programs.mpv = { - enable = true; - scripts = with pkgs.mpvScripts; [ - mpris - autoload - thumbfast - thumbnail - sponsorblock - quality-menu - webtorrent-mpv-hook - ]; - }; -} diff --git a/system/desktop.nix b/system/desktop.nix index 4cf97d8b..7d21d68b 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -11,6 +11,8 @@ protonvpn-cli protonvpn-gui transmission-gtk + mplayer + tagger libreoffice remmina minesweep-rs diff --git a/system/hyprland.nix b/system/hyprland.nix index c6b83077..9e8bb606 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -22,11 +22,17 @@ wtype wl-clipboard grim + slurp swayimg pamixer pavucontrol playerctl brightnessctl + networkmanagerapplet + bluez + signal-desktop + whatsapp-for-linux + webcord ]; }; services = {