From 96a0745a6d2b6eebd986a3a794569263c41d8b15 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Fri, 16 Jan 2026 11:03:50 -0500 Subject: [PATCH] revert to pure sddm & peach: add ddc support --- home/hosts/alien/default.nix | 6 ------ home/hosts/peach/default.nix | 6 ------ home/tiling/niri/noctalia.nix | 5 +++++ system/default.nix | 10 +++++----- system/hosts/alien/default.nix | 5 ----- system/hosts/peach/default.nix | 20 ++++++++++++++++++-- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/home/hosts/alien/default.nix b/home/hosts/alien/default.nix index 3b78219..310972a 100644 --- a/home/hosts/alien/default.nix +++ b/home/hosts/alien/default.nix @@ -18,12 +18,6 @@ pkgs.daggerfall-unity ]; - programs.noctalia-shell.settings.brightness = { - brightnessStep = 5; - enforceMinimum = false; - enableDdcSupport = true; - }; - programs.spicetify = let spicePkgs = spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index ded2bd7..71560a5 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -18,12 +18,6 @@ render-drm-device = "/dev/dri/card2"; }; - programs.noctalia-shell.settings.brightness = { - brightnessStep = 5; - enforceMinimum = false; - enableDdcSupport = false; - }; - programs.plasma = { input.touchpads = [ { diff --git a/home/tiling/niri/noctalia.nix b/home/tiling/niri/noctalia.nix index ee59765..4bc249f 100644 --- a/home/tiling/niri/noctalia.nix +++ b/home/tiling/niri/noctalia.nix @@ -86,6 +86,11 @@ in { package = customPackage; settings = { settingsVersion = 0; + brightness = { + brightnessStep = 5; + enforceMinimum = false; + enableDdcSupport = true; + }; bar = { position = "top"; backgroundOpacity = 1; diff --git a/system/default.nix b/system/default.nix index ee04498..b73ec82 100755 --- a/system/default.nix +++ b/system/default.nix @@ -81,11 +81,11 @@ services = { desktopManager.plasma6.enable = true; displayManager = { - # sddm = { - # enable = true; - # wayland.enable = true; - # enableHidpi = true; - # }; + sddm = { + enable = true; + wayland.enable = true; + enableHidpi = true; + }; defaultSession = "niri"; }; diff --git a/system/hosts/alien/default.nix b/system/hosts/alien/default.nix index 71472e2..2f27f25 100644 --- a/system/hosts/alien/default.nix +++ b/system/hosts/alien/default.nix @@ -55,11 +55,6 @@ enable = false; user = "sckova"; }; - sddm = { - enable = true; - wayland.enable = true; - enableHidpi = true; - }; }; environment = { diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix index eb127f2..c3fa403 100644 --- a/system/hosts/peach/default.nix +++ b/system/hosts/peach/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + config, + ... +}: { boot.kernelParams = ["appledrm.show_notch=1"]; catppuccin = { @@ -6,7 +10,19 @@ flavor = "macchiato"; }; - services.displayManager.gdm.enable = true; + environment.systemPackages = with pkgs; [ + ddcutil + ]; + + boot.extraModulePackages = [config.boot.kernelPackages.ddcci-driver]; + boot.kernelModules = [ + "i2c-dev" + "ddcci_backlight" + ]; + services.udev.extraRules = '' + KERNEL=="i2c-[0-9]*", GROUP="i2c", MODE="0660" + ''; + hardware.i2c.enable = true; hardware.asahi = { enable = true;