From 9f3f87722ec0bba361b43ff98dda0bf36207f040 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 16 Oct 2026 12:37:45 +0200 Subject: [PATCH 1/2] add gtk config --- configuration.nix | 4 ++-- dotfiles/gtk-3.0/settings.ini | 17 ----------------- dotfiles/{gtk-4.0 => gtk}/settings.ini | 0 modules/maid/emacs.nix | 8 ++++++++ 4 files changed, 10 insertions(+), 19 deletions(-) delete mode 100755 dotfiles/gtk-3.0/settings.ini rename dotfiles/{gtk-4.0 => gtk}/settings.ini (100%) diff --git a/configuration.nix b/configuration.nix index f5c5cd7..3ce2041 100755 --- a/configuration.nix +++ b/configuration.nix @@ -55,12 +55,12 @@ rbw emacs-pgtk tinty - foot pinentry-gnome3 git nixd nixfmt xournalpp + rnote btop chromium fuzzel @@ -71,7 +71,7 @@ apple-cursor polkit_gnome xwayland-satellite - nautilus + nemo libwacom devenv kdePackages.qt6ct diff --git a/dotfiles/gtk-3.0/settings.ini b/dotfiles/gtk-3.0/settings.ini deleted file mode 100755 index e6b609e..0000000 --- a/dotfiles/gtk-3.0/settings.ini +++ /dev/null @@ -1,17 +0,0 @@ -[Settings] -gtk-theme-name=adw-gtk3-dark -gtk-icon-theme-name=Papirus-Dark -gtk-font-name=Adwaita Sans 11 -gtk-cursor-theme-name=Adwaita -gtk-cursor-theme-size=24 -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=0 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintslight -gtk-xft-rgba=none -gtk-application-prefer-dark-theme=1 diff --git a/dotfiles/gtk-4.0/settings.ini b/dotfiles/gtk/settings.ini similarity index 100% rename from dotfiles/gtk-4.0/settings.ini rename to dotfiles/gtk/settings.ini diff --git a/modules/maid/emacs.nix b/modules/maid/emacs.nix index c2f75c6..f191273 100755 --- a/modules/maid/emacs.nix +++ b/modules/maid/emacs.nix @@ -21,4 +21,12 @@ target = "tinted-theming/tinty/config.toml"; source = "{{home}}/nixos/dotfiles/tinted-theming/tinty/config.toml"; }; + file.xdg_config.gtk-3 = { + target = "gtk-3.0/settings.ini"; + source = "{{home}}/nixos/dotfiles/gtk/settings.ini"; + }; + file.xdg_config.gtk-4 = { + target = "gtk-4.0/settings.ini"; + source = "{{home}}/nixos/dotfiles/gtk/settings.ini"; + }; } From ff5739447e49ce10dfe2fa5c7279d8cdf9fbf9b6 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 16 Oct 2026 12:40:06 +0200 Subject: [PATCH 2/2] fixup filenames in maid module --- modules/maid/dots.nix | 32 +++++++++++++++++++++++++++++--- modules/maid/emacs.nix | 32 -------------------------------- modules/maid/maid.nix | 2 +- modules/programs/#ghostty.nix# | 3 --- 4 files changed, 30 insertions(+), 39 deletions(-) delete mode 100755 modules/maid/emacs.nix delete mode 100755 modules/programs/#ghostty.nix# diff --git a/modules/maid/dots.nix b/modules/maid/dots.nix index 9d0c4d5..f191273 100755 --- a/modules/maid/dots.nix +++ b/modules/maid/dots.nix @@ -1,6 +1,32 @@ { - file.home.emacs = { - target = ".emacs.d/init.el"; - source = ../../dotfiles/emacs/init.el; + file.home = { + emacs = { + target = ".emacs.d/init.el"; + source = "{{home}}/nixos/dotfiles/emacs/init.el"; + }; + }; + file.xdg_config.foot = { + target = "foot/foot.ini"; + source = "{{home}}/nixos/dotfiles/foot/foot.ini"; + }; + file.xdg_config.fuzzel = { + target = "fuzzel/fuzzel.ini"; + source = "{{home}}/nixos/dotfiles/fuzzel/fuzzel.ini"; + }; + file.xdg_config.niri = { + target = "niri/config.kdl"; + source = "{{home}}/nixos/dotfiles/niri/config.kdl"; + }; + file.xdg_config.tinty = { + target = "tinted-theming/tinty/config.toml"; + source = "{{home}}/nixos/dotfiles/tinted-theming/tinty/config.toml"; + }; + file.xdg_config.gtk-3 = { + target = "gtk-3.0/settings.ini"; + source = "{{home}}/nixos/dotfiles/gtk/settings.ini"; + }; + file.xdg_config.gtk-4 = { + target = "gtk-4.0/settings.ini"; + source = "{{home}}/nixos/dotfiles/gtk/settings.ini"; }; } diff --git a/modules/maid/emacs.nix b/modules/maid/emacs.nix deleted file mode 100755 index f191273..0000000 --- a/modules/maid/emacs.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - file.home = { - emacs = { - target = ".emacs.d/init.el"; - source = "{{home}}/nixos/dotfiles/emacs/init.el"; - }; - }; - file.xdg_config.foot = { - target = "foot/foot.ini"; - source = "{{home}}/nixos/dotfiles/foot/foot.ini"; - }; - file.xdg_config.fuzzel = { - target = "fuzzel/fuzzel.ini"; - source = "{{home}}/nixos/dotfiles/fuzzel/fuzzel.ini"; - }; - file.xdg_config.niri = { - target = "niri/config.kdl"; - source = "{{home}}/nixos/dotfiles/niri/config.kdl"; - }; - file.xdg_config.tinty = { - target = "tinted-theming/tinty/config.toml"; - source = "{{home}}/nixos/dotfiles/tinted-theming/tinty/config.toml"; - }; - file.xdg_config.gtk-3 = { - target = "gtk-3.0/settings.ini"; - source = "{{home}}/nixos/dotfiles/gtk/settings.ini"; - }; - file.xdg_config.gtk-4 = { - target = "gtk-4.0/settings.ini"; - source = "{{home}}/nixos/dotfiles/gtk/settings.ini"; - }; -} diff --git a/modules/maid/maid.nix b/modules/maid/maid.nix index 33772cf..adefafa 100755 --- a/modules/maid/maid.nix +++ b/modules/maid/maid.nix @@ -9,7 +9,7 @@ users.users.lucy.maid = { config, ... }: { imports = [ ./ghostty.nix - ./emacs.nix + ./dots.nix ]; gsettings.settings = { org.gnome.desktop.interface = { diff --git a/modules/programs/#ghostty.nix# b/modules/programs/#ghostty.nix# deleted file mode 100755 index 1797133..0000000 --- a/modules/programs/#ghostty.nix# +++ /dev/null @@ -1,3 +0,0 @@ -{ - -}