Skip to content

Some small fixes before upgrade #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 4 commits into from
May 13, 2026
Merged

Some small fixes before upgrade #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5623205
clean(inputs) : get rid of old input of klassy nur input
MatthieuGomes May 13, 2026
6da5128
fix(klassy) : fixed lock functions of close button in button behaviour
MatthieuGomes May 13, 2026
9501274
fix(klassy) : fixed button behaviour + presets
MatthieuGomes May 13, 2026
e906fb4
fix(nvidia) : fixed + enabled nvidia configuration
MatthieuGomes May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 3 additions & 61 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
url = "github:nix-community/nur";
inputs.nixpkgs.follows = "latestPkgs";
};
nur-klassy-version = {
url = "github:nix-community/nur/82a02f13454ca5b23248d9fe8fb15618a11b09f0";
# sha256 = "0d8iwisgw15ivwbd9s041fbf33mqgccsmwxcvgwf3y84i2d1rb7a";
}; # TODO : Rebuild with my own + add options for configuration
nur-unstable-pkgs = {
url = "github:nix-community/nur";
inputs.nixpkgs.follows = "unstablePkgs";
Expand Down Expand Up @@ -72,12 +68,10 @@
};
nur-latest = Inputs.nur-latest-pkgs.legacyPackages.${system};
nur-unstable = Inputs.nur-unstable-pkgs.legacyPackages.${system};
nur-klassy = Inputs.nur-klassy-version.legacyPackages.${system};

nur = {
latest = nur-latest;
unstable = nur-unstable;
klassy = nur-klassy;
};

customPkgs = import ./customPkgs.nix {
Expand Down Expand Up @@ -115,7 +109,7 @@
tuis.enable = true;
};
sys = {
label = "V.2.0_FIX_WIP";
label = "V.2.0_UPDATE_WIP";
tags = [];
version = nixos-version;
main-user = "matthieu";
Expand Down
73 changes: 61 additions & 12 deletions progs/desktop/klassy.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,20 +288,56 @@

activeCloseButtonSettingsPath = "${activeWindowSettingsPath}.close_button";
activeCloseIconsSettingsPath = "${activeCloseButtonSettingsPath}.icons";
ShowCloseIconNormallyActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseIconsSettingsPath}.show_normally";
ShowCloseIconOnHoverActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseIconsSettingsPath}.show_on_hover";
ShowCloseIconOnPressActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseIconsSettingsPath}.show_on_press";
VaryColorCloseIconActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseIconsSettingsPath}.vary_color_on_state";
ShowCloseIconNormallyActive =
if LockCloseButtonBehaviourActive
then ShowIconNormallyActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseIconsSettingsPath}.show_normally";
ShowCloseIconOnHoverActive =
if LockCloseButtonBehaviourActive
then ShowIconOnHoverActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseIconsSettingsPath}.show_on_hover";
ShowCloseIconOnPressActive =
if LockCloseButtonBehaviourActive
then ShowIconOnPressActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseIconsSettingsPath}.show_on_press";
VaryColorCloseIconActive =
if LockCloseButtonBehaviourActive
then VaryColorIconActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseIconsSettingsPath}.vary_color_on_state";
activeCloseBackgroundsSettingsPath = "${activeCloseButtonSettingsPath}.backgrounds";
ShowCloseBackgroundNormallyActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseBackgroundsSettingsPath}.show_normally";
ShowCloseBackgroundOnHoverActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseBackgroundsSettingsPath}.show_on_hover";
ShowCloseBackgroundOnPressActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseBackgroundsSettingsPath}.show_on_press";
VaryColorCloseBackgroundActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseBackgroundsSettingsPath}.vary_color_on_state";
ShowCloseBackgroundNormallyActive =
if LockCloseButtonBehaviourActive
then ShowBackgroundNormallyActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseBackgroundsSettingsPath}.show_normally";
ShowCloseBackgroundOnHoverActive =
if LockCloseButtonBehaviourActive
then ShowBackgroundOnHoverActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseBackgroundsSettingsPath}.show_on_hover";
ShowCloseBackgroundOnPressActive =
if LockCloseButtonBehaviourActive
then ShowBackgroundOnPressActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseBackgroundsSettingsPath}.show_on_press";
VaryColorCloseBackgroundActive =
if LockCloseButtonBehaviourActive
then VaryColorBackgroundActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseBackgroundsSettingsPath}.vary_color_on_state";
activeCloseOutlinesSettingsPath = "${activeCloseButtonSettingsPath}.outlines";
ShowCloseOutlineNormallyActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseOutlinesSettingsPath}.show_normally";
ShowCloseOutlineOnHoverActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseOutlinesSettingsPath}.show_on_hover";
ShowCloseOutlineOnPressActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseOutlinesSettingsPath}.show_on_press";
VaryColorCloseOutlineActive = defaultIfUndefined KlassySettings defaultsParams "${activeCloseOutlinesSettingsPath}.vary_color_on_state";
ShowCloseOutlineNormallyActive =
if LockCloseButtonBehaviourActive
then ShowOutlineNormallyActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseOutlinesSettingsPath}.show_normally";
ShowCloseOutlineOnHoverActive =
if LockCloseButtonBehaviourActive
then ShowOutlineOnHoverActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseOutlinesSettingsPath}.show_on_hover";
ShowCloseOutlineOnPressActive =
if LockCloseButtonBehaviourActive
then ShowOutlineOnPressActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseOutlinesSettingsPath}.show_on_press";
VaryColorCloseOutlineActive =
if LockCloseButtonBehaviourActive
then VaryColorOutlineActive
else defaultIfUndefined KlassySettings defaultsParams "${activeCloseOutlinesSettingsPath}.vary_color_on_state";

