diff --git a/flake.lock b/flake.lock index 835352e..1a862b5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "fenix": { + "inputs": { + "nixpkgs": [ + "twitch-hls-client", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1744958318, + "narHash": "sha256-L0a9BKIgHAD9mqum0VoXjBUDwnCV16/Q1AQg3a8cEnw=", + "owner": "nix-community", + "repo": "fenix", + "rev": "4cc256372df88f061c5156b8ca4ed6d5b01fb1a7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "firefox-addons": { "inputs": { "nixpkgs": [ @@ -8,11 +30,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1758879217, - "narHash": "sha256-vWk2iw/i5c0RHc/zLVyB51UYvmbzPq3uB14NN7kaouE=", + "lastModified": 1764389080, + "narHash": "sha256-BEn1Z9Uv20u2DS6wzLKdzx5kAzynM3wMQ9JnGf3VJvI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "58402e09ad48f9f509d9249b8704c1a4f390c434", + "rev": "897437c09bf22ce59efb3370f0783d0c662dba31", "type": "gitlab" }, "original": { @@ -62,11 +84,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -119,11 +141,11 @@ ] }, "locked": { - "lastModified": 1758928860, - "narHash": "sha256-ZqaRdd+KoR54dNJPtd7UX4O0X+02YItnTpQVu28lSVI=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc2afee55bc5d3b825287829d6592b9cc1405aad", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { @@ -134,11 +156,11 @@ }, "mnw": { "locked": { - "lastModified": 1756659871, - "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", + "lastModified": 1758834834, + "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", "owner": "Gerg-L", "repo": "mnw", - "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", + "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", "type": "github" }, "original": { @@ -149,11 +171,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1764328224, + "narHash": "sha256-hFyF1XQd+XrRx7WZCrGJp544dykexD8Q5SrJJZpEQYg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "d62603a997438e19182af69d3ce7be07565ecad4", "type": "github" }, "original": { @@ -164,11 +186,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -180,11 +202,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756696532, - "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", + "lastModified": 1761880412, + "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", + "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", "type": "github" }, "original": { @@ -196,11 +218,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758262103, - "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", + "lastModified": 1763618868, + "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "type": "github" }, "original": { @@ -210,6 +232,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvf": { "inputs": { "flake-compat": "flake-compat", @@ -219,11 +257,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1758271661, - "narHash": "sha256-ENqd2/33uP5vB44ClDjjAV+J78oF8q1er4QUZuT8Z7g=", + "lastModified": 1762622004, + "narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", "owner": "notashelf", "repo": "nvf", - "rev": "b7571df4d6e9ac08506a738ddceeec0b141751b0", + "rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", "type": "github" }, "original": { @@ -242,11 +280,11 @@ ] }, "locked": { - "lastModified": 1758185783, - "narHash": "sha256-6fX2CG8PzdBNwJGBISnf/nVHUVMZdCsekT1mP672Uh8=", + "lastModified": 1763909441, + "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "6a7d78cebd9a0f84a508bec9bc47ac504c5f51f4", + "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" }, "original": { @@ -265,7 +303,25 @@ "plasma-manager": "plasma-manager", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", - "stable": "stable" + "stable": "stable", + "twitch-hls-client": "twitch-hls-client" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1744878314, + "narHash": "sha256-iPHZkar3ebiF0rT6VLorSXIQCG7kAOmAsfuTahCzgS8=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "ed737b545e8db5d9c78fcaba73baed0f34e5b3f8", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" } }, "snowfall-lib": { @@ -295,11 +351,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1758425756, - "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", + "lastModified": 1764021963, + "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", + "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "type": "github" }, "original": { @@ -353,6 +409,41 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "twitch-hls-client": { + "inputs": { + "fenix": "fenix", + "nixpkgs": "nixpkgs_4", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1762829126, + "narHash": "sha256-jApBFe9GeXkkNO+oODpYt+FArsU441lJhxnwzL4vwPk=", + "owner": "2bc4", + "repo": "twitch-hls-client", + "rev": "cb2e5c8a4a769018507ae1c9ab96b0d3a0b31c7b", + "type": "github" + }, + "original": { + "owner": "2bc4", + "repo": "twitch-hls-client", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3460e08..1f42bce 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,8 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; + + twitch-hls-client.url = "github:2bc4/twitch-hls-client"; }; outputs = diff --git a/modules/home/apps/librewolf/default.nix b/modules/home/apps/librewolf/default.nix index 8c08124..d2a8b55 100644 --- a/modules/home/apps/librewolf/default.nix +++ b/modules/home/apps/librewolf/default.nix @@ -94,7 +94,7 @@ in config = mkIf cfg.enable { programs.librewolf = { enable = true; - package = pkgs.librewolf-wayland; + package = pkgs.librewolf; profiles."philipp" = { inherit (cfg) diff --git a/modules/home/apps/mpv/default.nix b/modules/home/apps/mpv/default.nix index 7973264..495864b 100644 --- a/modules/home/apps/mpv/default.nix +++ b/modules/home/apps/mpv/default.nix @@ -16,8 +16,8 @@ in }; config = mkIf cfg.enable { - programs.mpv = { - enable = true; + programs = { + mpv.enable = true; }; }; diff --git a/modules/home/games/runelite/default.nix b/modules/home/games/runelite/default.nix index 968440b..827b980 100644 --- a/modules/home/games/runelite/default.nix +++ b/modules/home/games/runelite/default.nix @@ -16,8 +16,8 @@ in }; config = mkIf cfg.enable { - home.packages = with pkgs; [ - runelite + home.packages = with pkgs; [ + runelite bolt-launcher ]; }; diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix index 4389090..235a954 100644 --- a/modules/nixos/desktop/plasma/default.nix +++ b/modules/nixos/desktop/plasma/default.nix @@ -48,7 +48,7 @@ in kdiskmark networkmanager kdePackages.networkmanager-qt - kdePackages.wallpaper-engine-plugin + #kdePackages.wallpaper-engine-plugin Currently crashes plasma ]; }; diff --git a/modules/nixos/hardware/audio/default.nix b/modules/nixos/hardware/audio/default.nix index 14e79ba..b67f975 100644 --- a/modules/nixos/hardware/audio/default.nix +++ b/modules/nixos/hardware/audio/default.nix @@ -35,6 +35,7 @@ in [ pulsemixer pavucontrol + twitch-hls-client ] ++ cfg.extra-packages; diff --git a/modules/nixos/services/linkwarden/default.nix b/modules/nixos/services/linkwarden/default.nix index 4c747ed..5474e23 100644 --- a/modules/nixos/services/linkwarden/default.nix +++ b/modules/nixos/services/linkwarden/default.nix @@ -185,10 +185,12 @@ in description = "Linkwarden (Self-hosted collaborative bookmark manager to collect, organize, and preserve webpages, articles, and more...)"; requires = [ "network-online.target" - ] ++ lib.optionals cfg.database.enable [ "postgresql.service" ]; + ] + ++ lib.optionals cfg.database.enable [ "postgresql.service" ]; after = [ "network-online.target" - ] ++ lib.optionals cfg.database.enable [ "postgresql.service" ]; + ] + ++ lib.optionals cfg.database.enable [ "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; environment = cfg.environment // { # Required, otherwise chrome dumps core diff --git a/modules/nixos/services/technitium-dns-server/default.nix b/modules/nixos/services/technitium-dns-server/default.nix index b100121..ad5fcff 100644 --- a/modules/nixos/services/technitium-dns-server/default.nix +++ b/modules/nixos/services/technitium-dns-server/default.nix @@ -17,7 +17,7 @@ in package = mkOption { description = "The package of Technitium to use."; type = types.package; - default = pkgs.awesome-flake.technitium-dns-server; + default = pkgs.technitium-dns-server; }; openFirewall = mkOption { diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index 5d75606..6175c7d 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -66,7 +66,7 @@ in noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif - noto-fonts-emoji + noto-fonts-color-emoji nerd-fonts.hack #(pkgs.awesome-flake.ttf-ms-win11.override { acceptEula = true; }) ] diff --git a/modules/nixos/system/gnupg/default.nix b/modules/nixos/system/gnupg/default.nix index dc744a8..a3d20a0 100644 --- a/modules/nixos/system/gnupg/default.nix +++ b/modules/nixos/system/gnupg/default.nix @@ -20,7 +20,7 @@ in programs.gnupg.agent = { enable = true; enableSSHSupport = false; - pinentryPackage = pkgs.pinentry; + pinentryPackage = pkgs.pinentry-qt; }; }; diff --git a/packages/proton-ge-bin-9/default.nix b/packages/proton-ge-bin-9/default.nix index 083905f..0d4dd2c 100644 --- a/packages/proton-ge-bin-9/default.nix +++ b/packages/proton-ge-bin-9/default.nix @@ -78,4 +78,3 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; }) - diff --git a/systems/aarch64-linux/aquarius/networking.nix b/systems/aarch64-linux/aquarius/networking.nix index 6769fbf..fd1efbe 100644 --- a/systems/aarch64-linux/aquarius/networking.nix +++ b/systems/aarch64-linux/aquarius/networking.nix @@ -14,7 +14,10 @@ wireguard = { enable = true; interfaces."wg0" = { - ips = [ "192.168.100.10/24" "fd00:100::10/64" ]; + ips = [ + "192.168.100.10/24" + "fd00:100::10/64" + ]; listenPort = 51820; mtu = 1400; privateKeyFile = "/run/secrets/privateKey"; @@ -22,7 +25,10 @@ { publicKey = "ylsjhpKiq3B6Kv4q2uiHXUJpyxY2b1DOAlGc/FWdflQ="; presharedKeyFile = "/run/secrets/presharedKey"; - allowedIPs = [ "192.168.100.1/32" "fd00:100::1/128" ]; + allowedIPs = [ + "192.168.100.1/32" + "fd00:100::1/128" + ]; endpoint = "neuruppin.boehm.sh:51820"; persistentKeepalive = 25; } diff --git a/systems/x86_64-linux/bodenheizung/hardware-configuration.nix b/systems/x86_64-linux/bodenheizung/hardware-configuration.nix index 2cbadc7..0de4402 100644 --- a/systems/x86_64-linux/bodenheizung/hardware-configuration.nix +++ b/systems/x86_64-linux/bodenheizung/hardware-configuration.nix @@ -21,8 +21,13 @@ "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.kernelModules = [ + "kvm-amd" + "v4l2loopback" + ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ + v4l2loopback + ]; boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/1616e34a-a8c6-4e18-882c-d955b4f8ffeb";