mirror of
https://github.com/ItsDrike/nixdots
synced 2025-01-24 08:24:35 +00:00
Compare commits
No commits in common. "36aced3350c144ff346a1f883ab81b7ede64682e" and "1c5581679fb84a939fbbc88af3624183eaa526e9" have entirely different histories.
36aced3350
...
1c5581679f
|
@ -230,10 +230,10 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# Useful to prevent keybind capturing (for games, etc)
|
# Useful to prevent keybind capturing (for games, etc)
|
||||||
# SUPER + End
|
# SUPER + Fn + F12 (Favorites)
|
||||||
bind = SUPER, End, exec, hyprctl dispatch submap isolate && notify-send "Keybind isolation" "Keybind isolation on"
|
bind = SUPER, XF86Favorites, exec, hyprctl dispatch submap isolate && notify-send "Keybind isolation" "Keybind isolation on"
|
||||||
submap = isolate
|
submap = isolate
|
||||||
bind = SUPER, End, exec, hyprctl dispatch submap reset && notify-send "Keybind isolation" "Keybind isolation off"
|
bind = SUPER, XF86Favorites, exec, hyprctl dispatch submap reset && notify-send "Keybind isolation" "Keybind isolation off"
|
||||||
submap = reset
|
submap = reset
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -78,7 +78,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
# This is like a system-wide dark mode switch that some apps respect it.
|
# This is like a system-wide dark mode swithc that some apps respect it.
|
||||||
# Equivalent of the following dconf command:
|
# Equivalent of the following dconf command:
|
||||||
# `conf write /org/gnome/desktop/interface/color-scheme "'prefer-dark'"`
|
# `conf write /org/gnome/desktop/interface/color-scheme "'prefer-dark'"`
|
||||||
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
|
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
|
||||||
|
|
|
@ -16,8 +16,8 @@ in {
|
||||||
then "gtk"
|
then "gtk"
|
||||||
else "qtct";
|
else "qtct";
|
||||||
style = mkIf (!cfg.forceGtk) {
|
style = mkIf (!cfg.forceGtk) {
|
||||||
# sets QT_STYLE_OVERRIDE
|
name = "Kvantum";
|
||||||
name = "kvantum";
|
package = cfg.theme.package;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -25,12 +25,10 @@ in {
|
||||||
packages = with pkgs;
|
packages = with pkgs;
|
||||||
mkMerge [
|
mkMerge [
|
||||||
[
|
[
|
||||||
# QT5 & QT6 configuration tools
|
# libraries and programs to ensure that qt applications load without issue
|
||||||
|
# breeze-icons is added as a fallback
|
||||||
libsForQt5.qt5ct
|
libsForQt5.qt5ct
|
||||||
kdePackages.qt6ct
|
kdePackages.qt6ct
|
||||||
|
|
||||||
# Icon theme (here as fallback)
|
|
||||||
cfg.iconTheme.package
|
|
||||||
breeze-icons
|
breeze-icons
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -48,8 +46,8 @@ in {
|
||||||
qt6Packages.qtstyleplugin-kvantum
|
qt6Packages.qtstyleplugin-kvantum
|
||||||
libsForQt5.qtstyleplugin-kvantum
|
libsForQt5.qtstyleplugin-kvantum
|
||||||
|
|
||||||
# Also add the Kvantum theme package to path
|
# Also add the theme package to path just in case
|
||||||
cfg.kvantumTheme.package
|
cfg.theme.package
|
||||||
])
|
])
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -69,28 +67,10 @@ in {
|
||||||
# tell calibre to use the dark theme, because the light one hurts my eyes
|
# tell calibre to use the dark theme, because the light one hurts my eyes
|
||||||
CALIBRE_USE_DARK_PALETTE = "1";
|
CALIBRE_USE_DARK_PALETTE = "1";
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
xdg.configFile = mkIf (!cfg.forceGtk) {
|
xdg.configFile = mkIf (!cfg.forceGtk) {
|
||||||
# Kvantum configuration
|
"Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {
|
||||||
"Kvantum/kvantum.kvconfig" = {
|
General.theme = cfg.theme.name;
|
||||||
text = lib.generators.toINI {} {
|
|
||||||
General.theme = cfg.kvantumTheme.name;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
"Kvantum/${cfg.kvantumTheme.name}".source = "${cfg.kvantumTheme.package}/share/Kvantum/${cfg.kvantumTheme.name}";
|
|
||||||
|
|
||||||
|
|
||||||
# Set icon theme using qtct
|
|
||||||
"qt5ct/qt5ct.conf".text = lib.generators.toINI {} {
|
|
||||||
Appearance = {
|
|
||||||
icon_theme = cfg.iconTheme.name;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
"qt6ct/qt6ct.conf".text = lib.generators.toINI {} {
|
|
||||||
Appearance = {
|
|
||||||
icon_theme = cfg.iconTheme.name;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -69,15 +69,12 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
kvantumTheme = {
|
theme = {
|
||||||
name = mkOption {
|
name = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "Catppuccin-Mocha-Blue";
|
default = "Catppuccin-Mocha-Dark";
|
||||||
description = ''
|
description = ''
|
||||||
The name for the QT kvantum theme.
|
The name for the QT theme package.
|
||||||
|
|
||||||
This needs to match the directory containing the kvconfig & svg files
|
|
||||||
for selected theme. The package should expose these in /share/Kvantum.
|
|
||||||
|
|
||||||
This has no effect if forceGtk is set.
|
This has no effect if forceGtk is set.
|
||||||
'';
|
'';
|
||||||
|
@ -86,42 +83,14 @@ in
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
description = ''
|
description = ''
|
||||||
The theme package to be used for QT kvantum theme.
|
The theme package to be used for QT programs.
|
||||||
|
|
||||||
This needs to expose a directory in /share/Kvantum with the
|
|
||||||
kvconfig & svg files. The name of this directory should match
|
|
||||||
the kvantumTheme.name option.
|
|
||||||
|
|
||||||
This has no effect if forceGtk is set.
|
This has no effect if forceGtk is set.
|
||||||
'';
|
'';
|
||||||
default = pkgs.catppuccin-kvantum.override {
|
default = pkgs.catppuccin-kde.override {
|
||||||
variant = "Mocha";
|
flavour = ["mocha"];
|
||||||
accent = "Blue";
|
accents = ["blue"];
|
||||||
};
|
winDecStyles = ["modern"];
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
iconTheme = {
|
|
||||||
name = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = ''
|
|
||||||
The name for the icon theme that will be used for QT programs.
|
|
||||||
|
|
||||||
This has no effect if forceGtk is set.
|
|
||||||
'';
|
|
||||||
default = "Papirus-Dark";
|
|
||||||
};
|
|
||||||
|
|
||||||
package = mkOption {
|
|
||||||
type = types.package;
|
|
||||||
description = ''
|
|
||||||
The QT icon theme package to be used.
|
|
||||||
|
|
||||||
This has no effect if forceGtk is set.
|
|
||||||
'';
|
|
||||||
default = pkgs.catppuccin-papirus-folders.override {
|
|
||||||
accent = "blue";
|
|
||||||
flavor = "mocha";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -21,5 +21,9 @@ in
|
||||||
sound = {
|
sound = {
|
||||||
enable = mkEnableOption "sound related programs and audio-dependent programs";
|
enable = mkEnableOption "sound related programs and audio-dependent programs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
bluetooth = {
|
||||||
|
enable = mkEnableOption "bluetooth modules, drivers and configuration program(s)";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue