extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-02-03 19:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: Clean up nix code

Browse Source 
- Added missing `services` prefix to xserver option
- Simplified options in system.nix
- Removed unused `optionals` binding
This commit is contained in:
Donovan Glover 2024-07-18 13:28:05 -04:00
parent 787dda981b
commit 26d01911e4
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/system.nix
View File

@ -1,7 +1,7 @@
{ nix-config, pkgs, lib, config, ... }: { nix-config, pkgs, lib, config, ... }:
let let
inherit (lib) mkOption mkEnableOption mkIf singleton optionals; inherit (lib) mkOption mkEnableOption mkIf singleton;
inherit (lib.types) nullOr str listOf; inherit (lib.types) nullOr str listOf;
inherit (cfg) username iHaveLotsOfRam hashedPassword mullvad allowSRB2Port allowDevPort noRoot postgres; inherit (cfg) username iHaveLotsOfRam hashedPassword mullvad allowSRB2Port allowDevPort noRoot postgres;
inherit (builtins) attrValues; inherit (builtins) attrValues;
@ -44,18 +44,15 @@ in
default = "22.11"; default = "22.11";
}; };
iHaveLotsOfRam = mkEnableOption "tmpfs on /tmp";
hostName = mkOption { hostName = mkOption {
type = str; type = str;
default = "nixos"; default = "nixos";
}; };
iHaveLotsOfRam = mkEnableOption "tmpfs on /tmp";
noRoot = mkEnableOption "disable access to root"; noRoot = mkEnableOption "disable access to root";
mullvad = mkEnableOption "mullvad vpn"; mullvad = mkEnableOption "mullvad vpn";
postgres = mkEnableOption "postgres database for containers"; postgres = mkEnableOption "postgres database for containers";
allowSRB2Port = mkEnableOption "port for srb2"; allowSRB2Port = mkEnableOption "port for srb2";
allowDevPort = mkEnableOption "port for development server"; allowDevPort = mkEnableOption "port for development server";
}; };

2
specializations/phosh.nix
View File

@ -14,7 +14,7 @@ in
i18n.inputMethod.enable = mkForce false; i18n.inputMethod.enable = mkForce false;
services.greetd.enable = mkForce false; services.greetd.enable = mkForce false;
xserver = { services.xserver = {
displayManager.lightdm.enable = false; displayManager.lightdm.enable = false;
desktopManager.phosh = { desktopManager.phosh = {