prescientmoon/satellite
prescientmoon/satellite
1
Fork 0
Code Activity

Bump shimmeringmoon

Browse source
This commit is contained in:
prescientmoon 2025-03-03 14:32:42 +01:00
parent b1fca53412
commit dbf9324df9
Signed by: prescientmoon
SSH key fingerprint: SHA256:UUF9JT2s8Xfyv76b8ZuVL7XrmimH4o49p4b+iexbVH4
7 changed files with 154 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
flake.lock
View file

@ -1894,6 +1894,7 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"shimmeringdarkness": "shimmeringdarkness", "shimmeringdarkness": "shimmeringdarkness",
"shimmeringmoon": "shimmeringmoon", "shimmeringmoon": "shimmeringmoon",
"shimmeringvoid": "shimmeringvoid_2",
"smos": "smos", "smos": "smos",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
@ -1983,11 +1984,11 @@
"shimmeringdarkness": { "shimmeringdarkness": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739242531, "lastModified": 1740990076,
"narHash": "sha256-OYLvznlkZRjeUdMG1LqifYY0Mo4/SHZInMxmzG1KsqU=", "narHash": "sha256-UiJbNPcN5qM/q5IeZXOqodT/9K1OoKI5OggvI/l2uC0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "ded8a4858e8815db29bfa5bc1d700bd635b2327c", "rev": "30b81df67a57201a4fa690635554a9fa7dfd7ee8",
"revCount": 4, "revCount": 1,
"type": "git", "type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringdarkness.git" "url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringdarkness.git"
}, },
@ -2004,14 +2005,15 @@
], ],
"shimmeringdarkness": [ "shimmeringdarkness": [
"shimmeringdarkness" "shimmeringdarkness"
] ],
"shimmeringvoid": "shimmeringvoid"
}, },
"locked": { "locked": {
"lastModified": 1739381397, "lastModified": 1740995903,
"narHash": "sha256-Q4c0NNFmKrNZsSfR8QvdmeuRCoL1cN4Y3BssOWCnyPI=", "narHash": "sha256-p/Iy5ty0Xe7TtSiph/Pv4fCBwDATNZbE5RMJOMQTPdU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a55aa56b62fcb48c9f7d6a6d3671036179f7492b", "rev": "08667c775b319fc801a3fc26d57e87dca857bf48",
"revCount": 80, "revCount": 81,
"type": "git", "type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringmoon.git" "url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringmoon.git"
}, },
@ -2020,6 +2022,38 @@
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringmoon.git" "url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringmoon.git"
} }
}, },
"shimmeringvoid": {
"flake": false,
"locked": {
"lastModified": 1740991838,
"narHash": "sha256-2LRSIzjmOF+0tlF1DK01rONNFlwvtyPek8Qjx6wRCtI=",
"ref": "refs/heads/main",
"rev": "26329f45443a5077ffc0e8b9bb8e53bc93617023",
"revCount": 7,
"type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git"
},
"original": {
"type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git"
}
},
"shimmeringvoid_2": {
"flake": false,
"locked": {
"lastModified": 1740991838,
"narHash": "sha256-2LRSIzjmOF+0tlF1DK01rONNFlwvtyPek8Qjx6wRCtI=",
"ref": "refs/heads/main",
"rev": "26329f45443a5077ffc0e8b9bb8e53bc93617023",
"revCount": 7,
"type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git"
},
"original": {
"type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git"
}
},
"slimlock": { "slimlock": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

2
flake.nix
View file

@ -60,6 +60,8 @@
shimmeringdarkness.flake = false; shimmeringdarkness.flake = false;
shimmeringdarkness.url = "git+ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringdarkness.git"; shimmeringdarkness.url = "git+ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringdarkness.git";
shimmeringvoid.flake = false;
shimmeringvoid.url = "git+ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git";
shimmeringmoon.inputs.nixpkgs.follows = "nixpkgs"; shimmeringmoon.inputs.nixpkgs.follows = "nixpkgs";
shimmeringmoon.inputs.shimmeringdarkness.follows = "shimmeringdarkness"; shimmeringmoon.inputs.shimmeringdarkness.follows = "shimmeringdarkness";

5
hosts/nixos/common/optional/services/iwd/default.nix
View file

@ -11,7 +11,6 @@
environment.persistence."/persist/state".directories = [ "/var/lib/iwd" ]; environment.persistence."/persist/state".directories = [ "/var/lib/iwd" ];
sops.templates."eduroam.8021x".path = "/var/lib/iwd/eduroam.8021x";
sops.secrets.eduroam_pass.sopsFile = ../../../secrets.yaml; sops.secrets.eduroam_pass.sopsFile = ../../../secrets.yaml;
sops.templates."eduroam.8021x".content = '' sops.templates."eduroam.8021x".content = ''
[Security] [Security]
@ -26,4 +25,8 @@
[Settings] [Settings]
AutoConnect=true AutoConnect=true
''; '';
systemd.tmpfiles.rules = [
"L+ /persist/state/var/lib/iwd/eduroam.8021x - - - - ${config.sops.templates."eduroam.8021x".path}"
];
} }

2
hosts/nixos/lapetus/services/glass-server/default.nix
View file

