Slightly refactor, add ntp config

This commit is contained in:
Ivan Bushchik 2023-07-17 07:54:37 +03:00
parent 3793724043
commit be62f52f17
No known key found for this signature in database
GPG key ID: 9F6DDABE11A2674D
6 changed files with 36 additions and 11 deletions

View file

@ -24,14 +24,17 @@
git
curl
usbutils
usbmuxd
pciutils
coreutils-full
killall
];
networking.networkmanager.enable = true;
networking.nameservers = [ "1.1.1.1" "1.0.0.1" "8.8.8.8" ];
services.timesyncd.enable = true;
networking.timeServers = [ "ntp1.vniiftri.ru" "0.ru.pool.ntp.org" "0.pool.ntp.org" ];
i18n.defaultLocale = "ru_RU.UTF-8";
console = {
font = "${pkgs.terminus_font}/share/consolefonts/ter-u16b.psf.gz";

View file

@ -12,15 +12,15 @@
outputs = { self, nixpkgs, ... }@inputs: {
# Stella = Unchartevice 6540 (Ryzen 3 3250U, 16GB RAM)
nixosConfigurations."stella" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./common/base.nix
./common/laptop.nix
./common/user.nix
./common/graphical.nix
./common/gaming.nix
./roles/laptop.nix
./roles/graphical.nix
./roles/gaming.nix
./machines/stella/configuration.nix
./machines/stella/hardware.nix
];
@ -28,20 +28,39 @@
/* These machines will be configured later. */
/*
# Celerrime = MacBook Air M2
nixosConfigurations."celerrime" = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
./common/base.nix
./common/user.nix
./roles/laptop.nix
./roles/graphical.nix
./machines/celerrime/configuration.nix
./user.nix
./graphical.nix
./machines/celerrime/hardware.nix
];
};
# Effundam = MacBook Air M1 (server usage). Will not be added to flake.nix until thunderbolt and apfs proper support
nixosConfigurations."effundam" = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
./common/base.nix
./common/user.nix
./roles/laptop.nix
./machines/effundam/configuration.nix
./machines/effundam/hardware.nix
];
};
# Vetus = iMac 27" 2017, i5, 64 GB RAM
nixosConfigurations."vetus" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./common/base.nix
./common/user.nix
./roles/graphical.nix
./roles/gaming.nix
./machines/vetus/configuration.nix
./
./machines/vetus/hardware.nix
];
};
*/

View file

@ -1 +0,0 @@
Random Ryzen 3 3250U laptop

View file

@ -2,9 +2,11 @@
{
nixpkgs.config.allowUnfree = true;
hardware.opengl.driSupport32Bit = true;
services.pipewire.alsa.support32Bit = true;
environment.systemPackages = with pkgs; [
steam
wineWowPackages.stable
wineWowPackages.stable
wine
(wine.override { wineBuild = "wine64"; })
wineWowPackages.staging

View file

@ -5,10 +5,12 @@
firefox
alacritty
pavucontrol
bottom
mpv
glib
ffmpeg
cinnamon.mint-y-icons
usbmuxd
];
services.fwupd.enable = true;
services.greetd = {