dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2025-08-07 05:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplication in machine configuration

Browse Source
This commit is contained in:
Dave Gallant
2021-04-24 12:33:05 -04:00
parent 261df9ab09
commit 615ecfaf39
4 changed files with 38 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@@ -12,6 +12,7 @@
nixosConfigurations = let nixosConfigurations = let
defaultModules = [ defaultModules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
./main/configuration.nix
./main/fonts.nix ./main/fonts.nix
./main/general.nix ./main/general.nix
./main/kernel.nix ./main/kernel.nix

37
machines/hephaestus/configuration.nix
View File

@@ -15,13 +15,6 @@
networking.useDHCP = false; networking.useDHCP = false;
networking.interfaces.enp34s0.useDHCP = true; networking.interfaces.enp34s0.useDHCP = true;
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "us";
};
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
# Evolution # Evolution
@@ -31,35 +24,5 @@
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = true;
programs.seahorse.enable = true; programs.seahorse.enable = true;
# Enable the GNOME 3 Desktop Environment.
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true;
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound.
sound.enable = true;
# Enable 32bit for steam
hardware.pulseaudio.enable = true;
hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
hardware.pulseaudio.support32Bit = true;
virtualisation.docker.enable = true;
# Virtualization
virtualisation.libvirtd.enable = true;
systemd.services.libvirtd.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
# Open ports in the firewall.
networking.firewall.enable = true;
} }

34
machines/hermes/configuration.nix
View File

@@ -15,39 +15,5 @@
networking.useDHCP = false; networking.useDHCP = false;
networking.interfaces.wlp61s0.useDHCP = true; networking.interfaces.wlp61s0.useDHCP = true;
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "us";
};
# Enable the GNOME 3 Desktop Environment.
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true;
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound.
sound.enable = true;
# Enable 32bit for steam
hardware.pulseaudio.enable = true;
hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
hardware.pulseaudio.support32Bit = true;
virtualisation.docker.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
# Open ports in the firewall.
networking.firewall.enable = true;
} }

37
main/configuration.nix Normal file
View File

@@ -0,0 +1,37 @@
{ config, pkgs, ... }:
{
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "us";
};
# Enable the GNOME 3 Desktop Environment.
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true;
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound.
sound.enable = true;
# Enable 32bit for steam
hardware.pulseaudio.enable = true;
hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
hardware.pulseaudio.support32Bit = true;
virtualisation.docker.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
}