Rename colors to theme, clean up color usage
This commit is contained in:
parent
5d9fc8f4f3
commit
a548fbba06
12 changed files with 60 additions and 60 deletions
|
@ -1,7 +1,7 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
colors = import ../colors;
|
||||
theme = import ../theme;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
|
@ -13,9 +13,9 @@ in
|
|||
enable = true;
|
||||
greeters.gtk = {
|
||||
enable = true;
|
||||
theme = colors.gtkTheme pkgs;
|
||||
theme = theme.gtkTheme pkgs;
|
||||
};
|
||||
background = ../wallpapers/${colors.wallpaper};
|
||||
background = ../wallpapers/${theme.wallpaper};
|
||||
};
|
||||
defaultSession = "none+i3";
|
||||
};
|
||||
|
@ -32,7 +32,7 @@ in
|
|||
environment.sessionVariables = {
|
||||
# GTK Theme won't display with GTK4 (e.g. nautilus) otherwise
|
||||
# Doesn't work in some scenarios, such as open containing folder in Firefox, when declared in home.sessionVariables
|
||||
GTK_THEME = (colors.gtkTheme pkgs).name;
|
||||
GTK_THEME = (theme.gtkTheme pkgs).name;
|
||||
};
|
||||
|
||||
# Enable OpenTabletDriver, GUI configurator is otd-gui
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ config, pkgs, user, ... }:
|
||||
|
||||
let
|
||||
colors = import ../colors;
|
||||
theme = import ../theme;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
@ -19,7 +19,7 @@ in
|
|||
../emacs
|
||||
];
|
||||
|
||||
home.file."./.background-image".source = ../wallpapers/${colors.wallpaper};
|
||||
home.file."./.background-image".source = ../wallpapers/${theme.wallpaper};
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
|
@ -49,8 +49,8 @@ in
|
|||
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconTheme = colors.gtkIconTheme pkgs;
|
||||
theme = colors.gtkTheme pkgs;
|
||||
iconTheme = theme.gtkIconTheme pkgs;
|
||||
theme = theme.gtkTheme pkgs;
|
||||
gtk3 = {
|
||||
bookmarks = let
|
||||
home = "file://${config.home.homeDirectory}/";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue