Rename `misc` to `config` and change:

- GTK2 config is now placed in XDG config dir
- XDG user dirs is overridden
This commit is contained in:
Oystein Kristoffer Tveit 2022-08-19 12:53:48 +02:00
parent 0fc1d15c35
commit 594b3f986d
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
5 changed files with 39 additions and 19 deletions

18
home/config/gtk.nix Normal file
View File

@ -0,0 +1,18 @@
{ pkgs, config, ... }:
{
gtk = pkgs.lib.mkIf (!config.machineVars.headless) {
enable = true;
font = {
name = "Droid Sans";
};
iconTheme = {
package = pkgs.papirus-icon-theme;
name = "Papirus";
};
theme = {
package = pkgs.vimix-gtk-themes;
name = "VimixDark";
};
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
};
}

View File

@ -0,0 +1,18 @@
{ config, ... }:
{
imports = [ ./mimetypes.nix ];
xdg = {
enable = true;
userDirs = {
enable = true;
desktop = "${config.home.homeDirectory}/Desktop";
documents = "${config.home.homeDirectory}/Documents";
download = "${config.home.homeDirectory}/Downloads";
music = "${config.home.homeDirectory}/music";
pictures = "${config.home.homeDirectory}/Pictures";
publicShare = "${config.home.homeDirectory}/public";
templates = "${config.home.homeDirectory}/templates";
videos = "${config.home.homeDirectory}/Videos";
};
};
}

View File

@ -7,7 +7,8 @@ in {
./shellOptions.nix ./shellOptions.nix
./packages.nix ./packages.nix
./misc/ssh/hosts/pvv.nix ./config/ssh/hosts/pvv.nix
./config/xdg
./programs/comma.nix ./programs/comma.nix
./programs/firefox.nix ./programs/firefox.nix
@ -23,7 +24,7 @@ in {
inputs.secrets.outputs.nixosModule inputs.secrets.outputs.nixosModule
] ++ optionals graphics [ ] ++ optionals graphics [
./misc/mimetypes.nix ./config/gtk.nix
./programs/alacritty.nix ./programs/alacritty.nix
./programs/emacs ./programs/emacs
@ -121,23 +122,6 @@ in {
json.enable = true; json.enable = true;
}; };
xdg.enable = true;
gtk = mkIf graphics {
enable = true;
font = {
name = "Droid Sans";
};
iconTheme = {
package = pkgs.papirus-icon-theme;
name = "Papirus";
};
theme = {
package = pkgs.vimix-gtk-themes;
name = "VimixDark";
};
};
qt = mkIf graphics { qt = mkIf graphics {
enable = true; enable = true;
platformTheme = "gtk"; platformTheme = "gtk";