jan-leila/nix-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

added enables to modules and made base module that imports all other modules

Browse source
This commit is contained in:
Leyla Becker 2024-11-24 14:17:32 -06:00
parent eaa19be741
commit bf0686a14b
7 changed files with 79 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
enviroments/common/default.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: {
{...}: {
imports = [];
nix = {

5
hosts/defiant/configuration.nix
View file

@ -8,10 +8,7 @@
inputs.disko.nixosModules.disko
../../enviroments/server
../../modules/hardware.nix
../../modules/users.nix
../../modules/desktop.nix
../../modules/nix-development.nix
../../modules
];
nixpkgs.config.allowUnfree = true;

5
hosts/horizon/configuration.nix
View file

@ -3,10 +3,7 @@
inputs.nixos-hardware.nixosModules.framework-11th-gen-intel
../../enviroments/client
../../modules/hardware.nix
../../modules/users.nix
../../modules/desktop.nix
../../modules/nix-development.nix
../../modules
];
nixpkgs.config.allowUnfree = true;

5
hosts/twilight/configuration.nix
View file

@ -2,10 +2,7 @@
imports = [
../../enviroments/client
../../modules/hardware.nix
../../modules/users.nix
../../modules/desktop.nix
../../modules/nix-development.nix
../../modules
];
nixpkgs.config.allowUnfree = true;

8
modules/default.nix Normal file
View file

@ -0,0 +1,8 @@
{...}: {
imports = [
./hardware.nix
./users.nix
./desktop.nix
./nix-development.nix
];
}

84
modules/desktop.nix
View file

@ -1,41 +1,55 @@
{pkgs, ...}: {
services = {
# Enable CUPS to print documents.
printing.enable = true;
{
lib,
pkgs,
config,
...
}: {
options.host.desktop.enable = lib.mkEnableOption "should desktop configuration be enabled";
xserver = {
# Enable the X11 windowing system.
enable = true;
config = lib.mkMerge [
{
host.desktop.enable = lib.mkDefault true;
}
(lib.mkIf config.host.desktop.enable {
services = {
# Enable CUPS to print documents.
printing.enable = true;
# Enable the GNOME Desktop Environment.
displayManager.gdm.enable = true;
desktopManager = {
gnome.enable = true;
xserver = {
# Enable the X11 windowing system.
enable = true;
# Enable the GNOME Desktop Environment.
displayManager.gdm.enable = true;
desktopManager = {
gnome.enable = true;
};
# Get rid of xTerm
desktopManager.xterm.enable = false;
excludePackages = [pkgs.xterm];
};
pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
};
# Get rid of xTerm
desktopManager.xterm.enable = false;
excludePackages = [pkgs.xterm];
};
# Enable sound with pipewire.
hardware.pulseaudio.enable = false;
pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
};
# Enable sound with pipewire.
hardware.pulseaudio.enable = false;
# enable RealtimeKit for pulse audio
security.rtkit.enable = true;
# enable RealtimeKit for pulse audio
security.rtkit.enable = true;
})
];
}

25
modules/nix-development.nix
View file

@ -1,14 +1,25 @@
{
inputs,
lib,
config,
pkgs,
inputs,
...
}: {
nix = {
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
};
options.host.nix-development.enable = lib.mkEnableOption "should desktop configuration be enabled";
environment.systemPackages = with pkgs; [
# nix langauge server
nixd
config = lib.mkMerge [
{
host.nix-development.enable = lib.mkDefault true;
}
(lib.mkIf config.host.nix-development.enable {
nix = {
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
};
environment.systemPackages = with pkgs; [
# nix langauge server
nixd
];
})
];
}