From a52133cec45edb324512947eba9df52fa07422d6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 22 Oct 2021 22:58:56 +0200 Subject: [PATCH] wip --- hosts/bemmer/configuration.nix | 43 +++++++++++++++++++ hosts/nuc/configuration.nix | 17 ++++---- nix/sources.json | 20 +++++++-- {hosts/nuc => shared-services}/desktop.nix | 0 {hosts/nuc => shared-services}/mpd.nix | 0 {hosts/nuc => shared-services}/nfs-server.nix | 0 {hosts/nuc => shared-services}/pulseaudio.nix | 0 {hosts/nuc => shared-services}/spotifyd.nix | 0 {hosts/nuc => shared-services}/vnc.nix | 0 {hosts/nuc => shared-services}/webserver.nix | 0 {hosts/nuc => shared-services}/ympd.nix | 0 11 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 hosts/bemmer/configuration.nix rename {hosts/nuc => shared-services}/desktop.nix (100%) rename {hosts/nuc => shared-services}/mpd.nix (100%) rename {hosts/nuc => shared-services}/nfs-server.nix (100%) rename {hosts/nuc => shared-services}/pulseaudio.nix (100%) rename {hosts/nuc => shared-services}/spotifyd.nix (100%) rename {hosts/nuc => shared-services}/vnc.nix (100%) rename {hosts/nuc => shared-services}/webserver.nix (100%) rename {hosts/nuc => shared-services}/ympd.nix (100%) diff --git a/hosts/bemmer/configuration.nix b/hosts/bemmer/configuration.nix new file mode 100644 index 0000000..5524352 --- /dev/null +++ b/hosts/bemmer/configuration.nix @@ -0,0 +1,43 @@ +{ modulesPath, lib, pkgs, ... }: + +{ + imports = [ + (modulesPath + "/installer/sd-card/sd-image-aarch64.nix") + + ../../common + + # services + #../../shared-services/pulseaudio.nix + #../../shared-services/nfs-server.nix + #../../shared-services/mpd.nix + #../../shared-services/ympd.nix + #../../shared-services/spotifyd.nix + #../../shared-services/desktop.nix + #../../shared-services/vnc.nix + #../../shared-services/webserver.nix + ]; + users.users.c3h = { + isNormalUser = true; + password = "c3h"; + extraGroups = [ "wheel" ]; + packages = with pkgs; [ chromium firefox mpv youtube-dl ]; + }; + + networking.hostName = "bemmer"; + networking.domain = "c3h"; + + networking.useDHCP = true; + + nixpkgs.system = "aarch64-linux"; + boot.initrd.availableKernelModules = lib.mkForce [ "vc4" "i2c_bcm2835" ]; + boot.supportedFilesystems = lib.mkForce [ "ext4" "vfat" ]; + boot.kernelPackages = pkgs.linuxPackages_rpi4; + documentation.enable = false; + + hardware.raspberry-pi."4" = { + fkms-3d.enable = true; + audio.enable = true; + }; + + system.stateVersion = "21.05"; +} diff --git a/hosts/nuc/configuration.nix b/hosts/nuc/configuration.nix index 741c50e..47fc3ef 100644 --- a/hosts/nuc/configuration.nix +++ b/hosts/nuc/configuration.nix @@ -3,17 +3,18 @@ { imports = [ ./hardware-configuration.nix + ../../common # services - ./pulseaudio.nix - ./nfs-server.nix - ./mpd.nix - ./ympd.nix - ./spotifyd.nix - ./desktop.nix - ./vnc.nix - ./webserver.nix + ../../shared-services/pulseaudio.nix + ../../shared-services/nfs-server.nix + ../../shared-services/mpd.nix + ../../shared-services/ympd.nix + ../../shared-services/spotifyd.nix + ../../shared-services/desktop.nix + ../../shared-services/vnc.nix + ../../shared-services/webserver.nix ]; networking.hostName = "nuc"; diff --git a/nix/sources.json b/nix/sources.json index d23d445..f739c0f 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -11,16 +11,28 @@ "url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "nixos-hardware": { + "branch": "master", + "description": "A collection of NixOS modules covering hardware quirks.", + "homepage": "", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "3aabf78bfcae62f5f99474f2ebbbe418f1c6e54f", + "sha256": "10g240brgjz7qi20adwajxwqrqb5zxc79ii1mc20fasgqlf2a8sx", + "type": "tarball", + "url": "https://github.com/NixOS/nixos-hardware/archive/3aabf78bfcae62f5f99474f2ebbbe418f1c6e54f.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "nixpkgs": { - "branch": "nixos-21.05", + "branch": "nixos-unstable", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70904d4a9927a4d6e05c72c4aaac4370e05107f3", - "sha256": "08vvir0npyrdx85ypiannwzvyryqdw3749bghffhdsq2dgz1cx8z", + "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", + "sha256": "02li241rz5668nfyp88zfjilxf0mr9yansa93fbl38hjwkhf3ix6", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/70904d4a9927a4d6e05c72c4aaac4370e05107f3.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/34ad3ffe08adfca17fcb4e4a47bb5f3b113687be.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/hosts/nuc/desktop.nix b/shared-services/desktop.nix similarity index 100% rename from hosts/nuc/desktop.nix rename to shared-services/desktop.nix diff --git a/hosts/nuc/mpd.nix b/shared-services/mpd.nix similarity index 100% rename from hosts/nuc/mpd.nix rename to shared-services/mpd.nix diff --git a/hosts/nuc/nfs-server.nix b/shared-services/nfs-server.nix similarity index 100% rename from hosts/nuc/nfs-server.nix rename to shared-services/nfs-server.nix diff --git a/hosts/nuc/pulseaudio.nix b/shared-services/pulseaudio.nix similarity index 100% rename from hosts/nuc/pulseaudio.nix rename to shared-services/pulseaudio.nix diff --git a/hosts/nuc/spotifyd.nix b/shared-services/spotifyd.nix similarity index 100% rename from hosts/nuc/spotifyd.nix rename to shared-services/spotifyd.nix diff --git a/hosts/nuc/vnc.nix b/shared-services/vnc.nix similarity index 100% rename from hosts/nuc/vnc.nix rename to shared-services/vnc.nix diff --git a/hosts/nuc/webserver.nix b/shared-services/webserver.nix similarity index 100% rename from hosts/nuc/webserver.nix rename to shared-services/webserver.nix diff --git a/hosts/nuc/ympd.nix b/shared-services/ympd.nix similarity index 100% rename from hosts/nuc/ympd.nix rename to shared-services/ympd.nix