inactiveWindowSettingsPath = "${buttonBehaviourSettingsPath}.inactive_window";
LockCloseButtonBehaviourInactive =
Expand Down Expand Up @@ -913,6 +949,19 @@
use_same_hover_n_press_colours_as_active_window = true;
};
};
button_behaviour = {
active_window = {
normal_buttons = {
backgrounds = {
vary_color_on_state = "Transparent";
};
outlines = {
show_on_hover = false;
vary_color_on_state = "Opaque";
};
};
};
};
};
titlebar = {
on_active_window = {
Expand Down
22 changes: 11 additions & 11 deletions progs/desktop/klassy/presets/Clean.klpw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ ScaleBackgroundPercent=100
ScaleTouchMode=150
ShadowColor=0,0,0
ShadowSize=ShadowLarge
ShadowStrength=255
ShadowStrength=99
ShowBackgroundNormallyActive=false
ShowBackgroundNormallyInactive=false
ShowBackgroundOnHoverActive=true
Expand All @@ -120,8 +120,8 @@ ShowCloseIconOnPressActive=true
ShowCloseIconOnPressInactive=true
ShowCloseOutlineNormallyActive=false
ShowCloseOutlineNormallyInactive=false
ShowCloseOutlineOnHoverActive=true
ShowCloseOutlineOnHoverInactive=true
ShowCloseOutlineOnHoverActive=false
ShowCloseOutlineOnHoverInactive=false
ShowCloseOutlineOnPressActive=true
ShowCloseOutlineOnPressInactive=true
ShowIconNormallyActive=true
Expand All @@ -132,8 +132,8 @@ ShowIconOnPressActive=true
ShowIconOnPressInactive=true
ShowOutlineNormallyActive=false
ShowOutlineNormallyInactive=false
ShowOutlineOnHoverActive=true
ShowOutlineOnHoverInactive=true
ShowOutlineOnHoverActive=false
ShowOutlineOnHoverInactive=false
ShowOutlineOnPressActive=true
ShowOutlineOnPressInactive=true
SpacerButtonWidthRelative=50
Expand All @@ -146,17 +146,17 @@ TitleBarTopMargin=3.6
TitleSidePadding=4
UnderlineTitle=false
UnisonHovering=false
UseHoverAccentActive=true
UseHoverAccentInactive=true
UseHoverAccentActive=false
UseHoverAccentInactive=false
UseTitleBarColorForAllBorders=true
VaryColorBackgroundActive=Opaque
VaryColorBackgroundInactive=Opaque
VaryColorBackgroundActive=Transparent
VaryColorBackgroundInactive=Transparent
VaryColorCloseBackgroundActive=Transparent
VaryColorCloseBackgroundInactive=Transparent
VaryColorCloseIconActive=No
VaryColorCloseIconInactive=No
VaryColorCloseOutlineActive=Transparent
VaryColorCloseOutlineInactive=Transparent
VaryColorCloseOutlineActive=Opaque
VaryColorCloseOutlineInactive=Opaque
VaryColorIconActive=No
VaryColorIconInactive=No
VaryColorOutlineActive=Opaque
Expand Down
14 changes: 7 additions & 7 deletions progs/desktop/klassy/presets/CleanTranslucid.klpw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ ButtonOverrideColorsInactiveShade=
ButtonOverrideColorsLockStatesActive=
ButtonOverrideColorsLockStatesInactive=
ButtonShape=ShapeIntegratedRoundedRectangle
ButtonSpacingLeft=3
ButtonSpacingRight=5
ButtonSpacingLeft=6
ButtonSpacingRight=10
ButtonStateCheckedActive=Press
ButtonStateCheckedInactive=Press
CloseButtonIconColorActive=AsSelected
Expand Down Expand Up @@ -99,7 +99,7 @@ ScaleBackgroundPercent=100
ScaleTouchMode=150
ShadowColor=0,0,0
ShadowSize=ShadowLarge
ShadowStrength=255
ShadowStrength=99
ShowBackgroundNormallyActive=false
ShowBackgroundNormallyInactive=false
ShowBackgroundOnHoverActive=true
Expand Down Expand Up @@ -149,14 +149,14 @@ UnisonHovering=false
UseHoverAccentActive=false
UseHoverAccentInactive=false
UseTitleBarColorForAllBorders=true
VaryColorBackgroundActive=Opaque
VaryColorBackgroundInactive=Opaque
VaryColorBackgroundActive=Transparent
VaryColorBackgroundInactive=Transparent
VaryColorCloseBackgroundActive=Transparent
VaryColorCloseBackgroundInactive=Transparent
VaryColorCloseIconActive=No
VaryColorCloseIconInactive=No
VaryColorCloseOutlineActive=Transparent
VaryColorCloseOutlineInactive=Transparent
VaryColorCloseOutlineActive=Opaque
VaryColorCloseOutlineInactive=Opaque
VaryColorIconActive=No
VaryColorIconInactive=No
VaryColorOutlineActive=Opaque
Expand Down
2 changes: 1 addition & 1 deletion sys/hardware.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
enable = lib.mkEnableOption "Enables ${name} related settings.";
};
settings = {
nvidia.enable = false; # TODO FIX : module to fix once a stable and working nvidia version is available
nvidia.enable = true; # TODO FIX : module to fix once a stable and working nvidia version is available
printer.enable = true;
sound.enable = true;
bluetooth.enable = true;
Expand Down
1 change: 0 additions & 1 deletion sys/hardware/nvidia.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ in (tools.fullModule {
enable = true;
};
nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.latest;
open = true;
modesetting.enable = true;
nvidiaSettings = true;
Expand Down
Loading