added sanddorn config

flake.lock

@@ -1,6 +1,75 @@
 {
   "nodes": {
+    "dvb-source": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648841086,
+        "narHash": "sha256-OzK9r6tyyjawdDzqrDw9CFh0lf8Bn11rJpQl60YCoT8=",
+        "owner": "revol-xut",
+        "repo": "dvbpy",
+        "rev": "66c975f58b9f831ff6044aa65da58c3246938e5e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "revol-xut",
+        "repo": "dvbpy",
+        "type": "github"
+      }
+    },
+    "flask-misaka-source": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1607432564,
+        "narHash": "sha256-RYDD+Bj3+S2isTdccl04zvLjpbalQ5sqb3sYnUy1+bU=",
+        "owner": "singingwolfboy",
+        "repo": "flask-misaka",
+        "rev": "d960e512ac1ea16225d236984fcf130a46bb7b83",
+        "type": "github"
+      },
+      "original": {
+        "owner": "singingwolfboy",
+        "repo": "flask-misaka",
+        "type": "github"
+      }
+    },
+    "fsr-infoscreen": {
+      "inputs": {
+        "dvb-source": "dvb-source",
+        "flask-misaka-source": "flask-misaka-source",
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1649586198,
+        "narHash": "sha256-mG0dlqTwYUw4qJcwK1ByqOb07kM9+1jENe3w6dTf9aU=",
+        "owner": "fsr",
+        "repo": "infoscreen",
+        "rev": "73215980cf5465f660d4237389ca92a33c035f1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fsr",
+        "repo": "infoscreen",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1649490789,
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1646258393,
         "narHash": "sha256-mKDoCi5Baqainjf0Nx6oTPhaxKQdj4P17XTdhTtXGRA=",
@@ -18,7 +87,8 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "fsr-infoscreen": "fsr-infoscreen",
+        "nixpkgs": "nixpkgs_2",
         "sops-nix": "sops-nix"
       }
     },
@@ -41,6 +111,21 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1648297722,
+        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -3,13 +3,43 @@
     nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
     sops-nix.url = github:Mic92/sops-nix;
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+    
+    fsr-infoscreen.url = github:fsr/infoscreen;
   };
-  outputs = { self, nixpkgs, sops-nix, ... }@inputs:  {
+  outputs = { self, nixpkgs, sops-nix, fsr-infoscreen, ... }@inputs:  
-    nixosConfigurations.birne = nixpkgs.lib.nixosSystem {
+  let 
-      system = "x86_64-linux";
+  in {
-      modules = [
+    nixosConfigurations = {
-        ./hosts/birne/configuration.nix
+      birne = nixpkgs.lib.nixosSystem {
-      ];
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/birne/configuration.nix
+
+          ./modules/base.nix
+          ./modules/autoupdate.nix
+          ./modules/desktop.nix
+          ./modules/printing.nix
+          ./modules/wifi.nix
+
+        ];
+      };
+      sanddorn = nixpkgs.lib.nixosSystem {
+        system = "aarch64-linux";
+        modules = [
+          {
+            nixpkgs.overlays = [ fsr-infoscreen.overlay."aarch64-linux"];
+            nixpkgs.config.allowBroken = true;
+            sdImage.compressImage = false;
+          }
+          ./hosts/sanddorn/configuration.nix
+          ./modules/infoscreen.nix
+          ./modules/base.nix
+          ./modules/autoupdate.nix
+          ./modules/wifi.nix
+          ./modules/desktop.nix
+          "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
+        ];
+      };
     };
   };
 }

hosts/birne/configuration.nix

@@ -8,21 +8,12 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-
-      ../../modules/base.nix
-      ../../modules/autoupdate.nix
-      ../../modules/desktop.nix
-      ../../modules/printing.nix
-      ../../modules/wifi.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  # Set your time zone.
-  time.timeZone = "Europe/Busingen";
-  
   networking = {
     hostName = "birne";
     interfaces.wlp4s0.useDHCP = true;
@@ -34,33 +25,13 @@
   };
 
   nixpkgs.config.allowUnfree = true;
-  nix = {
-    package = pkgs.nixUnstable; # or versioned attributes like nix_2_4
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };  
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # sound.enable = true;
-  # hardware.pulseaudio.enable = true;
-
-
    users.users.printer = {
      isNormalUser = true;
      password = "printer";
      extraGroups = [];
    };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    wget
-    git
     firefox
   ];
 

hosts/sanddorn/configuration.nix

@@ -0,0 +1,42 @@
+{ config, lib, pkgs, ... }:
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  boot = {
+    loader = {
+      grub.enable = false;
+      raspberryPi = {
+        enable = true;
+        version = 3;
+        uboot.enable = true;
+      };
+    };
+    kernelPackages = pkgs.linuxPackages_latest;
+    # No ZFS on latest kernel:
+    tmpOnTmpfs = true;
+  };
+
+  networking = {
+    hostName = "sanddorn";
+
+    useDHCP = false;
+    interfaces.eth0.useDHCP = true;
+    interfaces.wlan0.useDHCP = true;
+    firewall.enable = false;
+  };
+
+  # Do not log to flash:
+  services.journald.extraConfig = ''
+    Storage=volatile
+  '';
+
+  security.sudo = {
+    enable = true;
+    wheelNeedsPassword = false;
+  };
+
+  system.stateVersion = "21.11"; 
+}
+

