Add experimental nomachine

flake.lock

@@ -133,6 +133,32 @@
         "type": "github"
       }
     },
+    "nil": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1668625881,
+        "narHash": "sha256-cWPlB/gqR30BWKRaeQoToL7vCxTFZNNz1lt0M/fj+ds=",
+        "owner": "oxalica",
+        "repo": "nil",
+        "rev": "bea40f71fc2b918ad6cf2154bcc12521ac664dc2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "nil",
+        "type": "github"
+      }
+    },
     "nixlib": {
       "locked": {
         "lastModified": 1636849918,
@@ -274,6 +300,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "naersk": "naersk",
+        "nil": "nil",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",

flake.nix

@@ -51,6 +51,17 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nil = {
+      url = "github:oxalica/nil";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.rust-overlay.follows = "rust-overlay";
+    };
+
+    nomachine = {
+      url = "github:rytec-nl/nixpkgs/submit/add-nomachine-server";
+    };
+
     ha-now-playing = {
       url = "git+https://git.datarift.nl/erwin/ha-now-playing.git?ref=main";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -95,20 +106,31 @@
                   ++ [
                     {
                       nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
-                      nixpkgs = {
+                      nixpkgs =
-                        overlays = [
+                        let
-                          self.overlays.default
+                          nomachine-pkgs = import inputs.nomachine {
-                          ha-now-playing.overlays.${system}
+                            inherit system;
-                          pamedia.overlays.${system}
+                            config.allowUnfree = true;
-                          inputs.emacs-overlay.overlay
+                          };
-                        ] ++ nixpkgs.lib.optional (system == "aarch64-linux")
+                        in
-                          (_final: super: {
+                        {
-                            makeModulesClosure = x:
+                          overlays = [
-                              super.makeModulesClosure (x // { allowMissing = true; });
+                            self.overlays.default
-                          });
+                            ha-now-playing.overlays.${system}
+                            pamedia.overlays.${system}
+                            inputs.emacs-overlay.overlay
+                            inputs.nil.overlays.default
+                            (_final: _prev: {
+                              nomachine = nomachine-pkgs.nomachine;
+                            })
+                          ] ++ nixpkgs.lib.optional (system == "aarch64-linux")
+                            (_final: super: {
+                              makeModulesClosure = x:
+                                super.makeModulesClosure (x // { allowMissing = true; });
+                            });
 
-                        config.allowUnfree = true;
+                          config.allowUnfree = true;
-                      };
+                        };
                     }
 
                     baseConfig

machines/mimir/configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ nixos-hardware, ... }:
+{ nixos-hardware, nomachine, ... }:
 { pkgs, ... }:
 {
   imports =
@@ -11,6 +11,7 @@
       nixos-hardware.nixosModules.common-cpu-amd
       nixos-hardware.nixosModules.common-cpu-amd-pstate
       nixos-hardware.nixosModules.common-pc-ssd
+      "${nomachine}/nixos/modules/services/admin/nomachine.nix"
 
       ./hardware-configuration.nix
 
@@ -120,6 +121,10 @@
     };
   };
 
+  services.nxserver = {
+    enable = true;
+  };
+
   # sops = {
   #   defaultSopsFile = ./secrets.yaml;