diff --git a/flake.lock b/flake.lock index 2345d9e..0959e8b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,6 @@ { "nodes": { "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nur-klassy-version", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur-latest-pkgs", @@ -42,7 +21,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur-unstable-pkgs", @@ -100,45 +79,9 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nur-klassy-version": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1766421218, - "narHash": "sha256-At7jWdyYghMHUz7A0b19JdOSPyMxbU24xrVCSjCz6cw=", - "owner": "nix-community", - "repo": "nur", - "rev": "82a02f13454ca5b23248d9fe8fb15618a11b09f0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nur", - "rev": "82a02f13454ca5b23248d9fe8fb15618a11b09f0", - "type": "github" - } - }, "nur-latest-pkgs": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "latestPkgs" ] @@ -159,7 +102,7 @@ }, "nur-unstable-pkgs": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "unstablePkgs" ] @@ -205,7 +148,6 @@ "inputs": { "home-manager": "home-manager", "latestPkgs": "latestPkgs", - "nur-klassy-version": "nur-klassy-version", "nur-latest-pkgs": "nur-latest-pkgs", "nur-unstable-pkgs": "nur-unstable-pkgs", "plasma-manager": "plasma-manager", diff --git a/flake.nix b/flake.nix index 30b790a..6469faa 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; @@ -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 { @@ -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"; diff --git a/progs/desktop/klassy.nix b/progs/desktop/klassy.nix index d533a9d..3210783 100644 --- a/progs/desktop/klassy.nix +++ b/progs/desktop/klassy.nix @@ -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 = @@ -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 = { diff --git a/progs/desktop/klassy/presets/Clean.klpw b/progs/desktop/klassy/presets/Clean.klpw index 2da0189..bf3c344 100644 --- a/progs/desktop/klassy/presets/Clean.klpw +++ b/progs/desktop/klassy/presets/Clean.klpw @@ -99,7 +99,7 @@ ScaleBackgroundPercent=100 ScaleTouchMode=150 ShadowColor=0,0,0 ShadowSize=ShadowLarge -ShadowStrength=255 +ShadowStrength=99 ShowBackgroundNormallyActive=false ShowBackgroundNormallyInactive=false ShowBackgroundOnHoverActive=true @@ -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 @@ -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 @@ -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 diff --git a/progs/desktop/klassy/presets/CleanTranslucid.klpw b/progs/desktop/klassy/presets/CleanTranslucid.klpw index 60048e3..71e307f 100644 --- a/progs/desktop/klassy/presets/CleanTranslucid.klpw +++ b/progs/desktop/klassy/presets/CleanTranslucid.klpw @@ -46,8 +46,8 @@ ButtonOverrideColorsInactiveShade= ButtonOverrideColorsLockStatesActive= ButtonOverrideColorsLockStatesInactive= ButtonShape=ShapeIntegratedRoundedRectangle -ButtonSpacingLeft=3 -ButtonSpacingRight=5 +ButtonSpacingLeft=6 +ButtonSpacingRight=10 ButtonStateCheckedActive=Press ButtonStateCheckedInactive=Press CloseButtonIconColorActive=AsSelected @@ -99,7 +99,7 @@ ScaleBackgroundPercent=100 ScaleTouchMode=150 ShadowColor=0,0,0 ShadowSize=ShadowLarge -ShadowStrength=255 +ShadowStrength=99 ShowBackgroundNormallyActive=false ShowBackgroundNormallyInactive=false ShowBackgroundOnHoverActive=true @@ -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 diff --git a/sys/hardware.nix b/sys/hardware.nix index 3eddba5..6285769 100644 --- a/sys/hardware.nix +++ b/sys/hardware.nix @@ -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; diff --git a/sys/hardware/nvidia.nix b/sys/hardware/nvidia.nix index 324c2c0..fe5f1e6 100644 --- a/sys/hardware/nvidia.nix +++ b/sys/hardware/nvidia.nix @@ -25,7 +25,6 @@ in (tools.fullModule { enable = true; }; nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.latest; open = true; modesetting.enable = true; nvidiaSettings = true;