removing desktop systems and des

This commit is contained in:
Joseph Hanson 2024-11-15 16:42:57 -06:00
parent 47f83ce397
commit 512cf903fe
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
26 changed files with 3 additions and 87 deletions

View file

@ -8,8 +8,8 @@
"files.trimTrailingWhitespace": true, "files.trimTrailingWhitespace": true,
"sops.defaults.ageKeyFile": "/home/jahanson/projects/mochi/age.key", "sops.defaults.ageKeyFile": "/home/jahanson/projects/mochi/age.key",
"nix.enableLanguageServer": true, "nix.enableLanguageServer": true,
"nix.serverPath": "/run/current-system/sw/bin/nil", "nix.serverPath": "/home/jahanson/.nix-profile/bin/nil",
"nix.formatterPath": "/run/current-system/sw/bin/nixfmt", "nix.formatterPath": "/home/jahanson/.nix-profile/bin/nixfmt",
"nix.serverSettings": { "nix.serverSettings": {
"nil": { "nil": {
"formatting": { "formatting": {
@ -21,7 +21,7 @@
}, },
}, },
"nix": { "nix": {
"binary": "/run/current-system/sw/bin/nix", "binary": "/nix/var/nix/profiles/default/bin/nix",
"maxMemoryMB": null, // disable memory limit "maxMemoryMB": null, // disable memory limit
"flake": { "flake": {
"autoEvalInputs": true, "autoEvalInputs": true,

View file

@ -167,25 +167,6 @@
}; };
in in
{ {
"telchar" = mkNixosConfig {
# Framework 16 Ryzen 7 7840HS - Radeon 780M Graphics
# Nix dev laptop
hostname = "telchar";
system = "x86_64-linux";
hardwareModules = [
inputs.nixos-hardware.nixosModules.framework-16-7040-amd
./nixos/profiles/hw-framework-16-7840hs.nix
disko.nixosModules.disko
(import ./nixos/profiles/disko-telchar.nix)
lix-module.nixosModules.default
];
profileModules = [
./nixos/profiles/role-dev.nix
./nixos/profiles/role-workstation.nix
{ home-manager.users.jahanson = ./nixos/home/jahanson/workstation.nix; }
];
};
"varda" = mkNixosConfig { "varda" = mkNixosConfig {
# Arm64 cax21 @ Hetzner # Arm64 cax21 @ Hetzner
# forgejo server # forgejo server

View file

@ -1,7 +1,6 @@
{ ... }: { { ... }: {
imports = [ imports = [
./browsers ./browsers
./de
./thunderbird ./thunderbird
]; ];
} }

View file

@ -1,56 +0,0 @@
{ lib, config, ... }:
with lib;
let
app = "backrest";
image = "garethgeorge/backrest:v1.1.0";
user = "568"; #string
group = "568"; #string
port = 9898; #int
cfg = config.mySystem.services.${app};
appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
in
{
options.mySystem.services.${app} =
{
enable = mkEnableOption "${app}";
addToHomepage = mkEnableOption "Add ${app} to homepage" // { default = true; };
};
config = mkIf cfg.enable {
# ensure folder exist and has correct owner/group
systemd.tmpfiles.rules = [
"d ${appFolder}/config 0750 ${user} ${group} -"
"d ${appFolder}/data 0750 ${user} ${group} -"
"d ${appFolder}/cache 0750 ${user} ${group} -"
];
virtualisation.oci-containers.containers.${app} = {
image = "${image}";
user = "${user}:${group}";
environment = {
BACKREST_PORT = "9898";
BACKREST_DATA = "/data";
BACKREST_CONFIG = "/config/config.json";
XDG_CACHE_HOME = "/cache";
};
volumes = [
"${appFolder}/nixos/config:/config:rw"
"${appFolder}/nixos/data:/data:rw"
"${appFolder}/nixos/cache:/cache:rw"
"${config.mySystem.nasFolder}/backup/nixos/nixos:/repos:rw"
"/etc/localtime:/etc/localtime:ro"
];
};
services.nginx.virtualHosts."${app}.${config.networking.domain}" = {
useACMEHost = config.networking.domain;
forceSSL = true;
locations."^~ /" = {
proxyPass = "http://${app}:${builtins.toString port}";
extraConfig = "resolver 10.88.0.1;";
};
};
};
}

View file

@ -1,6 +1,5 @@
{ {
imports = [ imports = [
./backrest
./lego-auto ./lego-auto
./scrutiny ./scrutiny
]; ];

View file

@ -3,9 +3,7 @@ with lib;
{ {
imports = [ imports = [
./containers ./containers
./de
./editor ./editor
./games
./hardware ./hardware
./lib.nix ./lib.nix
./programs ./programs

View file

@ -1,18 +1,14 @@
{ {
imports = [ imports = [
./bind ./bind
./cockpit
./dnsmasq ./dnsmasq
./forgejo ./forgejo
./glances
./haproxy ./haproxy
./libvirt-qemu ./libvirt-qemu
./matchbox ./matchbox
./nginx ./nginx
./onepassword-connect ./onepassword-connect
./podman ./podman
./postgresql
./radicale
./reboot-required-check.nix ./reboot-required-check.nix
./restic ./restic
./sanoid ./sanoid

View file

@ -6,7 +6,6 @@ with lib;
mySystem = { mySystem = {
services.rebootRequiredCheck.enable = true; services.rebootRequiredCheck.enable = true;
security.wheelNeedsSudoPassword = false; security.wheelNeedsSudoPassword = false;
services.cockpit.enable = true;
system.motd.enable = true; system.motd.enable = true;
}; };