diff --git a/flake.lock b/flake.lock index 5a91b6f..2df04df 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1764017209, + "narHash": "sha256-RoJGCtKExXXkNCZUmmxezG3eOczEOTBw38DaZGSYJC0=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "ec8eabe00c4ee9a2ddc50162c125f0ec2a7099e1", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762463231, - "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "lastModified": 1764080039, + "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "rev": "da17006633ca9cda369be82893ae36824a2ddf1a", "type": "github" }, "original": { @@ -237,16 +237,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "type": "indirect" } }, @@ -267,14 +267,17 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-lib_3": { @@ -294,11 +297,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -315,11 +318,11 @@ ] }, "locked": { - "lastModified": 1757450861, - "narHash": "sha256-7gCs5H0/GIK7ENywSkgSrLc+QTDYy8diTS6YxOw++RI=", + "lastModified": 1763752996, + "narHash": "sha256-jOSmN5AUZ99FU+0zjjqrSVSQkIOEv6QvHP5bAjYFK9o=", "owner": "Stunkymonkey", "repo": "passworts", - "rev": "f1c44a029e9521bfec7bd4b3439a6b3dc58ab5c5", + "rev": "d46857d78946fda7263b4ebfcbb5b28bc00f67ee", "type": "github" }, "original": { @@ -351,11 +354,11 @@ ] }, "locked": { - "lastModified": 1762659808, - "narHash": "sha256-2Kv2mANf+FRisqhpfeZ8j9firBxb23ZvEXwdcunbpGI=", + "lastModified": 1764021963, + "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "524312bc62e3f34bd9231a2f66622663d3355133", + "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8801ab0..e43d0b0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,7 @@ { description = "NixOS configuration"; inputs = { - # nix.url = "github:NixOS/nix"; - nixpkgs.url = "nixpkgs/nixos-25.05"; + nixpkgs.url = "nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/machines/core/core.nix b/machines/core/core.nix index b6f691e..bf21520 100644 --- a/machines/core/core.nix +++ b/machines/core/core.nix @@ -6,12 +6,12 @@ bind # dig borgbackup cryptsetup + delta fd # find replacement file fzf gettext git - gitAndTools.delta gptfdisk htop jq diff --git a/modules/hardware/graphics/default.nix b/modules/hardware/graphics/default.nix index ba01f81..4f9befe 100644 --- a/modules/hardware/graphics/default.nix +++ b/modules/hardware/graphics/default.nix @@ -31,23 +31,17 @@ in # Intel GPU (lib.mkIf (cfg.cpuFlavor == "intel") { nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; }; hardware.graphics.extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) - vaapiVdpau + intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + libva-vdpau-driver libvdpau-va-gl ]; }) (lib.mkIf (cfg.cpuFlavor == "amd") { - hardware.graphics.extraPackages = with pkgs; [ - amdvlk - ]; - hardware.graphics.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; }) ] ); diff --git a/modules/services/prowlarr/default.nix b/modules/services/prowlarr/default.nix index b4e761a..2d535c5 100644 --- a/modules/services/prowlarr/default.nix +++ b/modules/services/prowlarr/default.nix @@ -3,7 +3,6 @@ let cfg = config.my.services.prowlarr; inherit (config.networking) domain; - # in 25.05 this might be configurable port = 9696; in { @@ -22,6 +21,7 @@ in services = { prowlarr = { enable = true; + settings.server.port = port; }; prometheus.exporters.exportarr-prowlarr = { inherit (config.services.prometheus) enable; diff --git a/modules/services/radarr/default.nix b/modules/services/radarr/default.nix index 9df7e5d..86bffa0 100644 --- a/modules/services/radarr/default.nix +++ b/modules/services/radarr/default.nix @@ -3,7 +3,6 @@ let cfg = config.my.services.radarr; inherit (config.networking) domain; - # in 25.05 this might be configurable port = 7878; in { @@ -22,6 +21,7 @@ in services = { radarr = { enable = true; + settings.server.port = port; }; prometheus.exporters.exportarr-radarr = { inherit (config.services.prometheus) enable; diff --git a/modules/services/sonarr/default.nix b/modules/services/sonarr/default.nix index ffd50ea..db72aa9 100644 --- a/modules/services/sonarr/default.nix +++ b/modules/services/sonarr/default.nix @@ -3,7 +3,6 @@ let cfg = config.my.services.sonarr; inherit (config.networking) domain; - # in 25.05 this might be configurable port = 8989; in { @@ -28,6 +27,7 @@ in services = { sonarr = { enable = true; + settings.server.port = port; }; prometheus.exporters.exportarr-sonarr = { inherit (config.services.prometheus) enable; diff --git a/modules/services/vpn/default.nix b/modules/services/vpn/default.nix index 9ea0db3..d0b3a22 100644 --- a/modules/services/vpn/default.nix +++ b/modules/services/vpn/default.nix @@ -29,6 +29,7 @@ in inherit (cfg) port; settings = { dns.base_domain = "buehler.internal"; + dns.override_local_dns = false; server_url = "https://vpn.${domain}"; metrics_listen_addr = "127.0.0.1:8091"; log.level = "warn"; diff --git a/modules/services/webserver/default.nix b/modules/services/webserver/default.nix index 2716b2a..e6b6705 100644 --- a/modules/services/webserver/default.nix +++ b/modules/services/webserver/default.nix @@ -116,9 +116,7 @@ in email = "server@buehler.rocks"; globalConfig = '' - servers{ - metrics - } + metrics ''; extraConfig = '' (compress) { diff --git a/modules/system/fonts/default.nix b/modules/system/fonts/default.nix index 24d3412..830a81a 100644 --- a/modules/system/fonts/default.nix +++ b/modules/system/fonts/default.nix @@ -40,8 +40,7 @@ in noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji - noto-fonts-extra - ubuntu_font_family + ubuntu-classic unifont # unicode fallback ] ++ cfg.additionalFonts; diff --git a/profiles/desktop-apps/default.nix b/profiles/desktop-apps/default.nix index 95d1f0b..19f5638 100644 --- a/profiles/desktop-apps/default.nix +++ b/profiles/desktop-apps/default.nix @@ -18,7 +18,7 @@ in firefox (gimp-with-plugins.override { plugins = with gimpPlugins; [ - resynthesizer # disabled because broken with python3 + # resynthesizer # disabled because broken with python3 ]; }) kdePackages.ghostwriter @@ -34,7 +34,7 @@ in }) newsflash rhythmbox - tdesktop + telegram-desktop thunderbird vlc wayvnc diff --git a/profiles/desktop-dev/default.nix b/profiles/desktop-dev/default.nix index e1c0599..9fde498 100644 --- a/profiles/desktop-dev/default.nix +++ b/profiles/desktop-dev/default.nix @@ -18,7 +18,7 @@ in chromium dbeaver-bin filezilla - fritzing + # fritzing # disabled because broken gnome-font-viewer imhex # hex editor inlyne diff --git a/profiles/development/default.nix b/profiles/development/default.nix index cc5e74a..1d0afa0 100644 --- a/profiles/development/default.nix +++ b/profiles/development/default.nix @@ -36,7 +36,7 @@ in pandas pillow plotly - scikitlearn + scikit-learn scipy tqdm # progressbar in pandas wheel # python development diff --git a/profiles/gaming/default.nix b/profiles/gaming/default.nix index 3712ffc..51d70ec 100644 --- a/profiles/gaming/default.nix +++ b/profiles/gaming/default.nix @@ -17,14 +17,14 @@ in blobby discord gamemode - minetest + luanti moonlight-qt # steam-link stream openttd prismlauncher # replace minecraft - superTuxKart - steam SDL SDL2 + steam + superTuxKart wine winetricks ]; diff --git a/profiles/media/default.nix b/profiles/media/default.nix index 89b17e6..ba6d47a 100644 --- a/profiles/media/default.nix +++ b/profiles/media/default.nix @@ -26,16 +26,15 @@ in mediaelch # video sorting metadata-cleaner # mat2-gui mp3gain # audio volume - mp3splt # splitting mp3 files mp3val # audio validation pdfgrep # grep in pdfs - unstable.pdfsam-basic # pdf editing + pdfsam-basic # pdf editing picard # music tagging projectm-sdl-cpp # visualization of music puddletag # audio tagging shotwell # photo management sonixd # cloud-music-player - soundkonverter # audio converter + soundconverter # audio converter varia # download (yt-dlp.override { withAlias = true; }) # video download ]; diff --git a/profiles/meeting/default.nix b/profiles/meeting/default.nix index 99656d9..24fb118 100644 --- a/profiles/meeting/default.nix +++ b/profiles/meeting/default.nix @@ -17,7 +17,7 @@ in element-desktop fractal mumble - teamspeak5_client + teamspeak6-client ]; }; } diff --git a/profiles/usb-iso/default.nix b/profiles/usb-iso/default.nix index bc66209..2ce961a 100644 --- a/profiles/usb-iso/default.nix +++ b/profiles/usb-iso/default.nix @@ -15,10 +15,10 @@ in config = lib.mkIf cfg.enable { # binary blobs are needed for ventoy nixpkgs.config.permittedInsecurePackages = [ - "ventoy-1.1.05" + "ventoy-1.1.07" ]; environment.systemPackages = with pkgs; [ - ventoy-bin-full # general + ventoy-full # general woeusb-ng # windows ]; };