diff --git a/flake.lock b/flake.lock index ff6d254..ee5e610 100644 --- a/flake.lock +++ b/flake.lock @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1735468753, - "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", + "lastModified": 1736526728, + "narHash": "sha256-vb/ldbBHRbfT9U7SoCYmxh+h+PHuFqGjCBO0bPXsze4=", "owner": "nix-community", "repo": "disko", - "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", + "rev": "b1a94497b1c27fe7f81e3e76990959f5051da18b", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1735963397, - "narHash": "sha256-z+yHxvZfWqFWUs0X6vrdUZlUrK9Q1MYPjHYmd6OdlkY=", + "lastModified": 1736568198, + "narHash": "sha256-RBTk5KavYsPZ56m9C2evS4pDkEu3+NdxY6mFNbo8DH8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "7ef40f138ae24f3b89a0e13dbad5bc9779007d85", + "rev": "7f8746a7ef2d15b8fb4acc63cb0d7e3a407739bf", "type": "gitlab" }, "original": { @@ -297,6 +297,22 @@ "type": "gitlab" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1734969791, + "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1733328505, @@ -413,11 +429,11 @@ ] }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -713,6 +729,37 @@ "type": "github" } }, + "git-hooks_3": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_5", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -802,6 +849,28 @@ "type": "github" } }, + "gitignore_5": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -870,11 +939,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -1175,11 +1244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -1412,11 +1481,11 @@ ] }, "locked": { - "lastModified": 1734719646, - "narHash": "sha256-D1wKH8IXyTjWzsbPVsF+4yY5ujD2CD+b1WGWkKKznSM=", + "lastModified": 1736552197, + "narHash": "sha256-Doc7Z85imF8OIHnNLzn/m6SWTktiiF+Y54hY62bhRf0=", "owner": "juspay", "repo": "omnix", - "rev": "8b33d73f555ab3787c0683d3cae233d8d7780120", + "rev": "7ef866f39f1adb2af1ef9ee93c144bd5e8a2ea5a", "type": "github" }, "original": { @@ -1610,8 +1679,10 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_4", + "git-hooks": "git-hooks_3", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -1625,11 +1696,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110444, - "narHash": "sha256-fp1iV2JldCSvz+7ODzXYUkQ+H7zyiWw5E0MQ4ILC4vw=", + "lastModified": 1736381946, + "narHash": "sha256-k66y4eMHZiJO3N43wuZOdoRmGmNwIj3EZq6NGK+AEM8=", "owner": "danth", "repo": "stylix", - "rev": "9015d5d0d5d100f849129c43d257b827d300b089", + "rev": "c62df1918d178ade64dc8a2df99e78a5d5f20514", "type": "github" }, "original": { @@ -1837,11 +1908,11 @@ ] }, "locked": { - "lastModified": 1735905407, - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { @@ -1852,11 +1923,11 @@ }, "unstable": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { diff --git a/home/c/default.nix b/home/c/default.nix index 2ea03a3..caf53a6 100644 --- a/home/c/default.nix +++ b/home/c/default.nix @@ -58,6 +58,7 @@ xh unzip just + wireshark inputs.nixvim.packages."x86_64-linux".default # nixvim ]; diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix index 0cc2c8d..6b513dd 100644 --- a/hosts/artemis/configuration.nix +++ b/hosts/artemis/configuration.nix @@ -19,7 +19,7 @@ users.users.c = { isNormalUser = true; - extraGroups = ["wheel" "networkmanager" "libvirtd" "dialout"]; + extraGroups = ["wheel" "networkmanager" "libvirtd" "dialout" "wireshark"]; openssh.authorizedKeys.keys = config.keys.c; shell = pkgs.fish; packages = with pkgs; []; diff --git a/hosts/artemis/containers.nix b/hosts/artemis/containers.nix index d48fd4d..2270540 100644 --- a/hosts/artemis/containers.nix +++ b/hosts/artemis/containers.nix @@ -1,5 +1,6 @@ {...}: { virtualisation = { + waydroid.enable = true; libvirtd.enable = true; podman = { enable = true; diff --git a/hosts/artemis/hardware-configuration.nix b/hosts/artemis/hardware-configuration.nix index ea77e71..e23395b 100644 --- a/hosts/artemis/hardware-configuration.nix +++ b/hosts/artemis/hardware-configuration.nix @@ -12,6 +12,10 @@ initrd.kernelModules = []; kernelModules = ["kvm-intel"]; extraModulePackages = []; + kernelParams = [ + "i915.enable_psr=0" + "i915.enable_fbc=0" + ]; #kernelPackages = pkgs.linuxPackages_latest; loader.systemd-boot.enable = lib.mkForce false; @@ -32,11 +36,12 @@ enable = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD - intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + intel-ocl libvdpau-va-gl vaapiVdpau intel-compute-runtime - unstable.vpl-gpu-rt + vpl-gpu-rt ]; }; diff --git a/hosts/artemis/programs.nix b/hosts/artemis/programs.nix index 363fae1..a345571 100644 --- a/hosts/artemis/programs.nix +++ b/hosts/artemis/programs.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { programs = { + wireshark.enable = true; fish.enable = true; seahorse.enable = true; nix-ld.enable = true; diff --git a/hosts/hermes/headscale.nix b/hosts/hermes/headscale.nix index 5555b0b..0160ead 100644 --- a/hosts/hermes/headscale.nix +++ b/hosts/hermes/headscale.nix @@ -8,7 +8,7 @@ in { port = 8080; settings = { server_url = "https://${domain}"; - dns_config = {base_domain = "cleslie.uk";}; + dns = {base_domain = "net.cleslie.uk";}; ip_prefixes = "100.64.0.0/10"; }; diff --git a/hosts/hermes/media.nix b/hosts/hermes/media.nix index c5c24b0..b2745c2 100644 --- a/hosts/hermes/media.nix +++ b/hosts/hermes/media.nix @@ -48,6 +48,12 @@ in { ]; }; + nixpkgs.config.permittedInsecurePackages = [ + "aspnetcore-runtime-6.0.36" + "aspnetcore-runtime-wrapped-6.0.36" + "dotnet-sdk-6.0.428" + "dotnet-sdk-wrapped-6.0.428" + ]; services = { caddy = { enable = true; diff --git a/packages/default.nix b/packages/default.nix index d7249c1..57b5e6c 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -12,7 +12,7 @@ nish = inputs'.nish.packages.default; nsbm = inputs'.nsbm.packages.default; jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override { - ffmpeg_6-full = pkgs.ffmpeg_6-full.override { + ffmpeg_7-full = pkgs.ffmpeg_7-full.override { withMfx = false; withVpl = true; };