From 6450d97ac3d0491b093828abc5fd7f2e1f54599a Mon Sep 17 00:00:00 2001 From: Martin Benonisen Date: Mon, 4 Nov 2024 22:04:08 +0100 Subject: [PATCH] lol --- flake.lock | 14 ++++----- system/programs.nix | 19 +++++++++++- system/services.nix | 71 +++++++++++++++++++++++---------------------- 3 files changed, 61 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 7f0065d..ff377fd 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1730490306, - "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1743615b61c7285976f85b303a36cdf88a556503", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1730559589, - "narHash": "sha256-o4NT2Kt7yEA63j38Ic5mrh2U/iQjs3YSNvIbCccIYP0=", + "lastModified": 1730751859, + "narHash": "sha256-gc+dx5AIsY0NP24UkCNkpnBmSrkrlTR9v6f+6lJjk4A=", "ref": "refs/heads/main", - "rev": "70645c290dfc6ed10282bf4d2ae38c0bf7b1a3fb", - "revCount": 830, + "rev": "0b98dee77729c296e2044fc748c6dcaa168363c7", + "revCount": 831, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/system/programs.nix b/system/programs.nix index de6a347..11362bd 100644 --- a/system/programs.nix +++ b/system/programs.nix @@ -48,7 +48,15 @@ vk-bootstrap (lutris.override { extraLibraries = pkgs: [ - # List library dependencies here + libogg + flac + graphene + + ]; + extraPkgs = pkgs: [ + libogg + flac + graphene gst_all_1.gstreamer # Common plugins like "filesrc" to combine within e.g. gst-launch gst_all_1.gst-plugins-base @@ -60,6 +68,15 @@ gst_all_1.gst-libav # Support the Video Audio (Hardware) Acceleration API gst_all_1.gst-vaapi + openssl + nghttp2 + libidn2 + rtmpdump + libpsl + curl + krb5 + keyutils + # List library dependencies here ]; }) sipcalc diff --git a/system/services.nix b/system/services.nix index 5ab1881..55b38af 100644 --- a/system/services.nix +++ b/system/services.nix @@ -1,6 +1,7 @@ { config, pkgs, ... }: { security.rtkit.enable = true; + services.fwupd.enable = true; networking.firewall.enable = false; programs.dconf.enable = true; services.gnome.gnome-keyring.enable = true; @@ -10,41 +11,41 @@ ''; security.polkit.enable = true; services = { - prometheus = { - scrapeConfigs = [ - { - job_name = "chrysalis"; - static_configs = [{ - targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ]; - }]; - } - ]; - - exporters = { - node = { - enable = true; - enabledCollectors = [ "systemd" "processes" ]; - port = 9002; - }; - }; - - enable = true; - port = 9001; - }; - - grafana = { - enable = true; - settings = { - server = { - # Listening Address - http_addr = "127.0.0.1"; - # and Port - http_port = 3000; - # Grafana needs to know on which domain and URL it's running - serve_from_sub_path = true; - }; - }; - }; + # prometheus = { + # scrapeConfigs = [ + # { + # job_name = "chrysalis"; + # static_configs = [{ + # targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ]; + # }]; + # } + # ]; + # + # exporters = { + # node = { + # enable = true; + # enabledCollectors = [ "systemd" "processes" ]; + # port = 9002; + # }; + # }; + # + # enable = true; + # port = 9001; + # }; + # + # grafana = { + # enable = true; + # settings = { + # server = { + # # Listening Address + # http_addr = "127.0.0.1"; + # # and Port + # http_port = 3000; + # # Grafana needs to know on which domain and URL it's running + # serve_from_sub_path = true; + # }; + # }; + # }; displayManager = { defaultSession = "none+i3";