Refactor of desktop

This commit is contained in:
ari committed 2024-08-17 21:13:12 -04:00
1 parent 690af77bfa
commit 41f5bc048d
12 files changed
+109 -78

No files matched your search

+4
View File
@@ -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 {
-23
View File
@@ -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
}
-15
View File
@@ -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
];
}
-33
View File
@@ -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
[ ]);
};
+1 -4
View File
@@ -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;
+1
View File
@@ -3,5 +3,6 @@
imports = [
./common
./server
./desktop
];
}
+17
View File
@@ -0,0 +1,17 @@
{ lib, pkgs, ... }:
with lib;
{
options = {
skyg.desktop = {
fonts = mkOption {
description = "Preferred Font";
type = types.package;
default = pkgs.fira-code;
};
};
};
config = { };
}
+12
View File
@@ -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;
}
+29
View File
@@ -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
];
};
}
+43
View File
@@ -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
];
}
@@ -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;
}
File renamed without changes.