From 3971a495f5be69cf9ef082ef6dad091409c1cc8d Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 8 Jun 2024 11:58:08 +0900 Subject: [PATCH] update --- .../desktops/plasma6/plasma-manager.nix | 32 ++++++++++++------- stylix/themes/stylix-day/default.nix | 5 ++- stylix/themes/stylix-day/sakura-night.yaml | 18 ----------- stylix/themes/stylix/default.nix | 1 - stylix/themes/stylix/sakura-night.yaml | 18 ----------- 5 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 stylix/themes/stylix-day/sakura-night.yaml delete mode 100644 stylix/themes/stylix/sakura-night.yaml diff --git a/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix index 49a8b183..f9cb9e71 100644 --- a/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix +++ b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix @@ -240,12 +240,15 @@ "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."ClickMethod" = 2; "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."NaturalScroll" = true; "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."TapDragLock" = true; + "kcminputrc"."Libinput/273/6202/SteelSeries Aerox 3 Wireless Mouse"."PointerAcceleration" = 0.000; + "kcminputrc"."Libinput/273/6202/SteelSeries Aerox 3 Wireless Mouse"."PointerAccelerationProfile" = 1; "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true; "kcminputrc"."Mouse"."XLbInptAccelProfileFlat" = false; "kcminputrc"."Mouse"."XLbInptPointerAcceleration" = "-0.6"; "kcminputrc"."Mouse"."cursorTheme" = "ePapirus"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; - "kdeglobals"."General"."AccentColor" = "153,119,68"; + "kdeglobals"."General"."AccentColor" = "168,58,175"; "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."accentColorFromWallpaper" = true; "kdeglobals"."KDE"."SingleClick" = true; @@ -270,12 +273,12 @@ "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; "kdeglobals"."KScreen"."ScreenScaleFactors" = "eDP-1=1;"; "kdeglobals"."KScreen"."XwaylandClientsScale" = false; - "kdeglobals"."WM"."activeBackground" = "39,46,51"; - "kdeglobals"."WM"."activeBlend" = "219,188,127"; - "kdeglobals"."WM"."activeForeground" = "211,198,170"; - "kdeglobals"."WM"."inactiveBackground" = "39,46,51"; - "kdeglobals"."WM"."inactiveBlend" = "133,146,137"; - "kdeglobals"."WM"."inactiveForeground" = "211,198,170"; + "kdeglobals"."WM"."activeBackground" = "231,232,235"; + "kdeglobals"."WM"."activeBlend" = "231,232,235"; + "kdeglobals"."WM"."activeForeground" = "92,97,108"; + "kdeglobals"."WM"."inactiveBackground" = "231,232,235"; + "kdeglobals"."WM"."inactiveBlend" = "231,232,235"; + "kdeglobals"."WM"."inactiveForeground" = "163,165,172"; "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; @@ -283,20 +286,23 @@ "kglobalshortcutsrc"."kded6"."_k_friendly_name" = "kded6"; "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "System Settings"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; + "krunnerrc"."General"."FreeFloating" = true; "kscreenlockerrc"."Greeter/LnF/General"."showMediaControls" = false; + "kscreenlockerrc"."Greeter/Wallpaper/org.kde.potd/General"."Provider" = "noaa"; "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."Image" = "/etc/nixos/git/wallpapers/default/wallpaper1.png"; "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."PreviewImage" = "/etc/nixos/git/wallpapers/default/wallpaper1.png"; "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."SlidePaths" = "/run/current-system/sw/share/wallpapers/"; "kscreenlockerrc"."Greeter/Wallpaper/org/kde/potd/General"."Provider" = "simonstalenhag"; - "ksplashrc"."KSplash"."Engine" = "none"; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "6397510c-04f5-4aaf-bff9-66cea108b111"; "kwinrc"."Desktops"."Id_2" = "99b48444-5d80-4ea3-9602-35235349b6f9"; - "kwinrc"."Desktops"."Number" = 2; + "kwinrc"."Desktops"."Id_3" = "4a2ae169-0b7e-43ed-97c6-8a2d55b0a379"; + "kwinrc"."Desktops"."Id_4" = "2bca1e94-a84d-4514-a2c8-a7acfaf10371"; + "kwinrc"."Desktops"."Number" = 4; "kwinrc"."Desktops"."Rows" = 1; "kwinrc"."NightColor"."Active" = true; "kwinrc"."NightColor"."LatitudeAuto" = 35.01; @@ -309,10 +315,14 @@ "kwinrc"."Tiling/91ea1083-8eb3-59af-b2ce-03778d8cef2a"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.36484375},{\"width\":0.635156249999999}]}"; "kwinrc"."Tiling/d67b1509-69a3-585f-adcc-1048a4265c4f"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling/e5159c0a-c653-5a64-a969-4b3420493375"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.3679687499999998},{\"width\":0.6320312499999998}]}"; + "kwinrc"."Windows"."ElectricBorders" = 1; + "kwinrc"."org.kde.kdecoration2"."BorderSize" = "None"; + "kwinrc"."org.kde.kdecoration2"."BorderSizeAuto" = false; + "kwinrc"."org.kde.kdecoration2"."ButtonsOnLeft" = "M"; "kwinrc"."org/kde/kdecoration2"."BorderSize" = "None"; "kwinrc"."org/kde/kdecoration2"."BorderSizeAuto" = false; "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasmarc"."Theme"."name" = "Arc-Color"; + "plasmarc"."Theme"."name" = "Arc-Dark"; "plasmarc"."Wallpapers"."usersWallpapers" = "/etc/nixos/git/wallpapers/default/wallpaper1.png,/nix/store/ix6w9j5y3pzmf8fqw75cbhbz8mrlkfkx-stylix-kde-theme/share/wallpapers/stylix/"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; diff --git a/stylix/themes/stylix-day/default.nix b/stylix/themes/stylix-day/default.nix index 17bf61ba..d19b6efd 100644 --- a/stylix/themes/stylix-day/default.nix +++ b/stylix/themes/stylix-day/default.nix @@ -2,9 +2,8 @@ # Themes https://github.com/tinted-theming/base16-schemes stylix = { image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png; - polarity = "light"; - # base16Scheme = ./sakura-night.yaml; - base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave-light.yaml"; + polarity = "light"; autoEnable = true; }; } diff --git a/stylix/themes/stylix-day/sakura-night.yaml b/stylix/themes/stylix-day/sakura-night.yaml deleted file mode 100644 index a4ff1ca5..00000000 --- a/stylix/themes/stylix-day/sakura-night.yaml +++ /dev/null @@ -1,18 +0,0 @@ -scheme: "Rosé Pine Moon" -variant: "dark" -base00: "232136" -base01: "2a273f" -base02: "393552" -base03: "6e6a86" -base04: "908caa" -base05: "e0def4" -base06: "e0def4" -base07: "56526e" -base08: "eb6f92" -base09: "f6c177" -base0A: "ea9a97" -base0B: "3e8fb0" -base0C: "9ccfd8" -base0D: "c4a7e7" -base0E: "f6c177" -base0F: "56526e" diff --git a/stylix/themes/stylix/default.nix b/stylix/themes/stylix/default.nix index 55f087a7..c424b75e 100644 --- a/stylix/themes/stylix/default.nix +++ b/stylix/themes/stylix/default.nix @@ -3,7 +3,6 @@ stylix = { image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png; polarity = "dark"; - # base16Scheme = ./sakura-night.yaml; base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; autoEnable = true; }; diff --git a/stylix/themes/stylix/sakura-night.yaml b/stylix/themes/stylix/sakura-night.yaml deleted file mode 100644 index a4ff1ca5..00000000 --- a/stylix/themes/stylix/sakura-night.yaml +++ /dev/null @@ -1,18 +0,0 @@ -scheme: "Rosé Pine Moon" -variant: "dark" -base00: "232136" -base01: "2a273f" -base02: "393552" -base03: "6e6a86" -base04: "908caa" -base05: "e0def4" -base06: "e0def4" -base07: "56526e" -base08: "eb6f92" -base09: "f6c177" -base0A: "ea9a97" -base0B: "3e8fb0" -base0C: "9ccfd8" -base0D: "c4a7e7" -base0E: "f6c177" -base0F: "56526e"