From 787584f141dc4c2fb91ec87dac6c57ee63d5c8de Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Tue, 14 Apr 2026 10:49:57 +0700 Subject: [PATCH] idk --- configs/dolphinrc | 7 ------- modules/features/home/dolphin.nix | 22 +++++++++------------- options/home/programs/dolphin.nix | 29 ++++++++++++++++++++++++++--- users/asakiyuki/programs.nix | 1 - 4 files changed, 35 insertions(+), 24 deletions(-) delete mode 100644 configs/dolphinrc diff --git a/configs/dolphinrc b/configs/dolphinrc deleted file mode 100644 index c148bda..0000000 --- a/configs/dolphinrc +++ /dev/null @@ -1,7 +0,0 @@ -[General] -RememberOpenedTabs=false -ModifiedStartupSettings=true -FilterBar=true - -[ContextMenu] -ShowOpenTerminal=false \ No newline at end of file diff --git a/modules/features/home/dolphin.nix b/modules/features/home/dolphin.nix index d51f2f5..f9796d1 100644 --- a/modules/features/home/dolphin.nix +++ b/modules/features/home/dolphin.nix @@ -1,16 +1,12 @@ -{ - lib, - config, - ... -}: { - home = { - packages = [ - (lib.mkIf config.programs.dolphin.enable config.programs.dolphin.package) - ]; - - file.".config/dolphinrc" = { - text = ""; - force = true; +{...}: { + programs.dolphin.configs = { + General = { + RememberOpenedTabs = false; + ModifiedStartupSettings = true; + FilterBar = true; + }; + ContextMenu = { + ShowOpenTerminal = false; }; }; } diff --git a/options/home/programs/dolphin.nix b/options/home/programs/dolphin.nix index bb31087..be188fd 100644 --- a/options/home/programs/dolphin.nix +++ b/options/home/programs/dolphin.nix @@ -1,8 +1,27 @@ { lib, pkgs, + config, ... -}: { +}: let + sanitize = lib.mapAttrsRecursive ( + path: value: + if lib.isList value + then lib.concatStringsSep "," value + else value + ); +in { + config = lib.mkIf config.programs.dolphin.enable { + home.packages = [ + config.programs.dolphin.package + ]; + + home.file.".config/dolphinrc" = { + text = lib.generators.toINI {} (sanitize config.programs.dolphin.configs); + force = true; + }; + }; + options.programs.dolphin = { enable = lib.mkEnableOption "dolphin"; package = lib.mkOption { @@ -10,7 +29,7 @@ default = pkgs.kdePackages.dolphin; }; - config = { + configs = { General = { DoubleClickViewAction = lib.mkOption { type = lib.types.str; @@ -58,7 +77,7 @@ }; HomeUrl = lib.mkOption { type = lib.types.str; - default = "~"; + default = config.home.homeDirectory; }; RememberOpenedTabs = lib.mkOption { type = lib.types.bool; @@ -148,6 +167,10 @@ type = lib.types.bool; default = false; }; + ModifiedStartupSettings = lib.mkOption { + type = lib.types.bool; + default = false; + }; }; CompactMode = { diff --git a/users/asakiyuki/programs.nix b/users/asakiyuki/programs.nix index 2fcd88f..eee0c5e 100644 --- a/users/asakiyuki/programs.nix +++ b/users/asakiyuki/programs.nix @@ -3,7 +3,6 @@ ../../modules/features/home/ghostty.nix ../../modules/features/home/kitty.nix ../../modules/features/home/browsers.nix - # ../../modules/features/home/neovide.nix ../../modules/features/home/bash.nix ../../modules/features/home/starship.nix