From edfd787d309d2040992c85ffddad466f9a6d5985 Mon Sep 17 00:00:00 2001 From: MatthieuGomes Date: Tue, 19 May 2026 13:47:02 -0400 Subject: [PATCH 1/3] feat(dolphin) : added dolphin in a seperate file --- progs/desktop.nix | 2 ++ progs/desktop/dolphin.nix | 29 +++++++++++++++++++++++++++++ progs/desktop/plasma.nix | 1 - 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 progs/desktop/dolphin.nix diff --git a/progs/desktop.nix b/progs/desktop.nix index 84e5314..c71b366 100644 --- a/progs/desktop.nix +++ b/progs/desktop.nix @@ -17,6 +17,7 @@ "plasma" "klassy" "rofi" + "dolphin" ]; extras = { }; @@ -27,6 +28,7 @@ plasma.enable = true; klassy.enable = true; rofi.enable = true; + dolphin.enable = true; }; }; in (tools.fullModule { diff --git a/progs/desktop/dolphin.nix b/progs/desktop/dolphin.nix new file mode 100644 index 0000000..3a42336 --- /dev/null +++ b/progs/desktop/dolphin.nix @@ -0,0 +1,29 @@ +{ + config, + lib, + pkgs-list, + parentPathAsList, + tools, + ... +}: let + moduleParams = tools.moduleParams rec { + inherit config lib pkgs-list parentPathAsList tools; + name = "dolphin"; + subfolder = "dolphin"; + main-repo = "nix"; + branch = "latest"; + options = { + enable = lib.mkEnableOption "Enables ${name} program and related settings."; + }; + }; +in (tools.fullModule rec { + inherit (moduleParams) config lib pkgs-list parentPathAsList tools; + inherit (moduleParams) name togglable subfolder main-repo branch extras imports specialImports options settings; + inherit (moduleParams) packages currentPathAsList currentDirPath cfg inheritedSettings Common; + Home = { + home.packages = with packages.kdePackages; [ + dolphin + dolphin-plugins + ]; + }; +}) diff --git a/progs/desktop/plasma.nix b/progs/desktop/plasma.nix index 7b43ece..ae69e02 100644 --- a/progs/desktop/plasma.nix +++ b/progs/desktop/plasma.nix @@ -249,7 +249,6 @@ in (tools.fullModule rec { qtvirtualkeyboard breeze filelight - dolphin-plugins ]; }; System = { From 888f863e9f13bcc0ebfb4b74a0779836c3388e88 Mon Sep 17 00:00:00 2001 From: MatthieuGomes Date: Tue, 19 May 2026 14:04:01 -0400 Subject: [PATCH 2/3] refactor(klassy) : moved klassy to plasma folder --- progs/desktop.nix | 2 -- progs/desktop/plasma.nix | 7 +++++++ progs/desktop/{ => plasma}/klassy.nix | 0 progs/desktop/{ => plasma}/klassy/.dev/allFields.txt | 0 progs/desktop/{ => plasma}/klassy/.dev/klassyrc.bak | 0 progs/desktop/{ => plasma}/klassy/defaults/params.json | 0 progs/desktop/{ => plasma}/klassy/defaults/presets.klpw | 0 progs/desktop/{ => plasma}/klassy/presets/Clean.klpw | 0 .../{ => plasma}/klassy/presets/CleanTranslucid.klpw | 0 9 files changed, 7 insertions(+), 2 deletions(-) rename progs/desktop/{ => plasma}/klassy.nix (100%) rename progs/desktop/{ => plasma}/klassy/.dev/allFields.txt (100%) rename progs/desktop/{ => plasma}/klassy/.dev/klassyrc.bak (100%) rename progs/desktop/{ => plasma}/klassy/defaults/params.json (100%) rename progs/desktop/{ => plasma}/klassy/defaults/presets.klpw (100%) rename progs/desktop/{ => plasma}/klassy/presets/Clean.klpw (100%) rename progs/desktop/{ => plasma}/klassy/presets/CleanTranslucid.klpw (100%) diff --git a/progs/desktop.nix b/progs/desktop.nix index c71b366..e5b1ab8 100644 --- a/progs/desktop.nix +++ b/progs/desktop.nix @@ -15,7 +15,6 @@ branch = "latest"; imports = [ "plasma" - "klassy" "rofi" "dolphin" ]; @@ -26,7 +25,6 @@ }; settings = { plasma.enable = true; - klassy.enable = true; rofi.enable = true; dolphin.enable = true; }; diff --git a/progs/desktop/plasma.nix b/progs/desktop/plasma.nix index ae69e02..0fa49d7 100644 --- a/progs/desktop/plasma.nix +++ b/progs/desktop/plasma.nix @@ -10,11 +10,18 @@ moduleParams = tools.moduleParams rec { inherit config lib pkgs-list parentPathAsList tools; name = "plasma"; + subfolder = "plasma"; main-repo = "nix"; branch = "latest"; + imports = [ + "klassy" + ]; options = { enable = lib.mkEnableOption "Enables ${name} program and related settings."; }; + settings = { + klassy.enable = true; + }; }; in (tools.fullModule rec { inherit (moduleParams) config lib pkgs-list parentPathAsList tools; diff --git a/progs/desktop/klassy.nix b/progs/desktop/plasma/klassy.nix similarity index 100% rename from progs/desktop/klassy.nix rename to progs/desktop/plasma/klassy.nix diff --git a/progs/desktop/klassy/.dev/allFields.txt b/progs/desktop/plasma/klassy/.dev/allFields.txt similarity index 100% rename from progs/desktop/klassy/.dev/allFields.txt rename to progs/desktop/plasma/klassy/.dev/allFields.txt diff --git a/progs/desktop/klassy/.dev/klassyrc.bak b/progs/desktop/plasma/klassy/.dev/klassyrc.bak similarity index 100% rename from progs/desktop/klassy/.dev/klassyrc.bak rename to progs/desktop/plasma/klassy/.dev/klassyrc.bak diff --git a/progs/desktop/klassy/defaults/params.json b/progs/desktop/plasma/klassy/defaults/params.json similarity index 100% rename from progs/desktop/klassy/defaults/params.json rename to progs/desktop/plasma/klassy/defaults/params.json diff --git a/progs/desktop/klassy/defaults/presets.klpw b/progs/desktop/plasma/klassy/defaults/presets.klpw similarity index 100% rename from progs/desktop/klassy/defaults/presets.klpw rename to progs/desktop/plasma/klassy/defaults/presets.klpw diff --git a/progs/desktop/klassy/presets/Clean.klpw b/progs/desktop/plasma/klassy/presets/Clean.klpw similarity index 100% rename from progs/desktop/klassy/presets/Clean.klpw rename to progs/desktop/plasma/klassy/presets/Clean.klpw diff --git a/progs/desktop/klassy/presets/CleanTranslucid.klpw b/progs/desktop/plasma/klassy/presets/CleanTranslucid.klpw similarity index 100% rename from progs/desktop/klassy/presets/CleanTranslucid.klpw rename to progs/desktop/plasma/klassy/presets/CleanTranslucid.klpw From 7a5844a9ea3000008ccdb218b7e8a7f56888e57d Mon Sep 17 00:00:00 2001 From: MatthieuGomes Date: Tue, 19 May 2026 14:27:15 -0400 Subject: [PATCH 3/3] feat(okular) : got rid of okular --- progs/desktop/plasma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/progs/desktop/plasma.nix b/progs/desktop/plasma.nix index 0fa49d7..ccc5d20 100644 --- a/progs/desktop/plasma.nix +++ b/progs/desktop/plasma.nix @@ -278,6 +278,7 @@ in (tools.fullModule rec { elisa konsole discover + okular ]; }; })