move a bunch of stuff to common/configuration.nix
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Sijmen 2022-08-05 15:59:38 +02:00
parent 72b7c3e6d5
commit 23745ff4ee
2 changed files with 120 additions and 108 deletions

View file

@ -4,4 +4,122 @@
imports = [
./home-manager.nix
];
nixpkgs.config.allowUnfree = true;
sound.enable = true;
hardware.pulseaudio.enable = true;
time.timeZone = "Europe/Amsterdam";
boot = {
loader.timeout = 0;
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [
"quiet"
"splash"
"vga=current"
"udev.log_level=3"
];
initrd.verbose = false;
consoleLogLevel = 0;
plymouth.enable = true;
};
console = {
earlySetup = true;
font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
packages = with pkgs; [ terminus_font ];
keyMap = "us";
};
virtualisation = {
libvirtd.enable = true;
docker.enable = true;
};
i18n = {
defaultLocale = "en_US.UTF-8";
supportedLocales = [
"en_US.UTF-8/UTF-8"
"nl_NL.UTF-8/UTF-8"
];
};
users.users.sijmen = {
isNormalUser = true;
extraGroups = [ "wheel" "libvirtd" ];
};
environment = {
gnome.excludePackages = (with pkgs; [
gnome-photos
gnome-tour
]) ++ (with pkgs.gnome; [
gnome-calendar
gnome-music
epiphany # web browser
geary # email reader
totem # video player
tali # poker game
iagno # go game
hitori # sudoku game
atomix # puzzle game
]);
systemPackages = with pkgs; [
gnome.adwaita-icon-theme
ifuse
libimobiledevice
libheif
];
};
services = {
pipewire.enable = true;
printing.enable = true;
throttled.enable = true;
gvfs.enable = true;
usbmuxd.enable = true;
xserver = {
enable = true;
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
};
openssh = {
enable = true;
passwordAuthentication = false;
};
syncthing = {
enable = true;
user = "sijmen";
dataDir = config.users.users.sijmen.home;
overrideFolders = true;
folders = {
"vhuse-qjbcl" = {
path = "${config.users.users.sijmen.home}/Sync";
devices = [ "nas" "desktop-fedora" ];
};
};
};
};
fonts.fonts = with pkgs; [
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
nerdfonts
];
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
};
}

View file

@ -6,18 +6,10 @@
../common/configuration.nix
];
nixpkgs.config.allowUnfree = true;
sound.enable = true;
time.timeZone = "Europe/Amsterdam";
virtualisation = {
libvirtd.enable = true;
docker.enable = true;
};
hardware.bluetooth.enable = true;
boot = {
loader = {
timeout = 0;
efi.canTouchEfiVariables = true;
systemd-boot = {
@ -26,7 +18,6 @@
};
};
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [
"quiet"
"splash"
@ -35,21 +26,7 @@
"udev.log_level=3"
];
initrd = {
verbose = false;
kernelModules = [ "i915" ];
};
consoleLogLevel = 0;
plymouth.enable = true;
};
console = {
earlySetup = true;
font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
packages = with pkgs; [ terminus_font ];
keyMap = "us";
initrd.verbose = false;
};
networking = {
@ -70,99 +47,16 @@
};
};
hardware = {
pulseaudio.enable = true;
bluetooth.enable = true;
};
i18n = {
defaultLocale = "en_US.UTF-8";
supportedLocales = [
"en_US.UTF-8/UTF-8"
"nl_NL.UTF-8/UTF-8"
];
};
users.users.sijmen = {
isNormalUser = true;
extraGroups = [ "wheel" "libvirtd" ];
};
environment = {
gnome.excludePackages = (with pkgs; [
gnome-photos
gnome-tour
]) ++ (with pkgs.gnome; [
gnome-calendar
gnome-music
epiphany # web browser
geary # email reader
totem # video player
tali # poker game
iagno # go game
hitori # sudoku game
atomix # puzzle game
]);
systemPackages = with pkgs; [
gnome.adwaita-icon-theme
ifuse
libimobiledevice
libheif
];
};
services = {
pipewire.enable = true;
printing.enable = true;
throttled.enable = true;
gvfs.enable = true;
usbmuxd.enable = true;
xserver = {
enable = true;
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
};
openssh = {
enable = true;
passwordAuthentication = false;
};
syncthing = {
enable = true;
user = "sijmen";
dataDir = config.users.users.sijmen.home;
overrideDevices = true;
overrideFolders = true;
devices = {
nas.id = "5XADATO-6ZKNZFK-YIX2TU3-RTUOAXR-OMWOAH6-OIUB7LE-TWM5B3C-W2I2FQU";
desktop-fedora.id = "RE3BCEP-2FVDNPA-C72KDCX-5NRTLD4-DEJZAIX-PJAMJAN-LJDFHOY-WOXNPQW";
};
folders = {
"vhuse-qjbcl" = {
path = "${config.users.users.sijmen.home}/Sync";
devices = [ "nas" "desktop-fedora" ];
};
};
};
};
fonts.fonts = with pkgs; [
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
nerdfonts
];
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
};
system.stateVersion = "22.05";
}