fixes
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
hasDestopEnvironment,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -10,17 +11,10 @@
|
||||
homeDirectory = lib.mkDefault "/home/${config.home.username}";
|
||||
packages = with pkgs; [
|
||||
age
|
||||
chromium
|
||||
clinfo
|
||||
cpufetch
|
||||
deadnix
|
||||
firefox
|
||||
gamescope
|
||||
gamescope-wsi
|
||||
goverlay
|
||||
gparted
|
||||
lm_sensors
|
||||
mission-center
|
||||
nano
|
||||
nixfmt-rfc-style
|
||||
pciutils
|
||||
@@ -31,11 +25,19 @@
|
||||
tailscale
|
||||
tree
|
||||
usbutils
|
||||
vesktop
|
||||
vim
|
||||
vulkan-tools
|
||||
wget
|
||||
];
|
||||
] ++ (if hasDestopEnvironment then [
|
||||
chromium
|
||||
firefox
|
||||
gamescope
|
||||
gamescope-wsi
|
||||
gparted
|
||||
goverlay
|
||||
mission-center
|
||||
vesktop
|
||||
] else [ ]);
|
||||
|
||||
stateVersion = lib.mkDefault "23.11";
|
||||
};
|
||||
@@ -47,7 +49,7 @@
|
||||
java = {
|
||||
enable = lib.mkDefault true;
|
||||
};
|
||||
mangohud.enable = lib.mkDefault true;
|
||||
mangohud.enable = lib.mkDefault hasDestopEnvironment;
|
||||
password-store.enable = true;
|
||||
nh = {
|
||||
enable = true;
|
||||
@@ -110,10 +112,10 @@
|
||||
};
|
||||
|
||||
services = {
|
||||
nextcloud-client.enable = lib.mkDefault true;
|
||||
nextcloud-client.enable = lib.mkDefault hasDestopEnvironment;
|
||||
pass-secret-service.enable = lib.mkDefault true;
|
||||
kdeconnect = {
|
||||
enable = lib.mkDefault true;
|
||||
enable = lib.mkDefault hasDestopEnvironment;
|
||||
indicator = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -3,10 +3,12 @@
|
||||
pkgs,
|
||||
system,
|
||||
namespace,
|
||||
hasDestopEnvironment,
|
||||
...
|
||||
}:
|
||||
let
|
||||
isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system);
|
||||
|
||||
x86_only = with pkgs; [
|
||||
vscode-extensions.redhat.vscode-xml
|
||||
];
|
||||
@@ -20,7 +22,7 @@ in
|
||||
|
||||
programs = {
|
||||
vscode = {
|
||||
enable = true;
|
||||
enable = hasDestopEnvironment;
|
||||
package = pkgs.vscodium;
|
||||
mutableExtensionsDir = false;
|
||||
profiles = {
|
||||
|
||||
@@ -116,8 +116,8 @@ in
|
||||
settings = {
|
||||
preload = [ "/run/wallpaper.jpg" ];
|
||||
wallpaper = [
|
||||
"DP-1, /run/wallpaper.jpg"
|
||||
"DP-2, /run/wallpaper.jpg"
|
||||
"${cfg.display1.input}, /run/wallpaper.jpg"
|
||||
"${cfg.display2.input}, /run/wallpaper.jpg"
|
||||
];
|
||||
splash = false;
|
||||
};
|
||||
@@ -183,7 +183,7 @@ in
|
||||
{
|
||||
size = "200, 50";
|
||||
position = "0, -80";
|
||||
monitor = "DP-1";
|
||||
monitor = cfg.primaryDisplay;
|
||||
dots_center = true;
|
||||
fade_on_empty = true;
|
||||
font_color = "rgb(202, 211, 245)";
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ lib, system, ... }:
|
||||
{ lib, system, hasDestopEnvironment, ... }:
|
||||
let
|
||||
isArm = builtins.match "aarch64*" system != null;
|
||||
in
|
||||
{
|
||||
programs.onlyoffice = {
|
||||
enable = lib.mkDefault (!isArm);
|
||||
enable = lib.mkDefault (!isArm && hasDestopEnvironment);
|
||||
settings = {
|
||||
UITheme = "theme-contrast-dark";
|
||||
forcedRtl = false;
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
}:
|
||||
let
|
||||
isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system);
|
||||
hasDestopEnvironment = config.${namespace}.desktop.cosmic.enable || config.${namespace}.desktop.gnome.enable || config.${namespace}.desktop.hyprland.enable;
|
||||
in
|
||||
{
|
||||
|
||||
@@ -47,7 +48,7 @@ in
|
||||
|
||||
# Pass inputs so external modules can access them
|
||||
extraSpecialArgs = {
|
||||
inherit inputs namespace;
|
||||
inherit inputs namespace hasDestopEnvironment;
|
||||
overlays = with inputs; [
|
||||
nix-vscode-extensions.overlays.default
|
||||
];
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{ config, pkgs, lib, namespace, ... }:
|
||||
let
|
||||
hasDestopEnvironment = config.${namespace}.desktop.cosmic.enable || config.${namespace}.desktop.gnome.enable || config.${namespace}.desktop.hyprland.enable;
|
||||
in
|
||||
{
|
||||
programs = {
|
||||
zsh.enable = lib.mkDefault true;
|
||||
@@ -13,7 +16,7 @@
|
||||
};
|
||||
|
||||
nix-ld = {
|
||||
enable = lib.mkDefault true;
|
||||
enable = lib.mkDefault hasDestopEnvironment;
|
||||
libraries = with pkgs; [
|
||||
alsa-lib
|
||||
bash
|
||||
@@ -62,7 +65,7 @@
|
||||
libgbm
|
||||
];
|
||||
};
|
||||
seahorse.enable = lib.mkDefault true;
|
||||
seahorse.enable = lib.mkDefault hasDestopEnvironment;
|
||||
};
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
|
||||
Reference in New Issue
Block a user