From 69cb32282f4c7adf89232304bd315195a6edda1d Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Tue, 26 Mar 2024 14:42:36 +0000 Subject: [PATCH] #2 adding basic configs still some missing --- modules/nixos/apps/discord/default.nix | 16 +++++++++++ .../nixos/submodules/basics/.default.nix.swp | Bin 0 -> 12288 bytes modules/nixos/submodules/basics/default.nix | 18 ++++++------- modules/nixos/submodules/games/default.nix | 15 +++++++++++ .../graphical-interface/default.nix | 14 ++++++++++ modules/nixos/submodules/socials/default.nix | 14 ++++++++++ .../nixos/system/hardware/audio/default.nix | 25 ++++++++++++++++++ .../system/hardware/networking/default.nix | 17 ++++++++++++ systems/x86_64-linux/workvm/default.nix | 5 +++- 9 files changed, 114 insertions(+), 10 deletions(-) create mode 100644 modules/nixos/apps/discord/default.nix create mode 100644 modules/nixos/submodules/basics/.default.nix.swp create mode 100644 modules/nixos/submodules/games/default.nix create mode 100644 modules/nixos/submodules/graphical-interface/default.nix create mode 100644 modules/nixos/submodules/socials/default.nix create mode 100644 modules/nixos/system/hardware/audio/default.nix create mode 100644 modules/nixos/system/hardware/networking/default.nix diff --git a/modules/nixos/apps/discord/default.nix b/modules/nixos/apps/discord/default.nix new file mode 100644 index 0000000..45e0a5d --- /dev/null +++ b/modules/nixos/apps/discord/default.nix @@ -0,0 +1,16 @@ +{ options, config, lib, pkgs, ... }: +with lib; +with lib.wyrdgard; let + cfg = config.wyrdgard.apps.discord; +in +{ + options.wyrdgard.apps.discord = with types; { + enable = mkBoolOpt false "Whether or not to enable basic configuration"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + discord + ]; + }; +} diff --git a/modules/nixos/submodules/basics/.default.nix.swp b/modules/nixos/submodules/basics/.default.nix.swp new file mode 100644 index 0000000000000000000000000000000000000000..5a44cc383b5f83ab9c85b144578b393e59367477 GIT binary patch literal 12288 zcmYc?2=nw+u+%ePU|?VnU|QBR?l66C{Bjm**E{m*wJD1Cp(S z7^tt8l3$XRnUh+qpPQdj3ZnBeEAor=i%XMW0!fL*naRcaDXD3Rr8y;fd6^X;14i*^ z2#kgRc_C0*lBR3H%V2C|2+r!tN{R}?LZRfDHL7bg1V%$(Gz3ONU^E0qLtr!nMnhmU z1V%$(NQOX30V6{_0|NsS)b%=0nh}kLa!0Ar5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C z(GVC7fzc2c4S^vT0*NUM4Cy=!4Enr~`F~jd{~JF8!&`m^hUfeY3=jAj7;f=1FkI(n zU^vUqz_5*y0;ALRw=Vf3h36Nd`8_#L|?^d`yXq#G;h)#3GQ(v09i}p_`L} zsZBv4Jrj%LOY-w`Kz@ZAm6ut8uDQIjC?!3y2xKT!S*$h0tEqWqnML_|xv6<2dXQiU zNKDR7Oiu+F8O@-eker{FmI?BDZnkHdLULNV9wdGsVFis$sF1BfZnjf?evW@Zi9%Xp zPI0P&Qg}vcNk(dsLVl4#UVe!}Nj@}s6~If>p{AD>C6;97=jkbd;yk|q#4gr@xmgdf zu3ZnT3FNZ!%#sX+lFEYAVrzwJhH8e)Jdjh{;q2C(j&%p|xXYlWQD61cE6 lL#-8qj)I<^9)pfTL3VmEgN{N@W)g!A)VU1R3Q$Kf005}?7)$^F literal 0 HcmV?d00001 diff --git a/modules/nixos/submodules/basics/default.nix b/modules/nixos/submodules/basics/default.nix index ccfaad4..4ecaa4a 100644 --- a/modules/nixos/submodules/basics/default.nix +++ b/modules/nixos/submodules/basics/default.nix @@ -1,14 +1,14 @@ -{ - options, - config, - lib, - pkgs, - ... +{ options +, config +, lib +, pkgs +, ... }: with lib; with lib.wyrdgard; let - cfg = config.wyrdgard.suites.common; -in { + cfg = config.wyrdgard.submodules.basics; +in +{ options.wyrdgard.submodules.basics = with types; { enable = mkBoolOpt false "Whether or not to enable basic configuration."; }; @@ -26,7 +26,7 @@ in { nix-ld = enabled; }; - system.hardware = { + hardware = { audio = enabled; bluetooth = enabled; networking = enabled; diff --git a/modules/nixos/submodules/games/default.nix b/modules/nixos/submodules/games/default.nix new file mode 100644 index 0000000..e7d0f31 --- /dev/null +++ b/modules/nixos/submodules/games/default.nix @@ -0,0 +1,15 @@ +{ options, config, lib, pkgs, ... }: + +with lib; +with lib.wyrdgard; + +let cfg = config.wyrdgard.submodules.games; +in +{ + options.wyrdgard.submodules.games = with types; { + enable = mkBoolOpt false "Whether or not you want to enable non steam games such as minecraft"; + }; + + config = mkIf cfg.enable { }; + +} diff --git a/modules/nixos/submodules/graphical-interface/default.nix b/modules/nixos/submodules/graphical-interface/default.nix new file mode 100644 index 0000000..cd838eb --- /dev/null +++ b/modules/nixos/submodules/graphical-interface/default.nix @@ -0,0 +1,14 @@ +{ options, config, lib, pkgs, ... }: + +with lib; +with lib.wyrdgard; +let + cfg = config.wyrdgard.submodules.graphical-interface; +in +{ + options.wyrdgard.submodules.graphical-interface = with types; { + enable = mkBoolOpt false "Whether to enable a graphical interface"; + }; + + +} diff --git a/modules/nixos/submodules/socials/default.nix b/modules/nixos/submodules/socials/default.nix new file mode 100644 index 0000000..6def030 --- /dev/null +++ b/modules/nixos/submodules/socials/default.nix @@ -0,0 +1,14 @@ +{ options, config, lib, pkgs, ... }: + +with lib; +with lib.wyrdgard; +let + cfg = config.wyrdgard.submodules.socials; +in +{ + options.wyrdgard.submodules.socials = with types; { + enable = mkBoolOpt false "Whether to enable a social apps"; + }; + + +} diff --git a/modules/nixos/system/hardware/audio/default.nix b/modules/nixos/system/hardware/audio/default.nix new file mode 100644 index 0000000..4db4d7c --- /dev/null +++ b/modules/nixos/system/hardware/audio/default.nix @@ -0,0 +1,25 @@ +{ options, config, lib, pkgs, ... }: +with lib; +with lib.wyrdgard; +let + cfg = config.wyrdgard.system.hardware.audio; +in +{ + options.wyrdgard.system.hardware.audio = with types; { + enable = mkBoolOpt false "Whether or not to enable audio"; + }; + + config = mkIf cfg.enable { + + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32bit = true; + pulse.enable = true; + }; + }; +} diff --git a/modules/nixos/system/hardware/networking/default.nix b/modules/nixos/system/hardware/networking/default.nix new file mode 100644 index 0000000..875a80c --- /dev/null +++ b/modules/nixos/system/hardware/networking/default.nix @@ -0,0 +1,17 @@ +{ options, config, lib, pkgs, ... }: + +with lib; +with lib.wyrdgard; +let + cfg = config.wyrdgard.system.hardware.networking; +in +{ + options.wyrdgard.system.hardware.networking = with types; { + enable = mkBoolOpt false "Whether or not to enable networking"; + }; + + config = mkIf cfg.enable { + + networking.networkmanager.enable = true; + }; +} diff --git a/systems/x86_64-linux/workvm/default.nix b/systems/x86_64-linux/workvm/default.nix index 046f69d..13aa1d6 100644 --- a/systems/x86_64-linux/workvm/default.nix +++ b/systems/x86_64-linux/workvm/default.nix @@ -37,7 +37,10 @@ services.xserver = { enable = true; - displayManager.sddm.enable = true; + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; desktopManager.plasma5.enable = true; layout = "us"; xkbVariant = "";