diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl index 6d54a1b..bf03a78 100644 --- a/.chezmoi.toml.tmpl +++ b/.chezmoi.toml.tmpl @@ -2,6 +2,7 @@ command = "code --wait" [data] is_wsl = {{ (.chezmoi.kernel.osrelease | regexMatch "-microsoft-standard$") }} + flavor = "{{ env "FLAVOR" }}" [git] autoCommit = true autoPush = true diff --git a/.chezmoiignore b/.chezmoiignore index 22d8500..4fa58e6 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -1,14 +1,12 @@ README.md screenshots *_packages +.gnupg dev-container-install.sh -{{ if eq .chezmoi.os "windows" }} -** -!.gitconfig - -{{ else if (.chezmoi.kernel.osrelease | lower | contains "wsl2") }} +# TODO change GTK theme to Catppuccin Frappe +{{ if eq .flavor "desktop" }} .config/dunst .config/gtk-3.0 .config/hypr @@ -22,7 +20,10 @@ dev-container-install.sh .emacs.d .scripts .gtkrc-2.0 - -{{ else if (or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin")) }} -.gnupg +{{ end }} + +{{ if (or (eq .chezmoi.os "windows") (.is_wsl)) }} +* +!/.gitconfig +!.gnupg {{ end }} diff --git a/run_once_4_configure_gnome.sh.tmpl b/run_once_4_configure_gnome.sh.tmpl index acaec3f..565568a 100644 --- a/run_once_4_configure_gnome.sh.tmpl +++ b/run_once_4_configure_gnome.sh.tmpl @@ -44,6 +44,7 @@ enable-hot-corners=false font-antialiasing='rgba' font-hinting='full' gtk-enable-primary-paste=false +gtk-theme='Catppuccin-Frappe-Standard-Lavender-Dark' [desktop/notifications] application-children=['org-gnome-software', 'org-freedesktop-problems-applet', 'firefox', 'gnome-power-panel', 'com-google-androidstudio', 'com-discordapp-discord']