Add experimental nomachine

This commit is contained in:
Erwin Boskma 2022-11-22 17:33:35 +01:00
parent 8637b08182
commit 9b931d24ec
Signed by: erwin
SSH key fingerprint: SHA256:CyeNoWXd3kjX2Nwu6pDxxdS7OqmPVOy0NavA/KU/ntU
3 changed files with 68 additions and 14 deletions

View file

@ -133,6 +133,32 @@
"type": "github" "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": { "nixlib": {
"locked": { "locked": {
"lastModified": 1636849918, "lastModified": 1636849918,
@ -274,6 +300,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"naersk": "naersk", "naersk": "naersk",
"nil": "nil",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View file

@ -51,6 +51,17 @@
inputs.nixpkgs.follows = "nixpkgs"; 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 = { ha-now-playing = {
url = "git+https://git.datarift.nl/erwin/ha-now-playing.git?ref=main"; url = "git+https://git.datarift.nl/erwin/ha-now-playing.git?ref=main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -95,12 +106,23 @@
++ [ ++ [
{ {
nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
nixpkgs = { nixpkgs =
let
nomachine-pkgs = import inputs.nomachine {
inherit system;
config.allowUnfree = true;
};
in
{
overlays = [ overlays = [
self.overlays.default self.overlays.default
ha-now-playing.overlays.${system} ha-now-playing.overlays.${system}
pamedia.overlays.${system} pamedia.overlays.${system}
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
inputs.nil.overlays.default
(_final: _prev: {
nomachine = nomachine-pkgs.nomachine;
})
] ++ nixpkgs.lib.optional (system == "aarch64-linux") ] ++ nixpkgs.lib.optional (system == "aarch64-linux")
(_final: super: { (_final: super: {
makeModulesClosure = x: makeModulesClosure = x:

View file

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