From 600152a05de7c77f28fd3ad8e966d5dd74645204 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sun, 4 Oct 2026 08:08:11 -0400 Subject: [PATCH 1/6] refactor(llm_tools): remove unused packages from home.packages --- users/richie/home/gui/llm_tools.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/users/richie/home/gui/llm_tools.nix b/users/richie/home/gui/llm_tools.nix index 92e4744..25497dd 100644 --- a/users/richie/home/gui/llm_tools.nix +++ b/users/richie/home/gui/llm_tools.nix @@ -1,9 +1,7 @@ { pkgs, ... }: { home.packages = [ - pkgs.master.claude-code pkgs.master.codex pkgs.master.opencode - pkgs.master.pi-coding-agent ]; } -- 2.55.0 From cf36604152f113f66b1cb1f8d277ec15bf3b5b40 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sun, 4 Oct 2026 09:08:57 -0400 Subject: [PATCH 2/6] removed qmk and yubikey from rhapsody-in-green imports will add to a nix shell or readd when needed --- systems/rhapsody-in-green/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix index 82bfe53..9194468 100644 --- a/systems/rhapsody-in-green/default.nix +++ b/systems/rhapsody-in-green/default.nix @@ -9,11 +9,9 @@ "${inputs.self}/common/optional/syncthing_base.nix" "${inputs.self}/common/optional/systemd-boot.nix" "${inputs.self}/common/optional/tailscale.nix" - "${inputs.self}/common/optional/yubikey.nix" "${inputs.self}/common/optional/zfs" ./hardware.nix ./programs.nix - ./qmk.nix ./syncthing.nix inputs.nixos-hardware.nixosModules.framework-13-7040-amd ]; -- 2.55.0 From be45ea6b7d659e8d2a83cdd35950713104d7cf0f Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sun, 4 Oct 2026 10:59:51 -0400 Subject: [PATCH 3/6] removed mangohud --- common/optional/steam.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/common/optional/steam.nix b/common/optional/steam.nix index 112e4d9..c771fbf 100644 --- a/common/optional/steam.nix +++ b/common/optional/steam.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - mangohud steam-run ]; hardware.steam-hardware.enable = true; -- 2.55.0 From 3ef0f11b79a11d9ba5ed9f217947528fec0a1222 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sun, 4 Oct 2026 13:12:28 -0400 Subject: [PATCH 4/6] refactor(desktop): split KDE and PipeWire modules --- common/optional/desktop.nix | 42 ------------------------- common/optional/desktop/default.nix | 17 ++++++++++ common/optional/desktop/kde.nix | 45 +++++++++++++++++++++++++++ common/optional/desktop/pipewire.nix | 16 ++++++++++ systems/rhapsody-in-green/default.nix | 2 +- 5 files changed, 79 insertions(+), 43 deletions(-) delete mode 100644 common/optional/desktop.nix create mode 100644 common/optional/desktop/default.nix create mode 100644 common/optional/desktop/kde.nix create mode 100644 common/optional/desktop/pipewire.nix diff --git a/common/optional/desktop.nix b/common/optional/desktop.nix deleted file mode 100644 index f6b73ae..0000000 --- a/common/optional/desktop.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ pkgs, ... }: -{ - boot = { - kernelPackages = pkgs.linuxPackages_6_18; - zfs.package = pkgs.zfs_2_4; - }; - - hardware.bluetooth = { - enable = true; - powerOnBoot = true; - }; - - # rtkit is optional but recommended for pipewire - security.rtkit.enable = true; - - services = { - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; - - desktopManager.plasma6.enable = true; - - xserver = { - enable = true; - xkb = { - layout = "us"; - variant = ""; - }; - }; - - pulseaudio.enable = false; - - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - wireplumber.enable = true; - }; - }; -} diff --git a/common/optional/desktop/default.nix b/common/optional/desktop/default.nix new file mode 100644 index 0000000..981d554 --- /dev/null +++ b/common/optional/desktop/default.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: +{ + imports = [ + ./kde.nix + ./pipewire.nix + ]; + + boot = { + kernelPackages = pkgs.linuxPackages_6_18; + zfs.package = pkgs.zfs_2_4; + }; + + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + }; +} diff --git a/common/optional/desktop/kde.nix b/common/optional/desktop/kde.nix new file mode 100644 index 0000000..386b037 --- /dev/null +++ b/common/optional/desktop/kde.nix @@ -0,0 +1,45 @@ +{ pkgs, ... }: +{ + environment.plasma6.excludePackages = with pkgs.kdePackages; [ + aurorae # theme + elisa # music player + kate # text editor + kconfig # config editor + khelpcenter # help center + kinfocenter # system info + konsole # terminal + krdp # remote desktop + ktexteditor # thing for kate + okular # pdf reader + plasma-keyboard # used by plasma-keyboard KCM + plasma-sdk # plasma development tools + plasma-workspace-wallpapers # wallpapers + qrca # qr code scanner + qtvirtualkeyboard # virtual keyboard + union # theme + ]; + + # disable KDE PIM (Personal Information Management) applications + programs.kde-pim.enable = false; + + services = { + # removes screen reader and speech dispatcher from the system + orca.enable = false; + speechd.enable = false; + + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + + desktopManager.plasma6.enable = true; + + xserver = { + enable = true; + xkb = { + layout = "us"; + variant = ""; + }; + }; + }; +} diff --git a/common/optional/desktop/pipewire.nix b/common/optional/desktop/pipewire.nix new file mode 100644 index 0000000..aeb4350 --- /dev/null +++ b/common/optional/desktop/pipewire.nix @@ -0,0 +1,16 @@ +{ + # rtkit is optional but recommended for pipewire + security.rtkit.enable = true; + + services = { + pulseaudio.enable = false; + + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + wireplumber.enable = true; + }; + }; +} diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix index 9194468..5161193 100644 --- a/systems/rhapsody-in-green/default.nix +++ b/systems/rhapsody-in-green/default.nix @@ -3,7 +3,7 @@ imports = [ "${inputs.self}/users/richie" "${inputs.self}/common/global" - "${inputs.self}/common/optional/desktop.nix" + "${inputs.self}/common/optional/desktop" "${inputs.self}/common/optional/docker.nix" "${inputs.self}/common/optional/steam.nix" "${inputs.self}/common/optional/syncthing_base.nix" -- 2.55.0 From 169c8f9523743cbc227d7a9285d75c288a3d7e2c Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Tue, 6 Oct 2026 12:55:29 -0400 Subject: [PATCH 5/6] adding firefox --- users/richie/home/gui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/richie/home/gui/default.nix b/users/richie/home/gui/default.nix index 5d459d0..3a48aa5 100644 --- a/users/richie/home/gui/default.nix +++ b/users/richie/home/gui/default.nix @@ -21,6 +21,7 @@ vlc # browser brave + firefox # dev tools gparted jetbrains.datagrip -- 2.55.0 From 8f678b8e66d52753cb1de829cead15de1fa500c8 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Tue, 6 Oct 2026 13:10:13 -0400 Subject: [PATCH 6/6] removed gitea DOMAIN Failed assertions: - `services.gitea.settings.server.DOMAIN` was removed upstream and replaced by `services.gitea.settings.server.ROOT_URL`. --- systems/jeeves/services/gitea.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/jeeves/services/gitea.nix b/systems/jeeves/services/gitea.nix index bd8f9a5..294a49f 100644 --- a/systems/jeeves/services/gitea.nix +++ b/systems/jeeves/services/gitea.nix @@ -23,7 +23,6 @@ in }; service.DISABLE_REGISTRATION = true; server = { - DOMAIN = "gitea.tmmworkshop.com"; ROOT_URL = "https://gitea.tmmworkshop.com/"; HTTP_PORT = 6443; BUILTIN_SSH_SERVER_USER = "gitea"; -- 2.55.0