From fcac084248d27b7ce018456091abb052beca3aaf Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sat, 13 Dec 2025 13:43:00 -0500 Subject: [PATCH] further changes to niri --- home/tiling/niri/config/config.kdl | 2 + home/tiling/niri/default.nix | 50 +++++++++++++++++---- home/tiling/niri/qt/qt5ct/qt5ct.conf | 32 +++++++++++++ home/tiling/niri/qt/qt5ct/style-colors.conf | 4 ++ home/tiling/niri/qt/qt6ct/qt6ct.conf | 32 +++++++++++++ home/tiling/niri/qt/qt6ct/style-colors.conf | 4 ++ system/all.nix | 2 +- 7 files changed, 116 insertions(+), 10 deletions(-) create mode 100644 home/tiling/niri/qt/qt5ct/qt5ct.conf create mode 100644 home/tiling/niri/qt/qt5ct/style-colors.conf create mode 100644 home/tiling/niri/qt/qt6ct/qt6ct.conf create mode 100644 home/tiling/niri/qt/qt6ct/style-colors.conf diff --git a/home/tiling/niri/config/config.kdl b/home/tiling/niri/config/config.kdl index bf874e8..d045ece 100644 --- a/home/tiling/niri/config/config.kdl +++ b/home/tiling/niri/config/config.kdl @@ -41,6 +41,8 @@ gestures { environment { QT_QPA_PLATFORM "wayland" + QT_QPA_PLATFORMTHEME_5 "qt5ct" + QT_QPA_PLATFORMTHEME "qt6ct" DISPLAY null } diff --git a/home/tiling/niri/default.nix b/home/tiling/niri/default.nix index 46ff216..8fa1ee5 100644 --- a/home/tiling/niri/default.nix +++ b/home/tiling/niri/default.nix @@ -34,13 +34,24 @@ in ".config/fuzzel/fuzzel.ini" = { text = '' include = /home/sckova/.config/fuzzel/colors.ini - font = "NotoSansM Nerd Font Mono:size=10" + font = "Noto Sans:size=12" terminal = "kitty" icons-enabled = yes + icon-theme = "${config.gtk.iconTheme.name}" layer = "overlay" ''; force = true; }; + ".config/qt5ct" = { + source = ./qt/qt5ct; + recursive = true; + force = true; + }; + ".config/qt6ct" = { + source = ./qt/qt6ct; + recursive = true; + force = true; + }; }; gtk = { @@ -56,7 +67,7 @@ in package = pkgs.colloid-icon-theme; }; - # cursor theme handled in home/hosts/host.nix + # cursor theme handled in home/hosts/host.nix and in config.kdl gtk3.extraConfig = { gtk-application-prefer-dark-theme = true; @@ -67,7 +78,34 @@ in }; }; - qt.enable = true; + qt = { + enable = true; + # the following will be possible in NixOS 26.05 + # https://github.com/nix-community/home-manager/commit/f9d45d664ed06a11861d0ba29e34f390c07bf62e + # until this flake is updated, it will use the configs as implemented above + # qt5ctSettings = { + # Appearance = { + # style = "Breeze"; + # icon_theme = config.gtk.iconTheme.name; + # standar_dialogs = "kde"; + # }; + # Fonts = { + # fixed = "\"NotoSansM Nerd Font Mono,12\""; + # general = "\"Noto Sans,12\""; + # }; + # }; + # qt6ctSettings = { + # Appearance = { + # style = "Breeze"; + # icon_theme = config.gtk.iconTheme.name; + # standar_dialogs = "kde"; + # }; + # Fonts = { + # fixed = "\"NotoSansM Nerd Font Mono,12\""; + # general = "\"Noto Sans,12\""; + # }; + # }; + }; # Cursor / icon env vars for GTK and Qt apps xsession = { @@ -75,10 +113,4 @@ in windowManager.command = "niri"; # launches niri directly }; - home.sessionVariables = { - XCURSOR_SIZE = "24"; - QT_QPA_PLATFORMTHEME = "qt6ct"; - QT_QPA_PLATFORMTHEME_5 = "qt5ct"; - }; - } diff --git a/home/tiling/niri/qt/qt5ct/qt5ct.conf b/home/tiling/niri/qt/qt5ct/qt5ct.conf new file mode 100644 index 0000000..92a501e --- /dev/null +++ b/home/tiling/niri/qt/qt5ct/qt5ct.conf @@ -0,0 +1,32 @@ +[Appearance] +color_scheme_path=/home/sckova/.config/qt5ct/style-colors.conf +custom_palette=true +icon_theme=Colloid-Dark +standard_dialogs=kde +style=Breeze + +[Fonts] +fixed="Noto Sans,12,-1,5,50,0,0,0,0,0" +general="Noto Sans,12,-1,5,50,0,0,0,0,0" + +[Interface] +activate_item_on_single_click=1 +buttonbox_layout=0 +cursor_flash_time=1000 +dialog_buttons_have_icons=1 +double_click_interval=400 +gui_effects=@Invalid() +keyboard_scheme=2 +menus_have_icons=true +show_shortcuts_in_context_menus=true +stylesheets=@Invalid() +toolbutton_style=4 +underline_shortcut=1 +wheel_scroll_lines=3 + +[SettingsWindow] +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W\0\0\0\0\0\0\0\0\x6\xc0\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W) + +[Troubleshooting] +force_raster_widgets=1 +ignored_applications=@Invalid() diff --git a/home/tiling/niri/qt/qt5ct/style-colors.conf b/home/tiling/niri/qt/qt5ct/style-colors.conf new file mode 100644 index 0000000..4afdd7c --- /dev/null +++ b/home/tiling/niri/qt/qt5ct/style-colors.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ffcdd6f4, #ff313244, #ff3d3d5e, #ff2f2f48, #ff0c0c12, #ff151520, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff09090d, #fffab387, #ff11111b, #fffab387, #ffcba6f7, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 +disabled_colors=#ff6c7086, #ff313244, #ff45475a, #ff313244, #ff11111b, #ff181825, #ff6c7086, #ffcdd6f4, #ff6c7086, #ff1e1e2e, #ff181825, #ff11111b, #ff181825, #ff6c7086, #ffa9bcdb, #ffc7cceb, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 +inactive_colors=#ffcdd6f4, #ff313244, #ff3d3d5e, #ff2f2f48, #ff0c0c12, #ff151520, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff09090d, #fffab387, #ff11111b, #fffab387, #ffcba6f7, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 diff --git a/home/tiling/niri/qt/qt6ct/qt6ct.conf b/home/tiling/niri/qt/qt6ct/qt6ct.conf new file mode 100644 index 0000000..18453fb --- /dev/null +++ b/home/tiling/niri/qt/qt6ct/qt6ct.conf @@ -0,0 +1,32 @@ +[Appearance] +color_scheme_path=/home/sckova/.config/qt6ct/style-colors.conf +custom_palette=true +icon_theme=Colloid-Dark +standard_dialogs=kde +style=Breeze + +[Fonts] +fixed="Noto Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" +general="Noto Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" + +[Interface] +activate_item_on_single_click=1 +buttonbox_layout=0 +cursor_flash_time=1000 +dialog_buttons_have_icons=1 +double_click_interval=400 +gui_effects=@Invalid() +keyboard_scheme=2 +menus_have_icons=true +show_shortcuts_in_context_menus=true +stylesheets=@Invalid() +toolbutton_style=4 +underline_shortcut=1 +wheel_scroll_lines=3 + +[SettingsWindow] +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W\0\0\0\0\0\0\0\0\x6\xc0\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W) + +[Troubleshooting] +force_raster_widgets=1 +ignored_applications=@Invalid() diff --git a/home/tiling/niri/qt/qt6ct/style-colors.conf b/home/tiling/niri/qt/qt6ct/style-colors.conf new file mode 100644 index 0000000..0af60d5 --- /dev/null +++ b/home/tiling/niri/qt/qt6ct/style-colors.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ffcdd6f4, #ff313244, #ff3d3d5e, #ff2f2f48, #ff0c0c12, #ff151520, #ffcdd6f4, #ffffffff, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff09090d, #fffab387, #ff11111b, #fffab387, #ffcba6f7, #ff181825, #ff000000, #ff1e1e2e, #ffcdd6f4, #ffa6adc8, #fffab387 +disabled_colors=#ffbebebe, #ffefefef, #ffffffff, #ffcacaca, #ffbebebe, #ffb8b8b8, #ffbebebe, #ffffffff, #ffbebebe, #ffefefef, #ffefefef, #ffb1b1b1, #ff919191, #ffffffff, #ff0000ff, #ffff00ff, #fff7f7f7, #ff000000, #ffffffdc, #ff000000, #80000000, #ff919191 +inactive_colors=#ffcdd6f4, #ff313244, #ff3d3d5e, #ff2f2f48, #ff0c0c12, #ff151520, #ffcdd6f4, #ffffffff, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff09090d, #fffab387, #ff11111b, #fffab387, #ffcba6f7, #ff181825, #ff000000, #ff1e1e2e, #ffcdd6f4, #ffa6adc8, #fffab387 diff --git a/system/all.nix b/system/all.nix index e1a7f35..cd14cf8 100755 --- a/system/all.nix +++ b/system/all.nix @@ -107,7 +107,7 @@ programs.niri = { enable = true; - useNautilus = false; + useNautilus = true; }; services.gnome.gnome-keyring.enable = true; security.pam.services.niri.enableGnomeKeyring = true;