hosts/sanddorn/hardware-configuration.nix

@@ -0,0 +1,48 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  #imports =
+  #  [ (modulesPath + "/installer/scan/not-detected.nix")
+  #  ];
+
+  boot.initrd.availableKernelModules = [ "usbhid" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+  boot.kernelParams = [ "snd_bcm2835.enable_headphones=1" ];
+  boot.blacklistedKernelModules = [ "vc4_hdmi" ];
+
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-label/FIRMWARE";
+      fsType = "vfat";
+    };
+    "/swap" = {
+    	device = "/dev/disk/by-uuid/SWAP";
+    	fsType = "btrfs";
+    	options = [ "subvol=swap" "compress=lzo" "noatime" ]; # Note these options effect the entire BTRFS filesystem and not just this volume, with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
+    };
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+    };
+  };
+ 
+  swapDevices = [{
+	device = "/swap/swapfile";
+	size = (1024 * 2); 
+  }];
+
+  hardware.enableRedistributableFirmware = true;
+  #networking.wireless.enable = true;
+  boot.loader.raspberryPi.firmwareConfig = ''
+    gpu_mem=192
+    dtparam=audio=on
+  '';
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+}
+

modules/base.nix

@@ -1,6 +1,14 @@
 { pkgs, config, ... }:
 
 {
+
+  nix = {
+    package = pkgs.nixUnstable; # or versioned attributes like nix_2_4
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };  
+
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
@@ -32,8 +40,7 @@
     ];
   };
 
-  # allow unfree licenced packges
+  time.timeZone = "Europe/Berlin";
-  # nixpkgs.config.allowUnfree = true;
 
   # basic shell & editor
   programs.fish.enable = true;

modules/infoscreen.nix

@@ -0,0 +1,32 @@
+{ pkgs
+, lib
+, config
+, ...
+}: 
+let
+  fsr-infoscreen = pkgs.fsr-infoscreen;
+
+in {
+
+  systemd = {
+    services."fsr-infoscreen" = {
+      enable = true;
+      wantedBy = [ "multi-user.target" ];
+      script = ''
+        ${pkgs.python39}/bin/python39 ${fsr-infoscreen}/build/middleware/infoscreen.py
+      '';
+
+      serviceConfig = {
+          User = "infoscreen";
+          Restart = "on-failure";
+        };
+      };
+    };
+
+    users.users.infoscreen = {
+      name = "infoscreen";
+      description = "custom user for service infoscreen service";
+      isNormalUser = true;
+    };
+
+}

pkgs/server.nix

@@ -0,0 +1,74 @@
+{ lib
+,pkgs
+#, buildpythonApplication
+#, buildPythonPackage
+, fetchFromGitHub 
+#, fetchPypi
+}:
+let
+
+dvb = pkgs.python39Packages.buildPythonPackage rec {
+  pname = "dvb";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "revol-xut";
+    repo = "dvbpy";
+    rev = "66c975f58b9f831ff6044aa65da58c3246938e5e";
+    sha256 = "sha256-OzK9r6tyyjawdDzqrDw9CFh0lf8Bn11rJpQl60YCoT8=";
+  };
+
+  doCheck = false;
+  propagatedBuildInputs = with pkgs.python39Packages; [ pyproj numpy requests ];
+};
+
+flask-misaka = pkgs.python39Packages.buildPythonPackage rec {
+  pname = "flask-misaka";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "singingwolfboy";
+    repo = "flask-misaka";
+    rev = "d960e512ac1ea16225d236984fcf130a46bb7b83";
+    sha256 = "sha256-RYDD+Bj3+S2isTdccl04zvLjpbalQ5sqb3sYnUy1+bU=";
+  };
+
+  doCheck = false;
+  propagatedBuildInputs = with pkgs.python39Packages; [ flask misaka ];
+};
+
+
+
+in pkgs.python39Packages.buildPythonApplication rec {
+  pname = "fsr-infoscreen";
+  version = "2.1.0";
+
+  src = fetchFromGitHub{
+    owner = "fsr";
+    repo = "infoscreen";
+    rev = "43fb1fdc9dd15ccf40ef28b448ac6cfd51f32bc4";
+    sha256 = "sha256-KVIuL9g5gYC+3o2U7HQRqHQnU02kn7E9P7ZydFc/tyA=";
+  };
+  nativeBuildInputs = with pkgs; [ pkg-config python3Packages.wrapPython ];
+  propagatedBuildInputs = with pkgs.python39Packages; [ flask python-forecastio flask-misaka dvb ];
+  buildInputs = with pkgs.python39Packages; [ flask python-forecastio flask-misaka dvb ];
+  pythonPath = with pkgs.python39Packages; [ flask python-forecastio flask-misaka dvb];
+  
+  installPhase = ''
+    mkdir -p $out/build/middleware
+    install -Dm755 middleware/infoscreen.py $out/build/middleware
+    mkdir -p $out/share/infoscreen
+    wrapPythonPrograms
+  '';
+
+  makeWrapperArgs = [
+    "--prefix PYTHONPATH : $out/share/fsr-infoscreen"
+  ];
+
+  meta = with lib; {
+    description = "A minimal python server which supplies the fsr infoscreen with information.";
+    homepage = "https://github.com/fsr/infoscreen";
+    license = licenses.mit;
+    maintainers = with maintainers; [ revol-xut ];
+  };
+}