From d218f5a13c8d38b5b763fa6f66eee64ccaefec1f Mon Sep 17 00:00:00 2001 From: Jo Date: Thu, 25 Jul 2024 14:49:49 +0200 Subject: [PATCH] fix dconf slash issue, move fish theme to module, re-enable daily gc Signed-off-by: Jo --- homes/x86_64-linux/jo@puzzlevision/default.nix | 4 ++++ .../home/themes/catppuccin/fish/default.nix | 2 +- modules/home/themes/catppuccin/gnome/default.nix | 2 +- systems/x86_64-linux/puzzlevision/default.nix | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) rename homes/x86_64-linux/jo@puzzlevision/apps/fish.nix => modules/home/themes/catppuccin/fish/default.nix (89%) diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix index 3ad30a0..cd1d750 100644 --- a/homes/x86_64-linux/jo@puzzlevision/default.nix +++ b/homes/x86_64-linux/jo@puzzlevision/default.nix @@ -19,6 +19,10 @@ config, ... }: { + imports = [ + ./apps/gnome.nix + ]; + # Flatpak configuration. services.flatpak = { enable = true; diff --git a/homes/x86_64-linux/jo@puzzlevision/apps/fish.nix b/modules/home/themes/catppuccin/fish/default.nix similarity index 89% rename from homes/x86_64-linux/jo@puzzlevision/apps/fish.nix rename to modules/home/themes/catppuccin/fish/default.nix index 398691e..a968f3f 100644 --- a/homes/x86_64-linux/jo@puzzlevision/apps/fish.nix +++ b/modules/home/themes/catppuccin/fish/default.nix @@ -4,7 +4,7 @@ inputs, namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal". - home, # The home architecture for this host (eg. `x86_64-linux`). + system, target, # The Snowfall Lib target for this home (eg. `x86_64-home`). format, # A normalized name for the home target (eg. `home`). virtual, # A boolean to determine whether this home is a virtual target using nixos-generators. diff --git a/modules/home/themes/catppuccin/gnome/default.nix b/modules/home/themes/catppuccin/gnome/default.nix index f56db71..037134b 100644 --- a/modules/home/themes/catppuccin/gnome/default.nix +++ b/modules/home/themes/catppuccin/gnome/default.nix @@ -51,7 +51,7 @@ name = "Colloid-Dark-Catppuccin"; }; - "/org/gnome/desktop/interface" = { + "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; cursor-theme = "catppuccin-frappe-blue-cursors"; }; diff --git a/systems/x86_64-linux/puzzlevision/default.nix b/systems/x86_64-linux/puzzlevision/default.nix index bb99727..fe5be12 100644 --- a/systems/x86_64-linux/puzzlevision/default.nix +++ b/systems/x86_64-linux/puzzlevision/default.nix @@ -56,7 +56,7 @@ # Garbage collection configuration. gc = { - automatic = false; + automatic = true; dates = "daily"; options = "--delete-older-than 3d"; };