diff --git a/Makefile b/Makefile index cf92ddcf..637436f0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,13 @@ CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config) SSH_DIR := $(HOME)/.ssh +THEMES_DIR := $(HOME)/.themes CONFIG_ITEMS := $(wildcard config/*) CONFIG_TARGETS := $(CONFIG_ITEMS:config/%=$(CONFIG_DIR)/%) SSH_ITEMS := $(wildcard ssh/*) 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_DIR := $(HOME)/.local/share/nvim/lazy/lazy.nvim @@ -21,11 +24,12 @@ all: link install clean: unlink uninstall -link: $(CONFIG_TARGETS) $(SSH_TARGETS) $(HOME)/.ssh/sockets +link: $(CONFIG_TARGETS) $(SSH_TARGETS) $(THEMES_TARGETS) $(HOME)/.ssh/sockets unlink: for link in $(CONFIG_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 install: $(LAZY_DIR) $(PYENV_DIR) $(POETRY_DIR) @@ -35,7 +39,8 @@ uninstall: $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/% $(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 $@) $(LAZY_DIR): @@ -47,5 +52,5 @@ $(PYENV_DIR): $(POETRY_DIR): curl -sSL $(POETRY_INSTALLER) | python3 - -$(CONFIG_DIR) $(SSH_DIR) $(HOME)/.ssh/sockets: +$(CONFIG_DIR) $(SSH_DIR) $(THEMES_DIR) $(HOME)/.ssh/sockets: mkdir -p $@ diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini index d62439e8..5828d7a8 100644 --- a/config/gtk-3.0/settings.ini +++ b/config/gtk-3.0/settings.ini @@ -1,21 +1,21 @@ [Settings] gtk-application-prefer-dark-theme=true gtk-button-images=1 -gtk-cursor-theme-name=Adwaita +gtk-cursor-theme-name=Qogir-dark gtk-cursor-theme-size=24 gtk-decoration-layout=icon:minimize,maximize,close gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 -gtk-font-name=Noto Sans, 10 -gtk-icon-theme-name=Adwaita +gtk-font-name=Noto Sans 12 +gtk-icon-theme-name=Qogir-dark gtk-menu-images=1 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-style=GTK_TOOLBAR_BOTH_HORIZ gtk-xft-antialias=1 gtk-xft-dpi=98304 gtk-xft-hinting=1 -gtk-xft-hintstyle=hintslight +gtk-xft-hintstyle=hintmedium gtk-xft-rgba=rgb