diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index 84c62c6..f75ad62 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib.${namespace}) enabled; + inherit (lib.${namespace}) enabled disabled; # Displays display = { input = "eDP-1"; @@ -20,8 +20,9 @@ in home.stateVersion = "23.11"; ${namespace} = { + desktop.gnome = enabled; programs.hyprland = { - enable = true; + enable = false; primaryDisplay = "eDP-1"; debug.disableScaleChecks = true; @@ -77,22 +78,13 @@ in }; programs = { btop = enabled; - kitty = { - enable = true; - }; - mako = { - enable = true; - }; - nwg-dock = enabled; - nwg-drawer = enabled; - nwg-panel = { - enable = true; - defaultApps = { - browser = pkgs.firefox; - }; - }; + kitty = disabled; + mako = disabled; + nwg-dock = disabled; + nwg-drawer = disabled; + nwg-panel = disabled; waybar = { - enable = true; + enable = false; layer = "bottom"; @@ -126,8 +118,8 @@ in windowOffset = 75; }; - wlogout = enabled; - wofi = enabled; + wlogout = disabled; + wofi = disabled; }; }; diff --git a/systems/aarch64-linux/macbook-pro-nixos/boot.nix b/systems/aarch64-linux/macbook-pro-nixos/boot.nix index e40d0cd..17b12d4 100644 --- a/systems/aarch64-linux/macbook-pro-nixos/boot.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/boot.nix @@ -22,7 +22,6 @@ m1n1CustomLogo = ./NixOS.png; initrd = { - availableKernelModules = lib.mkForce [ ]; kernelModules = { bcachefs = lib.mkForce false; }; diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix index 7624da9..e694091 100755 --- a/systems/aarch64-linux/macbook-pro-nixos/default.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix @@ -53,10 +53,10 @@ desktop = { hyprland = { - enable = true; + enable = false; wallpaperSource = "bing"; }; - gnome.enable = false; + gnome.enable = true; }; hardware = { battery = { diff --git a/systems/aarch64-linux/macbook-pro-nixos/services.nix b/systems/aarch64-linux/macbook-pro-nixos/services.nix index 07490d3..b333b44 100644 --- a/systems/aarch64-linux/macbook-pro-nixos/services.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/services.nix @@ -58,15 +58,15 @@ displayManager = { sddm = { - enable = lib.mkForce true; + enable = lib.mkForce false; wayland.enable = lib.mkForce true; }; - gdm.enable = lib.mkForce false; + gdm.enable = lib.mkForce true; }; desktopManager = { plasma6.enable = lib.mkForce false; - gnome.enable = lib.mkForce false; + gnome.enable = lib.mkForce true; }; logind = {