This commit is contained in:
parent
e0b1be56a2
commit
a1c6b056e0
@ -1,7 +1,5 @@
|
|||||||
{ lib, config, pkgs, ... }:
|
{ lib, config, pkgs, ... }: {
|
||||||
let cfg = config.syscfg.make.gui;
|
config = lib.mkIf (config.syscfg.make.gui) {
|
||||||
in {
|
|
||||||
config = lib.mkIf cfg {
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
videoDrivers = [ "amd" ];
|
videoDrivers = [ "amd" ];
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
hardware.bluetooth.enable = true;
|
config = lib.mkIf (config.syscfg.net.ble.enable) {
|
||||||
services.blueman.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
environment.systemPackages = with pkgs; [ bluez bluez-tools ];
|
services.blueman.enable = true;
|
||||||
|
environment.systemPackages = with pkgs; [ bluez bluez-tools ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,60 +1,61 @@
|
|||||||
{ config, lib, pkgs, ... }: {
|
{ config, lib, pkgs, ... }: {
|
||||||
|
config = lib.mkIf (config.syscfg.make.gui) {
|
||||||
|
xdg.portal = {
|
||||||
|
enable = true;
|
||||||
|
# wlr.enable = true;
|
||||||
|
extraPortals = with pkgs; [
|
||||||
|
xdg-desktop-portal-hyprland
|
||||||
|
xdg-desktop-portal-gtk
|
||||||
|
];
|
||||||
|
config.common.default = [ "hyprland" "gtk" ];
|
||||||
|
};
|
||||||
|
|
||||||
xdg.portal = {
|
environment.sessionVariables = rec {
|
||||||
enable = true;
|
GBM_BACKEND = "amd-drm";
|
||||||
# wlr.enable = true;
|
__GL_GSYNC_ALLOWED = "0";
|
||||||
extraPortals = with pkgs; [
|
__GL_VRR_ALLOWED = "1";
|
||||||
xdg-desktop-portal-hyprland
|
WLR_DRM_NO_ATOMIC = "1";
|
||||||
xdg-desktop-portal-gtk
|
__GLX_VENDOR_LIBRARY_NAME = "amd";
|
||||||
];
|
_JAVA_AWT_WM_NONREPARENTING = "1";
|
||||||
config.common.default = [ "hyprland" "gtk" ];
|
QT_QPA_PLATFORM = "wayland";
|
||||||
|
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
|
||||||
|
GDK_BACKEND = "wayland";
|
||||||
|
WLR_NO_HARDWARE_CURSORS = "1";
|
||||||
|
MOZ_ENABLE_WAYLAND = "1";
|
||||||
|
WLR_BACKEND = "vulkan";
|
||||||
|
WLR_RENDERER = "vulkan";
|
||||||
|
XCURSOR_SIZE = "24";
|
||||||
|
NIXOS_OZONE_WL = "1";
|
||||||
|
PATH = [ "$HOME/.local/bin/:$PATH" ];
|
||||||
|
XDG_CACHE_HOME = "$HOME/.cache";
|
||||||
|
XDG_CONFIG_HOME = "$HOME/.config";
|
||||||
|
XDG_DATA_HOME = "$HOME/.local/share";
|
||||||
|
XDG_STATE_HOME = "$HOME/.local/state";
|
||||||
|
XDG_BIN_HOME = "$HOME/.local/bin";
|
||||||
|
XDG_DESKTOP_DIR = "$HOME/desktop";
|
||||||
|
XDG_DOCUMENTS_DIR = "$HOME/files";
|
||||||
|
XDG_DOWNLOAD_DIR = "$HOME/download";
|
||||||
|
XDG_MUSIC_DIR = "$HOME/media/music";
|
||||||
|
XDG_PICTURES_DIR = "$HOME/media/photo";
|
||||||
|
XDG_PUBLICSHARE_DIR = "$HOME/pub";
|
||||||
|
XDG_TEMPLATES_DIR = "$HOME/media/templates";
|
||||||
|
XDG_VIDEOS_DIR = "$HOME/media/video";
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.etc."xdg/user-dirs.defaults".text = ''
|
||||||
|
XDG_CACHE_HOME="$HOME/.cache"
|
||||||
|
XDG_CONFIG_HOME="$HOME/.config"
|
||||||
|
XDG_DATA_HOME="$HOME/.local/share"
|
||||||
|
XDG_STATE_HOME="$HOME/.local/state"
|
||||||
|
XDG_BIN_HOME="$HOME/.local/bin"
|
||||||
|
XDG_DESKTOP_DIR="$HOME/desktop"
|
||||||
|
XDG_DOCUMENTS_DIR="$HOME/files"
|
||||||
|
XDG_DOWNLOAD_DIR="$HOME/download"
|
||||||
|
XDG_MUSIC_DIR="$HOME/media/music"
|
||||||
|
XDG_PICTURES_DIR="$HOME/media/photo"
|
||||||
|
XDG_PUBLICSHARE_DIR="$HOME/pub"
|
||||||
|
XDG_TEMPLATES_DIR="$HOME/media/templates"
|
||||||
|
XDG_VIDEOS_DIR="$HOME/media/video"
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.sessionVariables = rec {
|
|
||||||
GBM_BACKEND = "amd-drm";
|
|
||||||
__GL_GSYNC_ALLOWED = "0";
|
|
||||||
__GL_VRR_ALLOWED = "1";
|
|
||||||
WLR_DRM_NO_ATOMIC = "1";
|
|
||||||
__GLX_VENDOR_LIBRARY_NAME = "amd";
|
|
||||||
_JAVA_AWT_WM_NONREPARENTING = "1";
|
|
||||||
QT_QPA_PLATFORM = "wayland";
|
|
||||||
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
|
|
||||||
GDK_BACKEND = "wayland";
|
|
||||||
WLR_NO_HARDWARE_CURSORS = "1";
|
|
||||||
MOZ_ENABLE_WAYLAND = "1";
|
|
||||||
WLR_BACKEND = "vulkan";
|
|
||||||
WLR_RENDERER = "vulkan";
|
|
||||||
XCURSOR_SIZE = "24";
|
|
||||||
NIXOS_OZONE_WL = "1";
|
|
||||||
PATH = [ "$HOME/.local/bin/:$PATH" ];
|
|
||||||
XDG_CACHE_HOME = "$HOME/.cache";
|
|
||||||
XDG_CONFIG_HOME = "$HOME/.config";
|
|
||||||
XDG_DATA_HOME = "$HOME/.local/share";
|
|
||||||
XDG_STATE_HOME = "$HOME/.local/state";
|
|
||||||
XDG_BIN_HOME = "$HOME/.local/bin";
|
|
||||||
XDG_DESKTOP_DIR = "$HOME/desktop";
|
|
||||||
XDG_DOCUMENTS_DIR = "$HOME/files";
|
|
||||||
XDG_DOWNLOAD_DIR = "$HOME/download";
|
|
||||||
XDG_MUSIC_DIR = "$HOME/media/music";
|
|
||||||
XDG_PICTURES_DIR = "$HOME/media/photo";
|
|
||||||
XDG_PUBLICSHARE_DIR = "$HOME/pub";
|
|
||||||
XDG_TEMPLATES_DIR = "$HOME/media/templates";
|
|
||||||
XDG_VIDEOS_DIR = "$HOME/media/video";
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.etc."xdg/user-dirs.defaults".text = ''
|
|
||||||
XDG_CACHE_HOME="$HOME/.cache"
|
|
||||||
XDG_CONFIG_HOME="$HOME/.config"
|
|
||||||
XDG_DATA_HOME="$HOME/.local/share"
|
|
||||||
XDG_STATE_HOME="$HOME/.local/state"
|
|
||||||
XDG_BIN_HOME="$HOME/.local/bin"
|
|
||||||
XDG_DESKTOP_DIR="$HOME/desktop"
|
|
||||||
XDG_DOCUMENTS_DIR="$HOME/files"
|
|
||||||
XDG_DOWNLOAD_DIR="$HOME/download"
|
|
||||||
XDG_MUSIC_DIR="$HOME/media/music"
|
|
||||||
XDG_PICTURES_DIR="$HOME/media/photo"
|
|
||||||
XDG_PUBLICSHARE_DIR="$HOME/pub"
|
|
||||||
XDG_TEMPLATES_DIR="$HOME/media/templates"
|
|
||||||
XDG_VIDEOS_DIR="$HOME/media/video"
|
|
||||||
'';
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
virtualisation.arion.projects.
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:{
|
{ pkgs, ... }: {
|
||||||
project.name = "Authentik";
|
project.name = "Authentik";
|
||||||
|
|
||||||
networks = {
|
networks = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:{
|
{ pkgs, ... }: {
|
||||||
project.name = "Cloud";
|
project.name = "Cloud";
|
||||||
|
|
||||||
networks = {
|
networks = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:{
|
{ pkgs, ... }: {
|
||||||
project.name = "NEW";
|
project.name = "NEW";
|
||||||
|
|
||||||
networks = {
|
networks = {
|
||||||
|
@ -13,6 +13,12 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
netOpt = with lib; {
|
netOpt = with lib; {
|
||||||
|
ble = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
wlp = {
|
wlp = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
@ -65,16 +71,28 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
serverOpt = with lib; {
|
serverOpt = with lib; {
|
||||||
hostDomain = mkOption {type = types.str;};
|
hostDomain = mkOption { type = types.str; };
|
||||||
mailDomain = mkOption {type = types.str;};
|
mailDomain = mkOption { type = types.str; };
|
||||||
mailServer = mkOption {type = types.str;};
|
mailServer = mkOption { type = types.str; };
|
||||||
|
|
||||||
dbHost = mkOption {type = types.str; default = "localhost";};
|
dbHost = mkOption {
|
||||||
dbPort = mkOption {type = types.str; default = "3306";};
|
type = types.str;
|
||||||
|
default = "localhost";
|
||||||
|
};
|
||||||
|
dbPort = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "3306";
|
||||||
|
};
|
||||||
|
|
||||||
|
configPath = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "/media/config";
|
||||||
|
};
|
||||||
|
dataPath = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "/media/data";
|
||||||
|
};
|
||||||
|
|
||||||
configPath = mkOption {type=types.str; default= "/media/config";};
|
|
||||||
dataPath = mkOption {type=types.str; default= "/media/data";};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
in with lib; {
|
in with lib; {
|
||||||
options.usercfg = userOpt;
|
options.usercfg = userOpt;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user