diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index 0491e7d..13d6507 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -134,6 +134,8 @@ in iwd orca-slicer vscodium + + gnomeExtensions.notch-clock-offset ]); services = { @@ -148,13 +150,20 @@ in }; dconf = { + enable = true; settings = { "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0".name = "Keyboard Backlight +"; - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0".binding = "MonBrightnessUp"; - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0".command = "brightnessctl -d kbd_backlight +10"; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0".binding = "MonBrightnessUp"; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0".command = "brightnessctl -d kbd_backlight s +10"; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1".name = "Keyboard Backlight -"; - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1".binding = "MonBrightnessDown"; - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1".command = "brightnessctl -d kbd_backlight 10-"; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1".binding = "MonBrightnessDown"; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1".command = "brightnessctl -d kbd_backlight s 10-"; + + "org/gnome/shell".enabled-extensions = [ + "notch-clock-offset@christophbrill.de" + ]; + + "org/gnome/shell/extensions/notch-clock-offset".percent = 40; "org/gnome/settings-daemon/plugins/media-keys".custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" diff --git a/modules/home/desktop/gnome/default.nix b/modules/home/desktop/gnome/default.nix index 561e2cf..53050ce 100644 --- a/modules/home/desktop/gnome/default.nix +++ b/modules/home/desktop/gnome/default.nix @@ -62,7 +62,7 @@ in "allowlockedremotedesktop@kamens.us" "appindicatorsupport@rgcjonas.gmail.com" "caffeine@patapon.info" - # "user-theme@gnome-shell-extensions.gcampax.github.com" + "user-theme@gnome-shell-extensions.gcampax.github.com" "tiling-assistant@leleat-on-github" "dash-to-dock@micxgx.gmail.com" "BingWallpaper@ineffable-gmail.com" diff --git a/systems/aarch64-linux/macbook-pro-nixos/boot.nix b/systems/aarch64-linux/macbook-pro-nixos/boot.nix index b7fbfc7..eba7a3c 100644 --- a/systems/aarch64-linux/macbook-pro-nixos/boot.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/boot.nix @@ -24,6 +24,7 @@ in kernelParams = [ "apple_dcp.show_notch=1" + "appledrm.show_notch=1" "melt_my_mac=1" # enable fan control ]; diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix index df405ae..d1a042d 100755 --- a/systems/aarch64-linux/macbook-pro-nixos/default.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix @@ -135,6 +135,7 @@ ]); networking.networkmanager.wifi.backend = "iwd"; + # nixpkgs.overlays = [ (import ./mutter) ]; environment.sessionVariables = { DBX_CONTAINER_MANAGER = "podman"; diff --git a/systems/aarch64-linux/macbook-pro-nixos/mutter/MBP16.patch b/systems/aarch64-linux/macbook-pro-nixos/mutter/MBP16.patch new file mode 100644 index 0000000..e6472e7 --- /dev/null +++ b/systems/aarch64-linux/macbook-pro-nixos/mutter/MBP16.patch @@ -0,0 +1,19 @@ +diff --git a/src/core/constraints.c b/src/core/constraints.c +index 3fd05a103..5ac514af8 100644 +--- a/src/core/constraints.c ++++ b/src/core/constraints.c +@@ -1344,6 +1344,14 @@ constrain_fullscreen (MetaWindow *window, + + monitor = info->entire_monitor; + ++ if (abs(monitor.width / monitor.width - 1.54f) < 0.01f) {//window->monitor->is_primary) {//monitor.width == 3456 && monitor.height == 2234) { ++ const float notch_y_ratio = 64.f / 1963.f; ++ int notch_padding_height = monitor.height * notch_y_ratio; ++ ++ monitor.y += notch_padding_height; ++ monitor.height -= notch_padding_height; ++ } ++ + get_size_limits (window, &min_size, &max_size); + too_big = !mtk_rectangle_could_fit_rect (&monitor, &min_size); + too_small = !mtk_rectangle_could_fit_rect (&max_size, &monitor); diff --git a/systems/aarch64-linux/macbook-pro-nixos/mutter/default.nix b/systems/aarch64-linux/macbook-pro-nixos/mutter/default.nix new file mode 100644 index 0000000..909feec --- /dev/null +++ b/systems/aarch64-linux/macbook-pro-nixos/mutter/default.nix @@ -0,0 +1,7 @@ +(final: prev: { + mutter = prev.mutter.overrideAttrs (oldAttrs: { + patches = (oldAttrs.patches or []) ++ [ + ./MBP16.patch + ]; + }); +}) \ No newline at end of file