From 6677d36d87781e6b41f7158a589d474d33e1e9de Mon Sep 17 00:00:00 2001
From: Valentin Brandl <mail@vbrandl.net>
Date: Sat, 15 Jun 2024 16:02:25 +0200
Subject: [PATCH] Update to nixos 24.05

---
 flake.nix                  |  4 ++--
 home/mail/default.nix      |  4 ++--
 home/qt.nix                |  2 +-
 home/zsh.nix               |  2 +-
 machines/common.nix        | 15 ++++++++++-----
 machines/dev.nix           |  4 ++--
 machines/entertainment.nix |  3 +++
 machines/morpheus.nix      |  2 +-
 8 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7d4ce3b..26ed3c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,11 @@
 {
   inputs = {
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-23.11";
+      url = "github:nixos/nixpkgs/nixos-24.05";
     };
     nixpkgs-unstable = {
       url = "github:nixos/nixpkgs/nixos-unstable";
diff --git a/home/mail/default.nix b/home/mail/default.nix
index 7138b82..3f0acb7 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -75,7 +75,7 @@ in {
   home.packages = with pkgs; [
     libsecret
     libnotify
-    urlview
+    urlscan
   ];
   home.file.mailcap = {
     target = ".mailcap";
@@ -114,7 +114,7 @@ in {
     macros = [
       { map = [ "pager" "index" ];
         key = "B";
-        action = "|urlview\\n";
+        action = "|urlscan\\n";
       }
       /*{ map = [ "pager" "index" ];
         key = "dd";
diff --git a/home/qt.nix b/home/qt.nix
index d0ac808..e2f6617 100644
--- a/home/qt.nix
+++ b/home/qt.nix
@@ -1,6 +1,6 @@
 { ... }: {
   qt = {
     enable = true;
-    platformTheme = "gtk";
+    platformTheme.name = "gtk";
   };
 }
diff --git a/home/zsh.nix b/home/zsh.nix
index ff3b100..f50c52d 100644
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }: {
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
     enableCompletion = true;
     autocd = true;
     dotDir = ".config/zsh";
diff --git a/machines/common.nix b/machines/common.nix
index 0c12c73..9c2c2c5 100644
--- a/machines/common.nix
+++ b/machines/common.nix
@@ -1,7 +1,7 @@
 inputs:
 { config, lib, pkgs, ... }: {
   nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nixStable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
@@ -86,14 +86,19 @@ inputs:
       enable = true;
     };
 
+    displayManager = {
+      defaultSession = "none+i3";
+    };
+
     xserver = {
       enable = true;
 
-      layout = "eu";
-      xkbOptions = "caps:escape";
+      xkb = {
+        options = "caps:escape";
+        layout = "eu";
+      };
 
       displayManager = {
-        defaultSession = "none+i3";
         lightdm.enable = true;
       };
 
@@ -174,7 +179,7 @@ inputs:
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
     };
     thunar = {
       enable = true;
diff --git a/machines/dev.nix b/machines/dev.nix
index 844c9cf..ac549aa 100644
--- a/machines/dev.nix
+++ b/machines/dev.nix
@@ -13,7 +13,7 @@ inputs:
     binutils
     curl
     htop
-    nixfmt
+    nixfmt-classic
     ripgrep
     shellcheck
     tmux
@@ -32,7 +32,7 @@ inputs:
     #idea.idea-community
     unstable.jetbrains.idea-community
 
-    dbeaver
+    dbeaver-bin
   ];
 
   services.lorri.enable = true;
diff --git a/machines/entertainment.nix b/machines/entertainment.nix
index 38c173a..1fb3fbc 100644
--- a/machines/entertainment.nix
+++ b/machines/entertainment.nix
@@ -11,6 +11,9 @@ inputs:
     spotify
     vlc
 
+    # podcast app with nextcloud sync
+    libsForQt5.kasts
+
     teamspeak_client
 
     # support both 32- and 64-bit applications
diff --git a/machines/morpheus.nix b/machines/morpheus.nix
index 7cb48df..426edd7 100644
--- a/machines/morpheus.nix
+++ b/machines/morpheus.nix
@@ -37,7 +37,7 @@ inputs.nixpkgs.lib.nixosSystem {
       };
       services = {
         # enable touchpad support
-        xserver.libinput.enable = true;
+        libinput.enable = true;
         blueman.enable = true;
         snapper.configs = {
           home = {