From 9e54a6f68dde9378d356cc71e638558bff70627c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20R=C3=B6ger?= Date: Fri, 12 Dec 2025 19:18:09 +0100 Subject: [PATCH] System Gen120 @ 2025-12-12-19:18:08 by jonas@monolith --- flake.lock | 34 +++++++++++++-------------- flake.nix | 4 ++-- hosts/monolith/configuration.nix | 13 +++++++++- modules/programs/games.nix | 3 +-- pkgs/default.nix | 2 +- pkgs/spotify-shortcuts/derivation.nix | 2 ++ 6 files changed, 35 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 2eca0a6..373afc9 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1765425862, - "narHash": "sha256-HQcdXuF2hG0O9WnDn6PieqBAwueTQ48ae92H7bRiS0I=", + "lastModified": 1765489453, + "narHash": "sha256-wLSrwiYr7ck5jN56lJp8YzWuLk5dpRd1v+8Ta7ru608=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f695233e74322af84dc17af16f7e2ad419d309a8", + "rev": "c3e6306094f23d57c40f7fba007303fba4db0ba9", "type": "gitlab" }, "original": { @@ -157,16 +157,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1765384171, + "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -248,11 +248,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765414245, - "narHash": "sha256-4ReuIaR6nPVdBTnn/26nwJR+gefbVd0NUJvmJRswM4c=", + "lastModified": 1765543676, + "narHash": "sha256-2qaLZ7kqerWXIZpICR/6lkR0J/EEwiS/uYkdhUXv8Sw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9aa313402b1be3df2925076bb1292d03e68bb47f", + "rev": "69db0bcae640410b6c587cb0ffd0c89bc8166ff0", "type": "github" }, "original": { @@ -585,16 +585,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765363881, - "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", + "lastModified": 1765311797, + "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", + "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -721,11 +721,11 @@ ] }, "locked": { - "lastModified": 1765231718, - "narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=", + "lastModified": 1765553226, + "narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e", + "rev": "496a6f625f63b780ce849891868f2fad22fd49c6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 721d768..90c37d8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { diff --git a/hosts/monolith/configuration.nix b/hosts/monolith/configuration.nix index 7409cbc..233cb14 100644 --- a/hosts/monolith/configuration.nix +++ b/hosts/monolith/configuration.nix @@ -131,7 +131,18 @@ virtualisation.docker.enable = true; # Corsair drivers - hardware.ckb-next.enable = true; + hardware.ckb-next = { + enable = true; + # Workarount until https://github.com/NixOS/nixpkgs/issues/444209 + # is fixed + package = pkgs.ckb-next.overrideAttrs (prev: { + cmakeFlags = + (prev.cmakeFlags or []) + ++ [ + "-DUSE_DBUS_MENU=0" + ]; + }); + }; # dpi correction services.xserver.dpi = 91; diff --git a/modules/programs/games.nix b/modules/programs/games.nix index 1a07e9d..0452b6e 100644 --- a/modules/programs/games.nix +++ b/modules/programs/games.nix @@ -63,8 +63,7 @@ in { ++ lib.optionals cfg.wine [ pkgs.wine pkgs.winetricks - ] - ++ lib.optional (cfg.steam && cfg.wine) pkgs.proton-caller; + ]; programs.steam = lib.mkIf cfg.steam { enable = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index 77c14cb..4d44645 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,7 +2,7 @@ final: _: { hive = { crossover = final.callPackage ./crossover.nix {}; bulk-transcode = final.callPackage ./bulk-transcode {}; - spotify-shortcuts = final.callPackage ./spotify-shortcuts {}; + spotify-shortcuts = final.callPackage ./spotify-shortcuts/derivation.nix {}; layan-qt6 = final.kdePackages.callPackage ./layan-qt6.nix {}; }; } diff --git a/pkgs/spotify-shortcuts/derivation.nix b/pkgs/spotify-shortcuts/derivation.nix index 8906869..4bfa123 100644 --- a/pkgs/spotify-shortcuts/derivation.nix +++ b/pkgs/spotify-shortcuts/derivation.nix @@ -3,5 +3,7 @@ with python3Packages; buildPythonApplication { name = "spotify-shortcuts"; propagatedBuildInputs = [spotipy pyxdg desktop-notifier]; + pyproject = true; + build-system = [setuptools]; src = ./.; }