From 85cb5d0f1f0acd1d44a8e7dcca8b168543c700f3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 5 Apr 2025 09:09:46 +0100 Subject: [PATCH] Move gimp, handbrake and kdenlive --- home/opdavies/hosts/lemp11.nix | 3 --- home/opdavies/hosts/t480.nix | 3 --- home/opdavies/hosts/t490.nix | 3 --- hosts/t480/configuration.nix | 6 ++++++ modules/home-manager/desktop/media/default.nix | 3 --- modules/home-manager/desktop/media/gimp.nix | 16 ---------------- modules/home-manager/desktop/media/handbrake.nix | 16 ---------------- modules/home-manager/desktop/media/kdenlive.nix | 16 ---------------- 8 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 modules/home-manager/desktop/media/gimp.nix delete mode 100644 modules/home-manager/desktop/media/handbrake.nix delete mode 100644 modules/home-manager/desktop/media/kdenlive.nix diff --git a/home/opdavies/hosts/lemp11.nix b/home/opdavies/hosts/lemp11.nix index 4fa9c514..b36901f8 100644 --- a/home/opdavies/hosts/lemp11.nix +++ b/home/opdavies/hosts/lemp11.nix @@ -2,10 +2,7 @@ { homeManagerModules = { - gimp.enable = true; gtk.enable = true; - handbrake.enable = true; - kdenlive.enable = true; mpv.enable = true; pocket-casts.enable = true; tmux-sessionizer.enable = true; diff --git a/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix index 42278215..401f4069 100644 --- a/home/opdavies/hosts/t480.nix +++ b/home/opdavies/hosts/t480.nix @@ -2,10 +2,7 @@ { homeManagerModules = { - gimp.enable = true; gtk.enable = true; - handbrake.enable = true; - kdenlive.enable = true; mpv.enable = true; newsboat.enable = true; diff --git a/home/opdavies/hosts/t490.nix b/home/opdavies/hosts/t490.nix index 94fb4a17..abeed88d 100644 --- a/home/opdavies/hosts/t490.nix +++ b/home/opdavies/hosts/t490.nix @@ -2,10 +2,7 @@ { homeManagerModules = { - gimp.enable = true; gtk.enable = true; - handbrake.enable = true; - kdenlive.enable = true; mpv.enable = true; notes = { diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index c10771a4..7f0da9a5 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -69,4 +69,10 @@ networking.hosts = { "192.168.1.116" = [ "nixedo" ]; }; + + users.users.opdavies.packages = with pkgs; [ + gimp + handbrake + kdePackages.kdenlive + ]; } diff --git a/modules/home-manager/desktop/media/default.nix b/modules/home-manager/desktop/media/default.nix index 80f8f994..ea0a9ce9 100644 --- a/modules/home-manager/desktop/media/default.nix +++ b/modules/home-manager/desktop/media/default.nix @@ -1,8 +1,5 @@ { imports = [ - ./gimp.nix - ./handbrake.nix - ./kdenlive.nix ./mpv.nix ./pocket-casts.nix ]; diff --git a/modules/home-manager/desktop/media/gimp.nix b/modules/home-manager/desktop/media/gimp.nix deleted file mode 100644 index e0a006d5..00000000 --- a/modules/home-manager/desktop/media/gimp.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -{ - options.homeManagerModules.gimp.enable = mkEnableOption "Enable gimp"; - - config = mkIf config.homeManagerModules.gimp.enable { - home.packages = with pkgs; [ gimp ]; - }; -} diff --git a/modules/home-manager/desktop/media/handbrake.nix b/modules/home-manager/desktop/media/handbrake.nix deleted file mode 100644 index 9cbf4e84..00000000 --- a/modules/home-manager/desktop/media/handbrake.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -{ - options.homeManagerModules.handbrake.enable = mkEnableOption "Enable handbrake"; - - config = mkIf config.homeManagerModules.handbrake.enable { - home.packages = with pkgs; [ handbrake ]; - }; -} diff --git a/modules/home-manager/desktop/media/kdenlive.nix b/modules/home-manager/desktop/media/kdenlive.nix deleted file mode 100644 index 039bb93c..00000000 --- a/modules/home-manager/desktop/media/kdenlive.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -{ - options.homeManagerModules.kdenlive.enable = mkEnableOption "Enable kdenlive"; - - config = mkIf config.homeManagerModules.kdenlive.enable { - home.packages = with pkgs; [ kdePackages.kdenlive ]; - }; -}