@ -25,7 +25,7 @@
owner = config.services.glass-server.user; owner = config.services.glass-server.user;
group = config.services.glass-server.user; group = config.services.glass-server.user;
content = builtins.toJSON { content = builtins.toJSON {
CONTENT_BUNDLE_FOLDER_PATH = "${inputs.shimmeringdarkness}/bundles"; CONTENT_BUNDLE_FOLDER_PATH = "${inputs.shimmeringvoid}/bundles";
SECRET_KEY = "${config.sops.placeholder.glass_server_secret_key}"; SECRET_KEY = "${config.sops.placeholder.glass_server_secret_key}";
PASSWORD = "${config.sops.placeholder.glass_server_admin_password}"; PASSWORD = "${config.sops.placeholder.glass_server_admin_password}";
API_TOKEN = "${config.sops.placeholder.glass_server_admin_token}"; API_TOKEN = "${config.sops.placeholder.glass_server_admin_token}";

76
hosts/nixos/lapetus/services/grafana.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, ... }:
let let
port = config.satellite.ports.grafana; port = config.satellite.ports.grafana;
secret = name: "$__file{${config.sops.secrets.${name}.path}}"; secret = name: "$__file{${config.sops.secrets.${name}.path}}";
@ -44,42 +44,48 @@ in
# https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/file-provisioning/ # https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/file-provisioning/
alerting.contactPoints.settings = { alerting.contactPoints.settings = {
apiVersion = 1; apiVersion = 1;
contactPoints = [{ contactPoints = [
name = "main"; {
receivers = [ name = "main";
{ receivers = [
uid = "main_discord"; {
type = "discord"; uid = "main_discord";
settings.url = secret "grafana_discord_webhook"; type = "discord";
settings.message = '' settings.url = secret "grafana_discord_webhook";
@everyone ✨ An issue occured :O ✨ settings.message = ''
{{ template "default.message" . }} @everyone ✨ An issue occured :O ✨
''; {{ template "default.message" . }}
} '';
{ }
uid = "main_email"; {
type = "email"; uid = "main_email";
settings.addresses = "colimit@moonythm.dev"; type = "email";
} settings.addresses = "colimit@moonythm.dev";
]; }
}]; ];
}
];
}; };
alerting.policies.settings = { alerting.policies.settings = {
apiVersion = 1; apiVersion = 1;
policies = [{ policies = [
receiver = "main"; {
}]; receiver = "main";
}
];
}; };
datasources.settings = { datasources.settings = {
apiVersion = 1; apiVersion = 1;
datasources = [{ datasources = [
name = "Prometheus"; {
type = "prometheus"; name = "Prometheus";
access = "proxy"; type = "prometheus";
url = "https://prometheus.moonythm.dev"; access = "proxy";
}]; url = "https://prometheus.moonythm.dev";
}
];
}; };
}; };
# }}} # }}}
@ -88,10 +94,12 @@ in
# {{{ Networking & storage # {{{ Networking & storage
satellite.nginx.at.grafana.port = port; satellite.nginx.at.grafana.port = port;
environment.persistence."/persist/state".directories = [{ environment.persistence."/persist/state".directories = [
directory = config.services.grafana.dataDir; {
user = "grafana"; directory = config.services.grafana.dataDir;
group = "grafana"; user = "grafana";
}]; group = "grafana";
}
];
# }}} # }}}
} }

3
hosts/nixos/tethys/default.nix
View file

@ -17,7 +17,8 @@
../common/optional/desktop/steam.nix ../common/optional/desktop/steam.nix
../common/optional/wayland/hyprland.nix ../common/optional/wayland/hyprland.nix
../common/optional/services/wpa_supplicant.nix # ../common/optional/services/wpa_supplicant.nix
../common/optional/services/iwd
../common/optional/services/tailscale.nix ../common/optional/services/tailscale.nix
../common/optional/services/kanata.nix ../common/optional/services/kanata.nix
../common/optional/services/restic ../common/optional/services/restic

60
otd Normal file
View file

@ -0,0 +1,60 @@
{
"Profiles": [
{
"Tablet": "Wacom CTH-490",
"OutputMode": {
"Path": "OpenTabletDriver.Desktop.Output.AbsoluteMode",
"Settings": [],
"Enable": true
},
"Filters": [],
"AbsoluteModeSettings": {
"Display": {
"Width": 1920.0,
"Height": 1080.0,
"X": 960.0,
"Y": 540.0,
"Rotation": 0.0
},
"Tablet": {
"Width": 50.0,
"Height": 31.8,
"X": 47.595512,
"Y": 35.226494,
"Rotation": 0.0
},
"EnableClipping": true,
"EnableAreaLimiting": false,
"LockAspectRatio": false
},
"RelativeModeSettings": {
"XSensitivity": 10.0,
"YSensitivity": 10.0,
"RelativeRotation": 0.0,
"RelativeResetDelay": "00:00:00.1000000"
},
"Bindings": {
"TipActivationThreshold": 0.0,
"TipButton": null,
"EraserActivationThreshold": 0.0,
"EraserButton": null,
"PenButtons": [
null,
null
],
"AuxButtons": [
null,
null,
null,
null
],
"MouseButtons": [],
"MouseScrollUp": null,
"MouseScrollDown": null
}
}
],
"LockUsableAreaDisplay": true,
"LockUsableAreaTablet": true,
"Tools": []
}