From da03f1120ab9ec05f673a60db9ebce23722b043e Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 8 Jun 2024 16:13:44 +0900 Subject: [PATCH] update --- home-manager/common/software/gui/firefox.nix | 2 +- .../desktops/plasma6/plasma-manager.nix | 30 +++++++++---------- stylix/themes/green/default.nix | 2 +- stylix/themes/gruvbox/default.nix | 4 +-- stylix/themes/sakura-day/default.nix | 3 +- stylix/themes/sakura-night/default.nix | 3 +- stylix/themes/tokyo-day/default.nix | 4 +-- stylix/themes/tokyo-night/default.nix | 4 +-- 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix index 526dd577..783f0c25 100644 --- a/home-manager/common/software/gui/firefox.nix +++ b/home-manager/common/software/gui/firefox.nix @@ -526,7 +526,7 @@ * could have been revoked) and/or you could be under attack (e.g. malicious blocking of OCSP servers) * [1] https://blog.mozilla.org/security/2013/07/29/ocsp-stapling-in-firefox/ * [2] https://www.imperialviolet.org/2014/04/19/revchecking.html ***/ - user_pref("security.OCSP.require", true); + user_pref("security.OCSP.require", false); /** CERTS / HPKP (HTTP Public Key Pinning) ***/ /* 1223: enable strict PKP (Public Key Pinning) 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 f9cb9e71..5b800972 100644 --- a/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix +++ b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix @@ -10,17 +10,17 @@ "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; "kcm_touchpad"."Toggle Touchpad" = "Touchpad Toggle"; - "kded6"."display" = ["Display" "Meta+P"]; + "kded6"."display" = ["" "Display" "Meta+P"]; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."decrease_volume_small" = "Shift+Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mic_mute" = ["" "Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; "ksmserver"."Halt Without Confirmation" = [ ]; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Lock Session" = ["" "Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; "ksmserver"."Log Out Without Confirmation" = [ ]; "ksmserver"."Reboot" = [ ]; @@ -32,7 +32,7 @@ "kwin"."Decrease Opacity" = [ ]; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeAll" = ["" "Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = [ ]; "kwin"."Grid View" = "Meta+G"; @@ -177,7 +177,7 @@ "kwin"."Window to Screen 6" = [ ]; "kwin"."Window to Screen 7" = [ ]; "kwin"."view_actual_size" = [ ]; - "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_in" = ["" "Meta++" "Meta+\x3d"]; "kwin"."view_zoom_out" = "Meta+-"; "mediacontrol"."mediavolumedown" = [ ]; "mediacontrol"."mediavolumeup" = [ ]; @@ -199,7 +199,7 @@ "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = [ ]; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; + "org_kde_powerdevil"."powerProfile" = ["" "Battery" "Meta+B"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; "plasmashell"."activate task manager entry 10" = "Meta+0"; "plasmashell"."activate task manager entry 2" = "Meta+2"; @@ -240,7 +240,7 @@ "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"."PointerAcceleration" = 0.0; "kcminputrc"."Libinput/273/6202/SteelSeries Aerox 3 Wireless Mouse"."PointerAccelerationProfile" = 1; "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true; "kcminputrc"."Mouse"."XLbInptAccelProfileFlat" = false; @@ -248,11 +248,10 @@ "kcminputrc"."Mouse"."cursorTheme" = "ePapirus"; "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; - "kdeglobals"."General"."AccentColor" = "168,58,175"; + "kdeglobals"."General"."AccentColor" = "168,57,175"; "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."accentColorFromWallpaper" = true; "kdeglobals"."KDE"."SingleClick" = true; - "kdeglobals"."KDE"."widgetStyle" = "Breeze"; "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; @@ -273,12 +272,12 @@ "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; "kdeglobals"."KScreen"."ScreenScaleFactors" = "eDP-1=1;"; "kdeglobals"."KScreen"."XwaylandClientsScale" = false; - "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"; + "kdeglobals"."WM"."activeBackground" = "239,236,244"; + "kdeglobals"."WM"."activeBlend" = "160,110,59"; + "kdeglobals"."WM"."activeForeground" = "88,82,96"; + "kdeglobals"."WM"."inactiveBackground" = "239,236,244"; + "kdeglobals"."WM"."inactiveBlend" = "126,120,135"; + "kdeglobals"."WM"."inactiveForeground" = "88,82,96"; "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; @@ -322,7 +321,6 @@ "kwinrc"."org/kde/kdecoration2"."BorderSize" = "None"; "kwinrc"."org/kde/kdecoration2"."BorderSizeAuto" = false; "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "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/green/default.nix b/stylix/themes/green/default.nix index 4db3b6a8..579850d6 100644 --- a/stylix/themes/green/default.nix +++ b/stylix/themes/green/default.nix @@ -1,7 +1,7 @@ { ... }: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/green/wallpaper2.png; polarity = "dark"; base16Scheme = ./everforest-dark-hard.yaml; autoEnable = true; diff --git a/stylix/themes/gruvbox/default.nix b/stylix/themes/gruvbox/default.nix index c6818fa4..09fc15d1 100644 --- a/stylix/themes/gruvbox/default.nix +++ b/stylix/themes/gruvbox/default.nix @@ -1,9 +1,9 @@ {lib, inputs, pkgs, gpu, system, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/gruvbox/wallpaper1.png; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; autoEnable = true; }; -} \ No newline at end of file +} diff --git a/stylix/themes/sakura-day/default.nix b/stylix/themes/sakura-day/default.nix index d992927a..b16bc598 100644 --- a/stylix/themes/sakura-day/default.nix +++ b/stylix/themes/sakura-day/default.nix @@ -1,8 +1,7 @@ { ... }: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - # Placeholder as it's required for some reason - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/sakura-day/wallpaper1.png; base16Scheme = ./sakura.yaml; autoEnable = true; }; diff --git a/stylix/themes/sakura-night/default.nix b/stylix/themes/sakura-night/default.nix index e68044ea..53382df0 100644 --- a/stylix/themes/sakura-night/default.nix +++ b/stylix/themes/sakura-night/default.nix @@ -1,8 +1,7 @@ {... }: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - # Placeholder as it's required for some reason - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/sakura-night/wallpaper1.png; base16Scheme = ./sakura-night.yaml; polarity = "dark"; autoEnable = true; diff --git a/stylix/themes/tokyo-day/default.nix b/stylix/themes/tokyo-day/default.nix index 0d2d4982..ed3b9ae9 100644 --- a/stylix/themes/tokyo-day/default.nix +++ b/stylix/themes/tokyo-day/default.nix @@ -1,8 +1,8 @@ {lib, inputs, pkgs, gpu, system, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/tokyo-day/wallpaper1.png; base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-light.yaml"; autoEnable = true; }; -} \ No newline at end of file +} diff --git a/stylix/themes/tokyo-night/default.nix b/stylix/themes/tokyo-night/default.nix index b79d8d3b..a2c279b2 100644 --- a/stylix/themes/tokyo-night/default.nix +++ b/stylix/themes/tokyo-night/default.nix @@ -1,9 +1,9 @@ {lib, inputs, pkgs, gpu, system, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/tokyo-night/wallpaper1.png; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml"; autoEnable = true; }; -} \ No newline at end of file +}