From 2cbd7a452f4cf2949b2eb283340fd66992912ce4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 9 Dec 2025 11:34:48 +0100 Subject: [PATCH] lkjdsalkjdsal --- hosts/nixos/nord/configuration.nix | 2 +- profiles/backup/server.nix | 1 + profiles/desktop/gnome/default.nix | 1 + profiles/known-hosts/hosts.toml | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hosts/nixos/nord/configuration.nix b/hosts/nixos/nord/configuration.nix index a52610e..c2c8765 100644 --- a/hosts/nixos/nord/configuration.nix +++ b/hosts/nixos/nord/configuration.nix @@ -43,7 +43,7 @@ ../../../profiles/nix-ld.nix ../../../profiles/sshd #../../../profiles/oci/podman.nix - #../../../profiles/oci/docker.nix + ../../../profiles/oci/docker.nix #../../../profiles/vpn-pbsds/tailscale.nix diff --git a/profiles/backup/server.nix b/profiles/backup/server.nix index da778f9..bc9f26a 100644 --- a/profiles/backup/server.nix +++ b/profiles/backup/server.nix @@ -1,3 +1,4 @@ # todo # some "restrict,pty,command=..." ssh authorized_keys bullshit to verify restic, or maybe even just host the REST server? +# see ./hosts/nixos/garp/sftp.nix diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix index c44045b..9453fff 100644 --- a/profiles/desktop/gnome/default.nix +++ b/profiles/desktop/gnome/default.nix @@ -106,6 +106,7 @@ https://wiki.nixos.org/wiki/GNOME pkgs.evince # Document Viewer pkgs.epiphany # web browser pkgs.geary # email reader + pkgs.showtime # video player pkgs.totem # video player pkgs.tali # poker game pkgs.iagno # go game diff --git a/profiles/known-hosts/hosts.toml b/profiles/known-hosts/hosts.toml index eb75cb3..a283380 100644 --- a/profiles/known-hosts/hosts.toml +++ b/profiles/known-hosts/hosts.toml @@ -52,7 +52,7 @@ noProxyJumpDomains = [ "tail9aac63.ts.net" ] ["bolle.tail9aac63.ts.net"] aliases = [ "bolle.pbsds.net" ] buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"] -# buildMachine.maxJobs = 3 # 12 threads 32GB +buildMachine.maxJobs = 3 # 12 threads 32GB buildMachine.speedFactor = 4 # ??? buildMachine.supportedFeatures = ["kvm", "nixos-test" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache buildMachine.protocol = "ssh-ng" @@ -64,7 +64,7 @@ ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no ["eple.tail9aac63.ts.net"] # r9 290x aliases = [ "eple.pbsds.net" ] buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"] -# buildMachine.maxJobs = 3 # 12 threads 32GB +buildMachine.maxJobs = 3 # 12 threads 32GB buildMachine.speedFactor = 3 # i7-5820K buildMachine.supportedFeatures = ["kvm", "nixos-test", "ccache" ] buildMachine.protocol = "ssh-ng"