From 9228a1ae4076971ac6de434909604617b5d8eab6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 19 Aug 2024 10:55:29 -0400 Subject: [PATCH] More hiding of desktop --- hosts/fwbook.nix | 1 + modules/nixos/desktop/default.nix | 2 +- modules/nixos/desktop/packages.nix | 81 ++++++++++++++++-------------- modules/nixos/desktop/wayland.nix | 21 +++++--- modules/nixos/desktop/x11.nix | 15 ++++-- 5 files changed, 68 insertions(+), 52 deletions(-) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 38e76b8..35cdbe0 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -8,6 +8,7 @@ in imports = [ ./fwbook.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.desktop = { + enabled = true; kde.enabled = true; }; services.fwupd.enable = true; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index ea36b31..83ff98f 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index c0a6c2a..3412d0f 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -1,48 +1,53 @@ -{ pkgs, ... }: +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.nixos.desktop; +in { - # Flatpak - services.flatpak.enable = true; - # Mobile Connect - programs.kdeconnect.enable = true; - environment.systemPackages = with pkgs; [ - # copy to clipboard - wl-clipboard-x11 - xclip - # socials - slack - zoom-us - betterdiscordctl - discord - signal-desktop - whatsapp-for-linux - caprine-bin # facebook messenger + config = lib.mkIf cfg.enabled { + # Flatpak + services.flatpak.enable = true; + # Mobile Connect + programs.kdeconnect.enable = true; + environment.systemPackages = with pkgs; [ + # copy to clipboard + wl-clipboard-x11 + xclip + # socials + slack + zoom-us + betterdiscordctl + discord + signal-desktop + whatsapp-for-linux + caprine-bin # facebook messenger - # development - vscode + # development + vscode - # web - brave + # web + brave - # mail - thunderbird + # mail + thunderbird - # password - bitwarden-desktop + # password + bitwarden-desktop - # documents - onlyoffice-bin_latest + # documents + onlyoffice-bin_latest - # video - vlc - vlc-bittorrent + # video + vlc + vlc-bittorrent - # terminal - alacritty - alacritty-theme + # terminal + alacritty + alacritty-theme - # wine - wineWowPackages.stable - winetricks - wineWowPackages.waylandFull - ]; + # wine + wineWowPackages.stable + winetricks + wineWowPackages.waylandFull + ]; + }; } diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index 2168134..62d8387 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -1,10 +1,15 @@ -{ pkgs, ... }: +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.nixos.desktop; +in { - # Flatpak - environment.systemPackages = with pkgs; [ - wayland - wayland-protocols - wayland-utils - ]; - programs.xwayland.enable = true; + config = lib.mkIf cfg.enabled { + # Flatpak + environment.systemPackages = with pkgs; [ + wayland + wayland-protocols + wayland-utils + ]; + programs.xwayland.enable = true; + }; } diff --git a/modules/nixos/desktop/x11.nix b/modules/nixos/desktop/x11.nix index b1b2227..c109026 100644 --- a/modules/nixos/desktop/x11.nix +++ b/modules/nixos/desktop/x11.nix @@ -1,8 +1,13 @@ -{ ... }: +{ config, lib, ... }: +let + cfg = config.skyg.nixos.desktop; +in { - services.xserver = { - enable = true; - xkb.layout = "us"; - xkb.variant = ""; + config = lib.mkIf cfg.enabled { + services.xserver = { + enable = true; + xkb.layout = "us"; + xkb.variant = ""; + }; }; }