Link themes directory properly, set catppuccin theme for GTK

This commit is contained in:
Evie Litherland-Smith 2023-03-01 08:10:50 +00:00
parent cdbc1099ba
commit ce318d706d
2 changed files with 13 additions and 8 deletions

View file

@ -1,10 +1,13 @@
CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config) CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config)
SSH_DIR := $(HOME)/.ssh SSH_DIR := $(HOME)/.ssh
THEMES_DIR := $(HOME)/.themes
CONFIG_ITEMS := $(wildcard config/*) CONFIG_ITEMS := $(wildcard config/*)
CONFIG_TARGETS := $(CONFIG_ITEMS:config/%=$(CONFIG_DIR)/%) CONFIG_TARGETS := $(CONFIG_ITEMS:config/%=$(CONFIG_DIR)/%)
SSH_ITEMS := $(wildcard ssh/*) SSH_ITEMS := $(wildcard ssh/*)
SSH_TARGETS := $(SSH_ITEMS:ssh/%=$(SSH_DIR)/%) SSH_TARGETS := $(SSH_ITEMS:ssh/%=$(SSH_DIR)/%)
THEMES_ITEMS := $(wildcard themes/*)
THEMES_TARGETS := $(THEMES_ITEMS:themes/%=$(THEMES_DIR)/%)
LAZY_REPO := https://github.com/folke/lazy.nvim.git LAZY_REPO := https://github.com/folke/lazy.nvim.git
LAZY_DIR := $(HOME)/.local/share/nvim/lazy/lazy.nvim LAZY_DIR := $(HOME)/.local/share/nvim/lazy/lazy.nvim
@ -21,11 +24,12 @@ all: link install
clean: unlink uninstall clean: unlink uninstall
link: $(CONFIG_TARGETS) $(SSH_TARGETS) $(HOME)/.ssh/sockets link: $(CONFIG_TARGETS) $(SSH_TARGETS) $(THEMES_TARGETS) $(HOME)/.ssh/sockets
unlink: unlink:
for link in $(CONFIG_TARGETS); do rm "$$link"; done for link in $(CONFIG_TARGETS); do rm "$$link"; done
for link in $(SSH_TARGETS); do rm "$$link"; done for link in $(SSH_TARGETS); do rm "$$link"; done
for link in $(THEMES_TARGETS); do rm "$$link"; done
rmdir $(HOME)/.ssh/sockets rmdir $(HOME)/.ssh/sockets
install: $(LAZY_DIR) $(PYENV_DIR) $(POETRY_DIR) install: $(LAZY_DIR) $(PYENV_DIR) $(POETRY_DIR)
@ -35,7 +39,8 @@ uninstall:
$(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/% $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
$(SSH_TARGETS): $(SSH_DIR)/%: ssh/% $(SSH_TARGETS): $(SSH_DIR)/%: ssh/%
$(CONFIG_TARGETS) $(SSH_TARGETS): $(THEMES_TARGETS): $(THEMES_DIR)/%: themes/%
$(CONFIG_TARGETS) $(SSH_TARGETS) $(THEMES_TARGETS):
ln -s $(PWD)/$? -t $$(dirname $@) ln -s $(PWD)/$? -t $$(dirname $@)
$(LAZY_DIR): $(LAZY_DIR):
@ -47,5 +52,5 @@ $(PYENV_DIR):
$(POETRY_DIR): $(POETRY_DIR):
curl -sSL $(POETRY_INSTALLER) | python3 - curl -sSL $(POETRY_INSTALLER) | python3 -
$(CONFIG_DIR) $(SSH_DIR) $(HOME)/.ssh/sockets: $(CONFIG_DIR) $(SSH_DIR) $(THEMES_DIR) $(HOME)/.ssh/sockets:
mkdir -p $@ mkdir -p $@

View file

@ -1,21 +1,21 @@
[Settings] [Settings]
gtk-application-prefer-dark-theme=true gtk-application-prefer-dark-theme=true
gtk-button-images=1 gtk-button-images=1
gtk-cursor-theme-name=Adwaita gtk-cursor-theme-name=Qogir-dark
gtk-cursor-theme-size=24 gtk-cursor-theme-size=24
gtk-decoration-layout=icon:minimize,maximize,close gtk-decoration-layout=icon:minimize,maximize,close
gtk-enable-animations=true gtk-enable-animations=true
gtk-enable-event-sounds=1 gtk-enable-event-sounds=1
gtk-enable-input-feedback-sounds=1 gtk-enable-input-feedback-sounds=1
gtk-font-name=Noto Sans, 10 gtk-font-name=Noto Sans 12
gtk-icon-theme-name=Adwaita gtk-icon-theme-name=Qogir-dark
gtk-menu-images=1 gtk-menu-images=1
gtk-primary-button-warps-slider=false gtk-primary-button-warps-slider=false
gtk-theme-name=Breeze gtk-theme-name=Catppuccin-Macchiato-Standard-Mauve-Dark
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
gtk-xft-antialias=1 gtk-xft-antialias=1
gtk-xft-dpi=98304 gtk-xft-dpi=98304
gtk-xft-hinting=1 gtk-xft-hinting=1
gtk-xft-hintstyle=hintslight gtk-xft-hintstyle=hintmedium
gtk-xft-rgba=rgb gtk-xft-rgba=rgb