feat: added user2 and refactored to accommodate

This commit is contained in:
Nick 2025-01-28 20:45:11 -06:00
parent c169f84dcc
commit 9cdcf4fec4
97 changed files with 1473 additions and 1052 deletions

View file

@ -60,9 +60,16 @@ in
inherit (modules)
syncthing
ollama
# hledger
# plasma
# sddm
;
};
};
fallaryn = {
imports = builtins.attrValues {
inherit (modules)
tablet
plasma
sddm
;
};
};

View file

@ -1,80 +0,0 @@
{
# inputs,
# lib,
# pkgs,
# ...
# }: let
# bootstrap-server = pkgs.writeText "bootstrap.edgesql" ''
# ALTER ROLE edgedb SET password := "test";
# '';
# edgedb-server = inputs.edgedb.packages."x86_64-linux".edgedb-server-5_0_beta;
# working-dir = "/var/lib/edgedb";
# in {
# environment.systemPackages = [
# pkgs.edgedb
# ];
# # system.activationScripts = {
# # edgedb-data-dir = {
# # text = ''
# # install -d -m 0750 -o edgedb -g edgedb ${working-dir}
# # '';
# # };
# # };
# systemd.services = {
# "edgedb@" = {
# enable = true;
# after = ["network.target" "syslog.target"];
# description = "EdgeDB Database Service, instance %i";
# documentation = ["https://edgedb.com"];
# path = [edgedb-server];
# reload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
# script = ''
# ${lib.getExe' edgedb-server "edgedb-server"} \
# --data-dir=${working-dir}/$1 \
# --disable-dynamic-system-config \
# --emit-server-status=${working-dir}/$1/status.json \
# --instance-name=$1 \
# --security=insecure_dev_mode \
# --tls-cert-mode=generate_self_signed \
# --admin-ui=enabled
# '';
# scriptArgs = "%i";
# serviceConfig = {
# Type = "simple";
# User = "edgedb";
# Group = "edgedb";
# KillMode = "mixed";
# TimeoutSec = 0;
# ExecStartPre = ''
# ${lib.getExe' edgedb-server "edgedb-server"} \
# --data-dir=${working-dir}/%i \
# --instance-name=%i \
# --disable-dynamic-system-config \
# --bootstrap-only \
# --bootstrap-command-file=${bootstrap-server}
# '';
# };
# };
# "edgedb@test" = {
# enable = true;
# environment = {
# EDGEDB_DEBUG_HTTP_INJECT_CORS = "1";
# };
# overrideStrategy = "asDropin";
# };
# };
# users.groups.edgedb = {};
# users.users.edgedb = {
# group = "edgedb";
# description = "EdgeDB Server";
# isSystemUser = true;
# packages = [
# edgedb-server
# ];
# };
}

View file

@ -5,7 +5,7 @@
}:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
@ -14,13 +14,13 @@ in
enable = true;
defaultFonts = {
serif = [
font.name
fonts.names.name0
];
monospace = [
font.name
fonts.names.name0
];
sansSerif = [
font.name
fonts.names.name0
];
emoji = [
"Noto Fonts Color Emoji"

View file

@ -6,7 +6,7 @@
}:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
@ -20,7 +20,7 @@ in
# GTK = {
# application_prefer_dark_theme = true;
# cursor_theme_name = lib.mkForce "catppuccin-macchiato-dark-cursors";
# font_name = lib.mkForce "${font.name} ${font.size.desktop}";
# font_name = lib.mkForce "${fonts.names.name0} ${font.size.desktop}";
# icon_theme_name = lib.mkForce "Papirus-Dark";
# theme_name = lib.mkForce "catppuccin-macchiato-mauve-compact";
# };

View file

@ -1,36 +1,51 @@
{flake, ...}: let
inherit
(flake.config.machines.devices)
{
flake,
pkgs,
...
}:
let
inherit (flake.config.machines.devices)
printer0
printer1
;
genericPPD = "drv:///sample.drv/generic.ppd";
pageSize = "Letter";
in {
hardware.printers = {
ensurePrinters = [
{
name = printer0.label;
location = "Downstairs";
deviceUri = "https://${printer0.ip.address0}";
model = genericPPD;
ppdOptions = {
PageSize = pageSize;
};
}
{
name = printer1.label;
location = "Upstairs";
deviceUri = "https://${printer1.ip.address0}";
model = genericPPD;
ppdOptions = {
PageSize = pageSize;
};
}
];
ensureDefaultPrinter = printer1.label;
in
{
services = {
printing = {
enable = true;
drivers = with pkgs; [
brlaser
cups-brother-hll2375dw
];
};
};
# hardware.printers = {
# ensurePrinters = [
# {
# name = printer0.label;
# location = "Downstairs";
# deviceUri = "https://${printer0.ip.address0}";
# model = genericPPD;
# ppdOptions = {
# PageSize = pageSize;
# };
# }
# {
# name = printer1.label;
# location = "Upstairs";
# deviceUri = "https://${printer1.ip.address0}";
# model = genericPPD;
# ppdOptions = {
# PageSize = pageSize;
# };
# }
# ];
# ensureDefaultPrinter = printer1.label;
# };
networking = {
firewall = {
allowedTCPPorts = [

View file

@ -1,18 +1,18 @@
{flake, ...}: let
inherit
(flake.config.machines.devices)
{ flake, ... }:
let
inherit (flake.config.machines.devices)
synology
phone
tablet
;
inherit
(flake.config.services.instances)
inherit (flake.config.services.instances)
syncthing
web
;
service = syncthing;
localhost = web.localhost.address0;
in {
in
{
services = {
syncthing = {
enable = true;
@ -29,7 +29,7 @@ in {
addresses = [
"tcp://${synology.ip.address0}:${toString service.ports.port2}"
];
id = synology.sync;
id = synology.sync.address0;
};
${phone.name} = {
autoAcceptFolders = true;
@ -37,7 +37,7 @@ in {
addresses = [
"tcp://${phone.ip.address0}:${toString service.ports.port2}"
];
id = phone.sync;
id = phone.sync.address0;
};
${tablet.name} = {
autoAcceptFolders = true;
@ -45,7 +45,7 @@ in {
addresses = [
"tcp://${tablet.ip.address0}:${toString service.ports.port2}"
];
id = tablet.sync;
id = tablet.sync.address0;
};
};
};

6
nixos/modules/tablet.nix Normal file
View file

@ -0,0 +1,6 @@
{
hardware.opentabletdriver = {
enable = true;
daemon.enable = true;
};
}