balsoft/nixos-config
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix GTK font rendering (finally)

Browse Source
This commit is contained in:
Alexander Bantyev 2020-05-12 23:35:29 +03:00
parent bdd5a8ab1a
commit 62def3563b
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
9 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/applications/firefox.nix
View File

@ -9,7 +9,6 @@ in {
home-manager.users.balsoft = lib.mkIf (config.deviceSpecific.goodMachine) {
home.packages = with pkgs; [
plasma-integration
plasma5.xdg-desktop-portal-kde
plasma-browser-integration
];
home.file.".mozilla/native-messaging-hosts".source = pkgs.symlinkJoin {

1
modules/applications/packages.nix
View File

@ -54,7 +54,6 @@
gnumeric
gcalcli
google-drive-ocamlfuse
kdeconnect
trojita
nix-zsh-completions
papirus-icon-theme

2
modules/users.nix
View File

@ -33,8 +33,6 @@
after = [ "linkGeneration" ];
before = [ ];
};
home-manager.users.balsoft.home.sessionVariables.XDG_RUNTIME_DIR =
"/run/user/1000";
services.udev.extraRules = ''
ACTION=="remove", ATTRS{idVendor}=="1050", RUN+="${pkgs.systemd}/bin/loginctl lock-sessions"

9
modules/workspace/gtk.nix
View File

@ -44,8 +44,8 @@ in {
'';
};
})];
services.dbus.packages = with pkgs; [ gnome3.dconf ];
home-manager.users.balsoft = {
home.packages = [pkgs.generated-gtk-theme];
gtk = {
enable = true;
iconTheme = {
@ -56,13 +56,10 @@ in {
name = "Generated";
package = pkgs.generated-gtk-theme;
};
font =
{
package = pkgs.roboto;
name = "Roboto 11";
font = {
name = "Roboto 12";
};
gtk3.extraConfig.gtk-cursor-theme-name = "breeze";
};
};
environment.sessionVariables.GTK_THEME = "Generated";
}

5
modules/workspace/kde/default.nix
View File

@ -2,7 +2,7 @@
with import ../../../support.nix { inherit lib config; }; {
xdg.portal.enable = true;
# services.flatpak.enable = true;
xdg.portal.extraPortals = [ pkgs.plasma5.xdg-desktop-portal-kde ];
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
services.dbus.packages = [
pkgs.plasma5.xdg-desktop-portal-kde
pkgs.flatpak
@ -10,7 +10,6 @@ with import ../../../support.nix { inherit lib config; }; {
pkgs.systemd
];
nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
home-manager.users.balsoft.home.packages = [ pkgs.qt5ct ];
environment.sessionVariables = {
DESKTOP_SESSION = "kde";
QT_XFT = "true";
@ -19,11 +18,9 @@ with import ../../../support.nix { inherit lib config; }; {
KDE_SESSION_VERSION = "5";
QT_SCALE_FACTOR = "1";
QT_AUTO_SCREEN_SCALE_FACTOR = "0";
GTK_USE_PORTAL = "1";
DE = "kde";
QT_QPA_PLATFORMTHEME = "kde";
};
#home-manager.users.balsoft.xdg.configFile."qt5ct/qt5ct.conf".source = ./qt5ct.conf;
home-manager.users.balsoft.xdg.configFile."kdeglobals".text = genIni {
"Colors:Button" = {
BackgroundAlternate = thmDec.dark;

5
modules/workspace/locale.nix
View File

@ -2,6 +2,11 @@
console.font = "cyr-sun16";
console.keyMap = "ruwin_cplk-UTF-8";
environment.sessionVariables = {
XKB_DEFAULT_LAYOUT = "us,ru";
XKB_DEFAULT_OPTIONS = "grp:lctrl_toggle,grp_led:caps,ctrl:nocaps";
};
time.timeZone = "Europe/Moscow"; # Mother Russia
home-manager.users.balsoft.home.language = let
en = "en_GB.UTF-8";

3
modules/workspace/misc.nix
View File

@ -8,8 +8,6 @@
VISUAL = config.defaultApplications.editor.cmd;
LESS = "-asrRix8";
XDG_SESSION_TYPE = "wayland";
XKB_DEFAULT_LAYOUT = "us,ru";
XKB_DEFAULT_OPTIONS = "grp:lctrl_toggle,grp_led:caps,ctrl:nocaps";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
NIX_AUTO_RUN = "1";
@ -67,5 +65,6 @@
home.file.".icons/default".source =
"${pkgs.breeze-qt5}/share/icons/breeze_cursors";
systemd.user.startServices = true;
services.kdeconnect.enable = true;
};
}

11
modules/workspace/sway/default.nix
View File

@ -7,6 +7,8 @@ let
in {
environment.sessionVariables._JAVA_AWT_WM_NONREPARENTING = "1";
programs.sway.wrapperFeatures.gtk = true;
home-manager.users.balsoft.wayland.windowManager.sway = {
enable = true;
config = rec {
@ -70,8 +72,7 @@ in {
];
};
startup = [
{ command = apps.browser.cmd; }
{ command = "${pkgs.kdeconnect}/libexec/kdeconnectd"; }
{ command = "GTK_USE_PORTAL=1 ${apps.browser.cmd}"; }
{
command =
"${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";
@ -89,6 +90,12 @@ in {
{
command = "swayidle -w before-sleep '${lock_fork}' lock '${lock_fork}' unlock 'pkill -9 swaylock'";
}
{
command = "${pkgs.xdg-desktop-portal-kde}/libexec/xdg-desktop-portal-kde";
}
{
command = "${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal";
}
];
keybindings = let

5
modules/workspace/xresources.nix
View File

@ -39,10 +39,5 @@
# "emacs.color15" = fg;
};
home.activation.xrdb = {
after = ["linkGeneration"];
before = [];
data = "DISPLAY=:0 ${pkgs.xorg.xrdb}/bin/xrdb -merge ${config.users.users.balsoft.home}/.Xresources";
};
};
}