flake.lock: Update

Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e' (2024-06-07) → 'github:NixOS/nixpkgs/57d6973abba7ea108bac64ae7629e7431e0199b6' (2024-06-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2819fffa7fa42156680f0d282c60d81e8fb185b7' (2024-06-09) → 'github:NixOS/nixpkgs/cc54fb41d13736e92229c21627ea4f22199fee6b' (2024-06-12) • Updated input 'nur': 'github:nix-community/NUR/c259254742217b3278f251c92945b49ac7f1d6a4' (2024-06-10) → 'github:nix-community/NUR/ab6a53f69d8baa1b454fecffb271015588466e51' (2024-06-13)
Merge branch '24.05-migration' into mainline
2024-06-13 21:41:06 +02:00 · 2024-06-11 22:46:28 +02:00 · 2024-06-11 22:44:40 +02:00 · 2024-06-11 21:01:32 +02:00 · 2024-06-11 07:36:07 +02:00
10 changed files with 58 additions and 59 deletions
--- a/common/default.nix
+++ b/common/default.nix
@ -139,18 +139,20 @@ in

  # FIXME: at some point, hide GUI and sound (desktop vs. server) behind an option
  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-  services.xserver.layout = "de";
-  services.xserver.xkbOptions = "eurosign:e";
+  services.xserver = {
+    enable = true;
+    xkb.layout = "de";
+    xkb.options = "eurosign:e";
+  };

  # Enable touchpad support.
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;

  # while libinput also supports graphic tablets, enable more-specific wacom driver
  services.xserver.wacom.enable = true;

  # Enable the KDE Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
+  services.displayManager.sddm.enable = true;
  services.xserver.desktopManager.plasma5.enable = true;

  # dconf required for several Gnome applications
--- a/common/pipewire.nix
+++ b/common/pipewire.nix
@ -9,18 +9,17 @@
    pulse.enable = true;
    # If you want to use JACK applications, uncomment this
    #jack.enable = true;
+
+    wireplumber.configPackages = [
+      (pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
+        bluez_monitor.properties = {
+            ["bluez5.enable-sbc-xq"] = true,
+            ["bluez5.enable-msbc"] = true,
+            ["bluez5.enable-hw-volume"] = true,
+            ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+        }
+      '')
+    ];
  };
  environment.systemPackages = [ pkgs.easyeffects ];
-
-  # TODO: can be done in a simpler way in 24.05, see wiki.nixos.org
-  environment.etc = {
-    "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
-      bluez_monitor.properties = {
-        ["bluez5.enable-sbc-xq"] = true,
-        ["bluez5.enable-msbc"] = true,
-        ["bluez5.enable-hw-volume"] = true,
-        ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
-      }
-    '';
-  };
 }
