diff --git a/flake.lock b/flake.lock index 87e9353..df2c5d0 100644 --- a/flake.lock +++ b/flake.lock @@ -1894,6 +1894,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "shimmeringdarkness": "shimmeringdarkness", "shimmeringmoon": "shimmeringmoon", + "shimmeringvoid": "shimmeringvoid_2", "smos": "smos", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", @@ -1983,11 +1984,11 @@ "shimmeringdarkness": { "flake": false, "locked": { - "lastModified": 1739242531, - "narHash": "sha256-OYLvznlkZRjeUdMG1LqifYY0Mo4/SHZInMxmzG1KsqU=", + "lastModified": 1740990076, + "narHash": "sha256-UiJbNPcN5qM/q5IeZXOqodT/9K1OoKI5OggvI/l2uC0=", "ref": "refs/heads/main", - "rev": "ded8a4858e8815db29bfa5bc1d700bd635b2327c", - "revCount": 4, + "rev": "30b81df67a57201a4fa690635554a9fa7dfd7ee8", + "revCount": 1, "type": "git", "url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringdarkness.git" }, @@ -2004,14 +2005,15 @@ ], "shimmeringdarkness": [ "shimmeringdarkness" - ] + ], + "shimmeringvoid": "shimmeringvoid" }, "locked": { - "lastModified": 1739381397, - "narHash": "sha256-Q4c0NNFmKrNZsSfR8QvdmeuRCoL1cN4Y3BssOWCnyPI=", + "lastModified": 1740995903, + "narHash": "sha256-p/Iy5ty0Xe7TtSiph/Pv4fCBwDATNZbE5RMJOMQTPdU=", "ref": "refs/heads/main", - "rev": "a55aa56b62fcb48c9f7d6a6d3671036179f7492b", - "revCount": 80, + "rev": "08667c775b319fc801a3fc26d57e87dca857bf48", + "revCount": 81, "type": "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" } }, + "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": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 6f8cf1b..c365206 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,8 @@ shimmeringdarkness.flake = false; 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.shimmeringdarkness.follows = "shimmeringdarkness"; diff --git a/hosts/nixos/common/optional/services/iwd/default.nix b/hosts/nixos/common/optional/services/iwd/default.nix index a3d2af3..25b2230 100644 --- a/hosts/nixos/common/optional/services/iwd/default.nix +++ b/hosts/nixos/common/optional/services/iwd/default.nix @@ -11,7 +11,6 @@ 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.templates."eduroam.8021x".content = '' [Security] @@ -26,4 +25,8 @@ [Settings] AutoConnect=true ''; + + systemd.tmpfiles.rules = [ + "L+ /persist/state/var/lib/iwd/eduroam.8021x - - - - ${config.sops.templates."eduroam.8021x".path}" + ]; } diff --git a/hosts/nixos/lapetus/services/glass-server/default.nix b/hosts/nixos/lapetus/services/glass-server/default.nix index b9cf361..0b1f6ba 100644 --- a/hosts/nixos/lapetus/services/glass-server/default.nix +++ b/hosts/nixos/lapetus/services/glass-server/default.nix @@ -25,7 +25,7 @@ owner = config.services.glass-server.user; group = config.services.glass-server.user; 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}"; PASSWORD = "${config.sops.placeholder.glass_server_admin_password}"; API_TOKEN = "${config.sops.placeholder.glass_server_admin_token}"; diff --git a/hosts/nixos/lapetus/services/grafana.nix b/hosts/nixos/lapetus/services/grafana.nix index 2466323..83998a6 100644 --- a/hosts/nixos/lapetus/services/grafana.nix +++ b/hosts/nixos/lapetus/services/grafana.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, ... }: let port = config.satellite.ports.grafana; 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/ alerting.contactPoints.settings = { apiVersion = 1; - contactPoints = [{ - name = "main"; - receivers = [ - { - uid = "main_discord"; - type = "discord"; - settings.url = secret "grafana_discord_webhook"; - settings.message = '' - @everyone ✨ An issue occured :O ✨ - {{ template "default.message" . }} - ''; - } - { - uid = "main_email"; - type = "email"; - settings.addresses = "colimit@moonythm.dev"; - } - ]; - }]; + contactPoints = [ + { + name = "main"; + receivers = [ + { + uid = "main_discord"; + type = "discord"; + settings.url = secret "grafana_discord_webhook"; + settings.message = '' + @everyone ✨ An issue occured :O ✨ + {{ template "default.message" . }} + ''; + } + { + uid = "main_email"; + type = "email"; + settings.addresses = "colimit@moonythm.dev"; + } + ]; + } + ]; }; alerting.policies.settings = { apiVersion = 1; - policies = [{ - receiver = "main"; - }]; + policies = [ + { + receiver = "main"; + } + ]; }; datasources.settings = { apiVersion = 1; - datasources = [{ - name = "Prometheus"; - type = "prometheus"; - access = "proxy"; - url = "https://prometheus.moonythm.dev"; - }]; + datasources = [ + { + name = "Prometheus"; + type = "prometheus"; + access = "proxy"; + url = "https://prometheus.moonythm.dev"; + } + ]; }; }; # }}} @@ -88,10 +94,12 @@ in # {{{ Networking & storage satellite.nginx.at.grafana.port = port; - environment.persistence."/persist/state".directories = [{ - directory = config.services.grafana.dataDir; - user = "grafana"; - group = "grafana"; - }]; + environment.persistence."/persist/state".directories = [ + { + directory = config.services.grafana.dataDir; + user = "grafana"; + group = "grafana"; + } + ]; # }}} } diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix index 93830f5..90a26e5 100644 --- a/hosts/nixos/tethys/default.nix +++ b/hosts/nixos/tethys/default.nix @@ -17,7 +17,8 @@ ../common/optional/desktop/steam.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/kanata.nix ../common/optional/services/restic diff --git a/otd b/otd new file mode 100644 index 0000000..d7994c1 --- /dev/null +++ b/otd @@ -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": [] +} \ No newline at end of file