From c8c7be8a2472d0b6522771e7eec0d33bb809d80f Mon Sep 17 00:00:00 2001 From: Bun Date: Fri, 21 Mar 2025 22:29:32 -0400 Subject: [PATCH] Move the assets folder --- modules/home/files/default.nix | 7 +++-- .../files/{assets => }/lockscreen/lock.png | Bin .../home/files/{assets => }/wallpapers/1.png | Bin .../home/files/{assets => }/wallpapers/2.png | Bin .../home/files/{assets => }/wallpapers/3.png | Bin modules/home/settings/gtk/default.nix | 28 ++---------------- modules/home/settings/gtk/theme/default.nix | 28 ++++++++++++++++++ 7 files changed, 34 insertions(+), 29 deletions(-) rename modules/home/files/{assets => }/lockscreen/lock.png (100%) rename modules/home/files/{assets => }/wallpapers/1.png (100%) rename modules/home/files/{assets => }/wallpapers/2.png (100%) rename modules/home/files/{assets => }/wallpapers/3.png (100%) create mode 100644 modules/home/settings/gtk/theme/default.nix diff --git a/modules/home/files/default.nix b/modules/home/files/default.nix index 99d9886e..0746509b 100644 --- a/modules/home/files/default.nix +++ b/modules/home/files/default.nix @@ -1,7 +1,8 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ home.file = lib.mkIf config.home.desktop.enable { - ".assets/wallpapers".source = ./assets/wallpapers; - ".assets/lockscreen".source = ./assets/lockscreen; + ".assets/wallpapers".source = ./wallpapers; + ".assets/lockscreen".source = ./lockscreen; ".alsoftrc".text = "drivers=pulse"; }; } diff --git a/modules/home/files/assets/lockscreen/lock.png b/modules/home/files/lockscreen/lock.png similarity index 100% rename from modules/home/files/assets/lockscreen/lock.png rename to modules/home/files/lockscreen/lock.png diff --git a/modules/home/files/assets/wallpapers/1.png b/modules/home/files/wallpapers/1.png similarity index 100% rename from modules/home/files/assets/wallpapers/1.png rename to modules/home/files/wallpapers/1.png diff --git a/modules/home/files/assets/wallpapers/2.png b/modules/home/files/wallpapers/2.png similarity index 100% rename from modules/home/files/assets/wallpapers/2.png rename to modules/home/files/wallpapers/2.png diff --git a/modules/home/files/assets/wallpapers/3.png b/modules/home/files/wallpapers/3.png similarity index 100% rename from modules/home/files/assets/wallpapers/3.png rename to modules/home/files/wallpapers/3.png diff --git a/modules/home/settings/gtk/default.nix b/modules/home/settings/gtk/default.nix index 5912497e..65c04c12 100644 --- a/modules/home/settings/gtk/default.nix +++ b/modules/home/settings/gtk/default.nix @@ -3,32 +3,8 @@ imports = [ ./bookmarks ./css + ./theme ]; - gtk = { - enable = config.home.desktop.enable; - font = { - name = "${config.look.fonts.main}"; - size = 11; - }; - theme = { - name = "Colloid-Dark"; - package = pkgs.colloid-gtk-theme.override { - themeVariants = [ "default" ]; - colorVariants = [ "dark" ]; - sizeVariants = [ "standard" ]; - tweaks = [ - "black" - "rimless" - "normal" - ]; - }; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme.override { - color = "${config.look.colors.folder}"; - }; - }; - }; + gtk.enable = config.home.desktop.enable; } diff --git a/modules/home/settings/gtk/theme/default.nix b/modules/home/settings/gtk/theme/default.nix new file mode 100644 index 00000000..17c6f518 --- /dev/null +++ b/modules/home/settings/gtk/theme/default.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: +{ + gtk = { + font = { + name = "${config.look.fonts.main}"; + size = 11; + }; + theme = { + name = "Colloid-Dark"; + package = pkgs.colloid-gtk-theme.override { + themeVariants = [ "default" ]; + colorVariants = [ "dark" ]; + sizeVariants = [ "standard" ]; + tweaks = [ + "black" + "rimless" + "normal" + ]; + }; + }; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme.override { + color = "${config.look.colors.folder}"; + }; + }; + }; +}