diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index bc79e88..4d20838 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -7,6 +7,10 @@ in { imports = [ ./fwbook.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.desktop = { + kde.enabled = true; + fonts = pkgs.fira-code; + }; services.fwupd.enable = true; services.fwupd.package = (import (builtins.fetchTarball { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix deleted file mode 100644 index 1924fb9..0000000 --- a/modules/desktop/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ user -, enableX11 ? false -, enableGnome ? false -, enableKDE ? false -, enableHypr ? false -, enableWine ? false -, ... -}: -{ pkgs, ... }: { - imports = [ ./wayland.nix ] ++ (if enableX11 then [ ./x11.nix ] else [ ]) - ++ (if enableGnome then [ ./gnome.nix ] else [ ]) - ++ (if enableWine then [ ./wine.nix ] else [ ]) - ++ (if enableKDE then [ ./kde.nix ] else [ ]) ++ (if enableHypr then - [ (import ./hyprland.nix { user = user; }) ] - else - [ ]); - - # Flatpak - services.flatpak.enable = true; - # Mobile Connect - programs.kdeconnect.enable = true; - # Web -} diff --git a/modules/desktop/kde.nix b/modules/desktop/kde.nix deleted file mode 100644 index 3d6f6f0..0000000 --- a/modules/desktop/kde.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: { - services.desktopManager.plasma6.enable = true; - services.desktopManager.plasma6.notoPackage = pkgs.fira-code; - services.desktopManager.plasma6.enableQt5Integration = true; - environment.plasma6.excludePackages = with pkgs.kdePackages; [ - konsole # terminal - elisa # media player - kate # text editor - gwenview # image viewer - ]; - environment.systemPackages = with pkgs; [ - kdePackages.plasma-browser-integration - konsave # save configs - ]; -} diff --git a/modules/home/default.nix b/modules/home/default.nix index c1b6f47..365e6b4 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -43,39 +43,6 @@ in devbox terraform kubectl - - # socials - slack - zoom-us - betterdiscordctl - discord - signal-desktop - whatsapp-for-linux - caprine-bin # facebook messenger - - # development - vscode - - # web - brave - - # mail - thunderbird - - # password - bitwarden-desktop - - # documents - onlyoffice-bin_latest - - # video - vlc - vlc-bittorrent - - # terminal - alacritty - alacritty-theme - ] else [ ]); }; diff --git a/modules/main.nix b/modules/main.nix index 15fc0ab..a284429 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -19,10 +19,7 @@ imports = [ (import ./skyg) (import ./nixos) - ] ++ (if desktop.enable then - [ (import ./desktop ({ user = user; } // desktop)) ] - else - [ ]) ++ (if os.enable then + ] ++ (if os.enable then [ (import ./os ({ user = user; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index e998ce2..5c53ea9 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -3,5 +3,6 @@ imports = [ ./common ./server + ./desktop ]; } diff --git a/modules/nixos/desktop/common.nix b/modules/nixos/desktop/common.nix new file mode 100644 index 0000000..6cda5cd --- /dev/null +++ b/modules/nixos/desktop/common.nix @@ -0,0 +1,17 @@ +{ lib, pkgs, ... }: + +with lib; + +{ + options = { + skyg.desktop = { + fonts = mkOption { + description = "Preferred Font"; + type = types.package; + default = pkgs.fira-code; + }; + }; + }; + + config = { }; +} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 8b13789..5d0ff68 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1 +1,13 @@ +{ ... }: +{ + imports = [ + ./common.nix + ./kde.nix + ./wayland.nix + ./x11.nix + ./packages.nix + ]; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; +} diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix new file mode 100644 index 0000000..286cb1b --- /dev/null +++ b/modules/nixos/desktop/kde.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.desktop.kde; +in +{ + options = { + skyg.skyg.desktop.kde = { + enable = mkEnableOption + "KDE"; + }; + }; + config = mkIf cfg.enable { + services.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; + services.desktopManager.plasma6.enableQt5Integration = true; + environment.plasma6.excludePackages = with pkgs.kdePackages; [ + konsole # terminal + elisa # media player + kate # text editor + gwenview # image viewer + ]; + environment.systemPackages = with pkgs; [ + kdePackages.plasma-browser-integration + konsave # save configs + ]; + }; +} diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix new file mode 100644 index 0000000..de41e5e --- /dev/null +++ b/modules/nixos/desktop/packages.nix @@ -0,0 +1,43 @@ +{ pkgs, ... }: +{ + # 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 + + # web + brave + + # mail + thunderbird + + # password + bitwarden-desktop + + # documents + onlyoffice-bin_latest + + # video + vlc + vlc-bittorrent + + # terminal + alacritty + alacritty-theme + ]; +} diff --git a/modules/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix similarity index 60% rename from modules/desktop/wayland.nix rename to modules/nixos/desktop/wayland.nix index 1f1206a..2168134 100644 --- a/modules/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -1,11 +1,10 @@ { pkgs, ... }: { - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - programs.xwayland.enable = true; + # Flatpak environment.systemPackages = with pkgs; [ wayland wayland-protocols wayland-utils ]; + programs.xwayland.enable = true; } diff --git a/modules/desktop/x11.nix b/modules/nixos/desktop/x11.nix similarity index 100% rename from modules/desktop/x11.nix rename to modules/nixos/desktop/x11.nix