diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index f1b6f53..c7c67f4 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -20,7 +20,8 @@ in home.stateVersion = "23.11"; ${namespace} = { - desktop.gnome = enabled; + desktop.gnome = disabled; + desktop.plasma = enabled; programs.hyprland = { enable = false; primaryDisplay = "eDP-1"; @@ -137,7 +138,6 @@ in orca-slicer vscodium - gnomeExtensions.notch-clock-offset ]); services = { @@ -151,32 +151,4 @@ in password-store = enabled; }; - 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 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 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/" - "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/" - ]; - }; - }; } diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix index 180c904..7daf034 100755 --- a/systems/aarch64-linux/macbook-pro-nixos/default.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix @@ -65,7 +65,8 @@ enable = false; wallpaperSource = "bing"; }; - gnome.enable = true; + gnome.enable = false; + plasma.enable = true; }; hardware = { battery = { @@ -93,40 +94,6 @@ }; }; - specialisation = { - # asahi-fairydust.configuration = import ./specialisations/asahi-fairydust.nix; - - "plasma".configuration = { - ${namespace} = { - sops.enable = true; - desktop = { - plasma.enable = lib.mkForce true; - hyprland.enable = lib.mkForce false; - gnome.enable = lib.mkForce false; - }; - home.extraOptions = { - ${namespace} = { - desktop = { - gnome = lib.mkForce { enable = false; }; - plasma = lib.mkForce { enable = true; }; - }; - programs = { - hyprland = lib.mkForce { enable = false; }; - kitty = lib.mkForce { enable = false; }; - mako = lib.mkForce { enable = false; }; - nwg-dock = lib.mkForce { enable = false; }; - nwg-drawer = lib.mkForce { enable = false; }; - nwg-panel = lib.mkForce { enable = false; }; - waybar = lib.mkForce { enable = false; }; - wlogout = lib.mkForce { enable = false; }; - wofi = lib.mkForce { enable = false; }; - }; - }; - }; - }; - }; - }; - nixpkgs.config.allowUnsupportedSystem = true; virtualisation = {