diff --git a/modules/home/themes/catppuccin/palette/default.nix b/modules/home/themes/catppuccin/palette/default.nix deleted file mode 100644 index 6fdff23..0000000 --- a/modules/home/themes/catppuccin/palette/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - lib, - pkgs, - config, - namespace, - ... -}: let - inherit (lib) mkOption mkIf; - palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors; -in { - options.${namespace}.themes.catppuccin.palette = mkOption {type = lib.types.attrsOf lib.types.raw;}; - - config.${namespace}.themes.catppuccin.palette = mkIf config.${namespace}.themes.catppuccin.enable palette; -} diff --git a/modules/nixos/services/home-manager/default.nix b/modules/nixos/services/home-manager/default.nix new file mode 100644 index 0000000..017f26a --- /dev/null +++ b/modules/nixos/services/home-manager/default.nix @@ -0,0 +1,14 @@ +{...}: { + # Todo: rewrite as recursive operation, based on ${namespace}.users + system.userActivationScripts = { + removeConflictingHomeManagerBackups = { + text = '' + rm -f /home/jo/.gtkrc-2.0.homeManagerBackupFileExtension + rm -f /home/jo/.config/gtk-3.0/gtk.css.homeManagerBackupFileExtension + rm -f /home/jo/.config/gtk-4.0/gtk.css.homeManagerBackupFileExtension + ''; + }; + }; + + home-manager.backupFileExtension = "homeManagerBackupFileExtension"; +}