Move GTK settings to sway/default.nix
Set icon theme using plasma-manager tools instead. Avoids conflict completely with Plasma trying to overwrite GTK config files. Move toCapital function to own file.
This commit is contained in:
parent
0e4663f6df
commit
9cbf319189
|
@ -10,7 +10,6 @@
|
|||
programs.plasma = lib.mkIf config.programs.plasma.enable {
|
||||
configFile = {
|
||||
kcminputrc."Libinput/1160/4132/DELL0A21:00 0488:1024 Touchpad".NaturalScroll = true;
|
||||
kwinrc."Tiling/8c3e40a5-6d02-561d-be90-abdf39b7afe6"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}";
|
||||
};
|
||||
};
|
||||
wayland.windowManager.sway = lib.mkIf config.wayland.windowManager.sway.enable {
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
inherit name;
|
||||
package = pkgs.volantes-cursors;
|
||||
size = 32;
|
||||
gtk.enable = true;
|
||||
gtk.enable = config.gtk.enable;
|
||||
x11 = {
|
||||
enable = true;
|
||||
defaultCursor = name;
|
||||
|
@ -29,30 +29,6 @@
|
|||
};
|
||||
services.syncthing.enable = true;
|
||||
programs.mpv.enable = true;
|
||||
gtk = let
|
||||
toCapital = string:
|
||||
with lib; let
|
||||
chars = let
|
||||
lc = strings.splitString "" string;
|
||||
in (lists.sublist 1 (lists.length lc - 2) lc);
|
||||
in (
|
||||
strings.concatStringsSep "" (
|
||||
(lists.singleton (strings.toUpper (lists.elemAt chars 0)))
|
||||
++ (lists.sublist 1 (lists.length chars) chars)
|
||||
)
|
||||
);
|
||||
in {
|
||||
enable = true;
|
||||
gtk2.configLocation = "${config.home.homeDirectory}/.hm-gtkrc-2.0";
|
||||
theme = {
|
||||
package = pkgs.materia-theme;
|
||||
name = "Materia-${config.scheme.variant}";
|
||||
};
|
||||
iconTheme = {
|
||||
package = pkgs.papirus-icon-theme.override {color = "violet";};
|
||||
name = "Papirus-${toCapital config.scheme.variant}";
|
||||
};
|
||||
};
|
||||
xdg = {
|
||||
mime.enable = true;
|
||||
mimeApps = let
|
||||
|
|
11
home/desktop/lib/to_capital.nix
Normal file
11
home/desktop/lib/to_capital.nix
Normal file
|
@ -0,0 +1,11 @@
|
|||
lib: string:
|
||||
with lib; let
|
||||
chars = let
|
||||
lc = strings.splitString "" string;
|
||||
in (lists.sublist 1 (lists.length lc - 2) lc);
|
||||
in (
|
||||
strings.concatStringsSep "" (
|
||||
(lists.singleton (strings.toUpper (lists.elemAt chars 0)))
|
||||
++ (lists.sublist 1 (lists.length chars) chars)
|
||||
)
|
||||
)
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
fonts,
|
||||
rc2nix,
|
||||
|
@ -13,22 +14,28 @@
|
|||
home.packages = with pkgs; [
|
||||
rc2nix
|
||||
wl-clipboard
|
||||
(papirus-icon-theme.override {color = "violet";})
|
||||
];
|
||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-qt;
|
||||
programs.plasma = {
|
||||
enable = true;
|
||||
overrideConfig = true;
|
||||
|
||||
workspace = {
|
||||
workspace = let
|
||||
toCapital = import ../lib/to_capital.nix lib;
|
||||
in {
|
||||
clickItemTo = "open";
|
||||
lookAndFeel = "org.kde.breeze.desktop";
|
||||
theme = "default";
|
||||
colorScheme = "BreezeLight";
|
||||
colorScheme = "Breeze${toCapital config.scheme.variant}";
|
||||
iconTheme = "Papirus-${toCapital config.scheme.variant}";
|
||||
windowDecorations = {
|
||||
library = "org.kde.breeze";
|
||||
theme = "Breeze";
|
||||
};
|
||||
cursor = {
|
||||
inherit (config.home.pointerCursor) size;
|
||||
theme = config.home.pointerCursor.name;
|
||||
};
|
||||
iconTheme = config.gtk.iconTheme.name;
|
||||
wallpaper = "${../wallpapers/landscapes/tropic_island_day.jpg}";
|
||||
};
|
||||
|
||||
|
@ -156,7 +163,7 @@
|
|||
kwin = {
|
||||
virtualDesktops = {
|
||||
rows = 1;
|
||||
number = 4;
|
||||
number = 6;
|
||||
};
|
||||
effects = {
|
||||
translucency.enable = true;
|
||||
|
|
|
@ -69,6 +69,19 @@ in {
|
|||
tray = "never";
|
||||
};
|
||||
};
|
||||
gtk = let
|
||||
toCapital = import ../lib/to_capital.nix lib;
|
||||
in {
|
||||
enable = true;
|
||||
theme = {
|
||||
package = pkgs.materia-theme;
|
||||
name = "Materia-${config.scheme.variant}";
|
||||
};
|
||||
iconTheme = {
|
||||
package = pkgs.papirus-icon-theme.override {color = "violet";};
|
||||
name = "Papirus-${toCapital config.scheme.variant}";
|
||||
};
|
||||
};
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
package =
|
||||
|
|
Loading…
Reference in a new issue