--- a/flake.lock
+++ b/flake.lock
@ -117,16 +117,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1706981411,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
+        "lastModified": 1717527182,
+        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
+        "rev": "845a5c4c073f74105022533907703441e0464bc3",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -179,11 +179,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713946171,
-        "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
+        "lastModified": 1717976995,
+        "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
+        "rev": "315aa649ba307704db0b16c92f097a08a65ec955",
        "type": "github"
      },
      "original": {
@ -194,11 +194,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1715148395,
-        "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
+        "lastModified": 1717995329,
+        "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
+        "rev": "58b52b0dd191af70f538c707c66c682331cfdffc",
        "type": "github"
      },
      "original": {
@ -210,11 +210,11 @@
    },
    "nixos-unstable": {
      "locked": {
-        "lastModified": 1717196966,
-        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
+        "lastModified": 1718160348,
+        "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
        "type": "github"
      },
      "original": {
@ -258,27 +258,27 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1717159533,
-        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
+        "lastModified": 1718208800,
+        "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nur": {
      "locked": {
-        "lastModified": 1717452470,
-        "narHash": "sha256-8sbx/PhdKokC7FzogVk/fDVaKlJp9RNhE53tmSpZJyg=",
+        "lastModified": 1718307570,
+        "narHash": "sha256-Wkw/8Lkyd14op+zPx8XC/CRNyMMGC64m98aOWSEFmU4=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "c4f24fd0d45f73f969e58dfccfea5e5fa068d872",
+        "rev": "ab6a53f69d8baa1b454fecffb271015588466e51",
        "type": "github"
      },
      "original": {
@ -394,11 +394,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1710278050,
-        "narHash": "sha256-Oc6BP7soXqb8itlHI8UKkdf3V9GeJpa1S39SR5+HJys=",
+        "lastModified": 1717850719,
+        "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "35791f76524086ab4b785a33e4abbedfda64bd22",
+        "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
        "type": "github"
      },
      "original": {
@ -412,11 +412,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -2,11 +2,11 @@
  description = "NixOS system flake";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
    nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
    home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    lanzaboote = {
--- a/home/common.nix
+++ b/home/common.nix
@ -146,4 +146,10 @@
  home.sessionVariables = {
    EDITOR = "nvim";
  };
+
+  home.activation.reportChanges = config.lib.dag.entryAnywhere ''
+    if [[ -v oldGenPath ]]; then
+      run nix store diff-closures $oldGenPath $newGenPath
+    fi
+  '';
 }
--- a/home/desktop.nix
+++ b/home/desktop.nix
@ -70,7 +70,7 @@
  services.gpg-agent = {
    enable = true;
    #enableSshSupport = true;
-    pinentryFlavor = "qt";
+    pinentryPackage = pkgs.pinentry-qt;
  };

  programs.ssh = {
--- a/home/modules/fonts.nix
+++ b/home/modules/fonts.nix
@ -14,7 +14,7 @@
    ubuntu_font_family
    twemoji-color-font
    open-sans
-    (iosevka-bin.override { variant = "curly-slab"; })
+    (iosevka-bin.override { variant = "CurlySlab"; })
    config.nur.repos.schmittlauch.vollkorn
    # TODO: humor-sans

--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@ -122,6 +122,7 @@ let
    ];

  pythonTools = with python3Packages; [
+    python3   # to shadow old macOS python
    notebook
    ipython
    pip
--- a/home/modules/vscodium.nix
+++ b/home/modules/vscodium.nix
@ -1,5 +1,6 @@
 {
  pkgs,
+  lib,
  inputs,
  config,
  system,
@ -75,7 +76,7 @@
          "editor.formatOnSave" = false;
          "editor.formatOnType" = false;
        };
-        "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt";
+        "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
        "editor.fontSize" = 13;
        "editor.fontWeight" = "normal";
        "git.detectSubmodulesLimit" = 30;
--- a/packages/default.nix
+++ b/packages/default.nix
@ -1,11 +1 @@
-final: prev: {
-  power-profiles-daemon = prev.power-profiles-daemon.overrideAttrs (old: {
-    patches = [
-      # patch for AMD pstate CPUs
-      (final.fetchpatch {
-        url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/127.patch";
-        sha256 = "sha256-CneqixlpZx9iZ0PM5MFIutsvnqKrLlM7FHOHUA/MK6g=";
-      })
-    ];
-  });
-}
+final: prev: { }
Author	SHA1	Message	Date
Trolli Schmittlauch	67d3404631	flake.lock: Update Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e' (2024-06-07) → 'github:NixOS/nixpkgs/57d6973abba7ea108bac64ae7629e7431e0199b6' (2024-06-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2819fffa7fa42156680f0d282c60d81e8fb185b7' (2024-06-09) → 'github:NixOS/nixpkgs/cc54fb41d13736e92229c21627ea4f22199fee6b' (2024-06-12) • Updated input 'nur': 'github:nix-community/NUR/c259254742217b3278f251c92945b49ac7f1d6a4' (2024-06-10) → 'github:nix-community/NUR/ab6a53f69d8baa1b454fecffb271015588466e51' (2024-06-13)	2024-06-13 21:41:06 +02:00
Trolli Schmittlauch	774d08edff	Merge branch '24.05-migration' into mainline	2024-06-11 22:46:28 +02:00
Trolli Schmittlauch	4861e06380	home-manager: show package diff at activation	2024-06-11 22:44:40 +02:00
Trolli Schmittlauch	baa0dd00f6	home packages: add python	2024-06-11 21:01:32 +02:00
Trolli Schmittlauch	563811c3ba	update to NixOS 24.05	2024-06-11 07:36:07 +02:00