From bb53a89e1cd90d58d49de852f5704304ea2c8843 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 18 Mar 2025 09:47:31 -0400 Subject: [PATCH] Bye bye KDE & hello offline builds - Offline caches will no longer fail builds - Not using KDE anymore - Power management for COSMIC --- flake.nix | 12 ++++++------ hosts/fwbook.nix | 6 +++--- modules/core/nix-substituters.nix | 4 ++++ modules/nixos/desktop/cosmic.nix | 2 ++ modules/nixos/desktop/packages.nix | 1 - 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index cd791bd..62c316b 100644 --- a/flake.nix +++ b/flake.nix @@ -45,12 +45,12 @@ homeManagerVersion = "24.11"; # Local Services localNixCaches = { - urls = [ - "http://minipc1.lab.internal:5000" - ]; - keys = [ - "minipc1.lab.internal:eIoib1JgcBEd0YKdW95QlRA2eCKDs+WxNhWhkA1wffc=" - ]; + # urls = [ + # "http://minipc1.lab.internal:5000" + # ]; + # keys = [ + # "minipc1.lab.internal:eIoib1JgcBEd0YKdW95QlRA2eCKDs+WxNhWhkA1wffc=" + # ]; }; localDockerRegistries = [ "minipc1.lab.internal:5001" ]; hlCommonSettings = { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index aff938f..edd71ee 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -27,7 +27,7 @@ in desktop = { enable = true; cosmic.enable = true; - kde.enable = true; + kde.enable = false; crypto.enable = true; }; }; @@ -44,8 +44,8 @@ in services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; services.displayManager.sddm.wayland.compositor = "kwin"; - services.displayManager.defaultSession = "plasma"; - programs.kdeconnect.enable = true; + services.displayManager.defaultSession = "cosmic"; + programs.kdeconnect.enable = false; # Firmware updater services.fwupd.enable = true; services.fprintd.enable = true; diff --git a/modules/core/nix-substituters.nix b/modules/core/nix-substituters.nix index d779056..1f4bc24 100644 --- a/modules/core/nix-substituters.nix +++ b/modules/core/nix-substituters.nix @@ -38,5 +38,9 @@ in "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" ] ++ cfg.keys; nix.settings.trusted-users = [ "root" skygUser.name ]; + nix.extraOptions = '' + # Ensure we can still build when missing-server is not accessible + fallback = true + ''; }; } diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index 8f7691d..8b727bd 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -14,5 +14,7 @@ in pkgs.cosmic-icons ]; services.desktopManager.cosmic.enable = true; + hardware.system76.enableAll = true; + hardware.system76.power-daemon.enable = true; }; } diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index 59cbf20..8b51e92 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -11,7 +11,6 @@ in # General utils busybox gcc - rofimoji # emoji picker feh # image viewer # copy to clipboard