all: switch from barrier to rkvm
This commit is contained in:
parent
c66002b876
commit
98e22c2639
@ -56,9 +56,9 @@ in
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "Barrier";
|
name = "KVM";
|
||||||
commands = [
|
commands = [
|
||||||
"barriers -a 127.0.0.1 -f --disable-crypto"
|
"sudo rkvm-server /etc/rkvm/server.toml"
|
||||||
];
|
];
|
||||||
panes = [
|
panes = [
|
||||||
{
|
{
|
||||||
|
8
flake.lock
generated
8
flake.lock
generated
@ -562,11 +562,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1707101062,
|
"lastModified": 1709134824,
|
||||||
"narHash": "sha256-2GJWMoIzetP6isvu62XBoeLMG00x6QkjuY9w51pSC8s=",
|
"narHash": "sha256-vBuZkJoM8JqThSO/TntmzjngnHsthqRZltt5gWpVmJk=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "e358f0a9ba75dba44b5b7853a6387c7e8a67ae26",
|
"rev": "86158f5100491f8701cf3ff057bc6e958c71d2e5",
|
||||||
"revCount": 126,
|
"revCount": 128,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://xin-secrets-ro/qbit/xin-secrets.git"
|
"url": "ssh://xin-secrets-ro/qbit/xin-secrets.git"
|
||||||
},
|
},
|
||||||
|
@ -9,9 +9,6 @@ let
|
|||||||
inherit (inputs.stable.legacyPackages.${pkgs.system}) chirp beets;
|
inherit (inputs.stable.legacyPackages.${pkgs.system}) chirp beets;
|
||||||
inherit (builtins) readFile;
|
inherit (builtins) readFile;
|
||||||
inherit (xinlib) jobToUserService;
|
inherit (xinlib) jobToUserService;
|
||||||
#doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default.override {
|
|
||||||
# doomPrivateDir = ../../configs/doom.d;
|
|
||||||
#};
|
|
||||||
peerixUser =
|
peerixUser =
|
||||||
if builtins.hasAttr "peerix" config.users.users
|
if builtins.hasAttr "peerix" config.users.users
|
||||||
then config.users.users.peerix.name
|
then config.users.users.peerix.name
|
||||||
@ -36,6 +33,7 @@ let
|
|||||||
path = [ pkgs.taskobs ] ++ pkgs.taskobs.buildInputs;
|
path = [ pkgs.taskobs ] ++ pkgs.taskobs.buildInputs;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
rkvmTomlFmt = pkgs.formats.toml { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
_module.args.isUnstable = true;
|
_module.args.isUnstable = true;
|
||||||
@ -43,6 +41,18 @@ in
|
|||||||
imports = [ ./hardware-configuration.nix ../../pkgs ];
|
imports = [ ./hardware-configuration.nix ../../pkgs ];
|
||||||
|
|
||||||
sops.secrets = {
|
sops.secrets = {
|
||||||
|
rkvm_cert = {
|
||||||
|
sopsFile = config.xin-secrets.europa.qbit;
|
||||||
|
owner = "root";
|
||||||
|
group = "wheel";
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
rkvm_key = {
|
||||||
|
sopsFile = config.xin-secrets.europa.qbit;
|
||||||
|
owner = "root";
|
||||||
|
group = "wheel";
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
fastmail = {
|
fastmail = {
|
||||||
sopsFile = config.xin-secrets.europa.qbit;
|
sopsFile = config.xin-secrets.europa.qbit;
|
||||||
owner = "qbit";
|
owner = "qbit";
|
||||||
@ -304,7 +314,19 @@ in
|
|||||||
];
|
];
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
etc."barrier.conf" = { text = readFile ../../configs/barrier.conf; };
|
etc."rkvm/server.toml" = {
|
||||||
|
text = readFile
|
||||||
|
(rkvmTomlFmt.generate "server.toml" {
|
||||||
|
listen = "127.0.0.1:24800";
|
||||||
|
switch-keys = [
|
||||||
|
"caps-lock"
|
||||||
|
"left-alt"
|
||||||
|
];
|
||||||
|
certificate = "${config.sops.secrets.rkvm_cert.path}";
|
||||||
|
key = "${config.sops.secrets.rkvm_key.path}";
|
||||||
|
password = "fake";
|
||||||
|
});
|
||||||
|
};
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
XDG_BIN_HOME = "\${HOME}/.local/bin";
|
XDG_BIN_HOME = "\${HOME}/.local/bin";
|
||||||
XDG_CACHE_HOME = "\${HOME}/.cache";
|
XDG_CACHE_HOME = "\${HOME}/.cache";
|
||||||
@ -318,7 +340,6 @@ in
|
|||||||
|
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
arduino
|
arduino
|
||||||
barrier
|
|
||||||
beets # stable
|
beets # stable
|
||||||
calibre
|
calibre
|
||||||
chirp # stable
|
chirp # stable
|
||||||
|
@ -19,9 +19,7 @@ let
|
|||||||
if builtins.hasAttr "peerix" config.users.users
|
if builtins.hasAttr "peerix" config.users.users
|
||||||
then config.users.users.peerix.name
|
then config.users.users.peerix.name
|
||||||
else "root";
|
else "root";
|
||||||
#doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default.override {
|
rkvmTomlFmt = pkgs.formats.toml { };
|
||||||
# doomPrivateDir = ../../configs/doom.d;
|
|
||||||
#};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
_module.args.isUnstable = true;
|
_module.args.isUnstable = true;
|
||||||
@ -122,6 +120,12 @@ in
|
|||||||
sshFidoAgent.enable = true;
|
sshFidoAgent.enable = true;
|
||||||
|
|
||||||
sops.secrets = {
|
sops.secrets = {
|
||||||
|
rkvm_cert = {
|
||||||
|
sopsFile = config.xin-secrets.stan.main;
|
||||||
|
owner = "root";
|
||||||
|
group = "wheel";
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
vm_pass = {
|
vm_pass = {
|
||||||
sopsFile = config.xin-secrets.stan.main;
|
sopsFile = config.xin-secrets.stan.main;
|
||||||
owner = "root";
|
owner = "root";
|
||||||
@ -177,7 +181,6 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
barrier
|
|
||||||
fzf
|
fzf
|
||||||
google-chrome
|
google-chrome
|
||||||
ispell
|
ispell
|
||||||
@ -265,6 +268,14 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
rkvm.client = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
certificate = "${config.sops.secrets.rkvm_cert.path}";
|
||||||
|
password = "fake";
|
||||||
|
server = "127.0.0.1:24800";
|
||||||
|
};
|
||||||
|
};
|
||||||
restic = {
|
restic = {
|
||||||
backups = {
|
backups = {
|
||||||
remote = {
|
remote = {
|
||||||
|
Loading…
Reference in New Issue
Block a user