From b5ef8e1ca55e8eca73fe64d167ca37f8d6e734fa Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Mon, 15 Jul 2024 20:19:18 +0200 Subject: [PATCH] move themes into separate file --- hosts/del/configuration.nix | 26 -------------------------- hosts/del/default.nix | 1 + hosts/del/themes.nix | 31 +++++++++++++++++++++++++++++++ hosts/niks/configuration.nix | 26 -------------------------- hosts/niks/default.nix | 1 + hosts/niks/themes.nix | 31 +++++++++++++++++++++++++++++++ 6 files changed, 64 insertions(+), 52 deletions(-) create mode 100644 hosts/del/themes.nix create mode 100644 hosts/niks/themes.nix diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix index 27f118d..b5b96be 100644 --- a/hosts/del/configuration.nix +++ b/hosts/del/configuration.nix @@ -215,32 +215,6 @@ in { ]; }; }; - themes = { - cursor = { - enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 24; - }; - gtk = { - enable = true; - package = pkgs.catppuccin-gtk; - name = "catppuccin-mocha-green-standard+normal"; - variant = "mocha"; - accentColour = "green"; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders; - }; - }; - qt = { - enable = true; - package = pkgs.catppuccin-kde; - name = "Catppuccin-Mocha-Dark"; - variant = "mocha"; - accentColour = "green"; - }; - }; services = { dunst.enable = true; greetd = { diff --git a/hosts/del/default.nix b/hosts/del/default.nix index 1b5d96c..20bb82a 100644 --- a/hosts/del/default.nix +++ b/hosts/del/default.nix @@ -9,6 +9,7 @@ _: { ./programs.nix ./ssh.nix ./system.nix + ./themes.nix ./waybar.nix ]; } diff --git a/hosts/del/themes.nix b/hosts/del/themes.nix new file mode 100644 index 0000000..87b8085 --- /dev/null +++ b/hosts/del/themes.nix @@ -0,0 +1,31 @@ +{ + pkgs, + ... +}: { + myOptions.themes = { + cursor = { + enable = true; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; + }; + gtk = { + enable = true; + package = pkgs.catppuccin-gtk; + name = "catppuccin-mocha-green-standard+normal"; + variant = "mocha"; + accentColour = "green"; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.catppuccin-papirus-folders; + }; + }; + qt = { + enable = true; + package = pkgs.catppuccin-kde; + name = "Catppuccin-Mocha-Dark"; + variant = "mocha"; + accentColour = "green"; + }; + }; +} diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index 915f391..e3452be 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -128,32 +128,6 @@ in { helix.enable = true; newsboat.enable = true; }; - themes = { - cursor = { - enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 24; - }; - gtk = { - enable = true; - package = pkgs.catppuccin-gtk; - name = "catppuccin-mocha-green-standard+normal"; - variant = "mocha"; - accentColour = "green"; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders; - }; - }; - qt = { - enable = true; - package = pkgs.catppuccin-kde; - name = "Catppuccin-Mocha-Dark"; - variant = "mocha"; - accentColour = "green"; - }; - }; services = { dunst.enable = true; mpd = { diff --git a/hosts/niks/default.nix b/hosts/niks/default.nix index b2f4e53..a79c062 100644 --- a/hosts/niks/default.nix +++ b/hosts/niks/default.nix @@ -11,6 +11,7 @@ _: { #./restic.nix ./ssh.nix ./system.nix + ./themes.nix ./waybar.nix ]; } diff --git a/hosts/niks/themes.nix b/hosts/niks/themes.nix new file mode 100644 index 0000000..87b8085 --- /dev/null +++ b/hosts/niks/themes.nix @@ -0,0 +1,31 @@ +{ + pkgs, + ... +}: { + myOptions.themes = { + cursor = { + enable = true; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; + }; + gtk = { + enable = true; + package = pkgs.catppuccin-gtk; + name = "catppuccin-mocha-green-standard+normal"; + variant = "mocha"; + accentColour = "green"; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.catppuccin-papirus-folders; + }; + }; + qt = { + enable = true; + package = pkgs.catppuccin-kde; + name = "Catppuccin-Mocha-Dark"; + variant = "mocha"; + accentColour = "green"; + }; + }; +}