update to 24.05

kmein · Jun 3, 2024 · 1ffae8e · 1ffae8e
1 parent b8bf6b2
commit 1ffae8e
Show file tree

Hide file tree

Showing 24 changed files with 236 additions and 128 deletions.
diff --git a/configs/aerc.nix b/configs/aerc.nix
@@ -99,8 +99,7 @@ in {
           passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
           himalaya = {
             enable = true;
-            backend = "imap";
-            sender = "smtp";
+            settings.backend = "imap";
           };
           aerc.extraAccounts.pgp-key-id = "9EDE82CC72A343A95266D0F444857074A3ACC8B7";
         };

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
@@ -60,7 +60,7 @@ in {
     programs.alacritty = {
       enable = true;
       settings = {
-        key_bindings = [
+        keyboard.bindings = [
           {
             key = "Plus";
             mods = "Control";

diff --git a/configs/default.nix b/configs/default.nix
@@ -67,12 +67,10 @@ in {
         pkgs.capitaine-cursors
       ];
 
-      home-manager.users.me = {
-        home.pointerCursor = {
-          name = "capitaine-cursors-white";
-          package = pkgs.capitaine-cursors;
-          size = 12;
-        };
+      stylix.cursor = {
+        name = "capitaine-cursors-white";
+        package = pkgs.capitaine-cursors;
+        size = 12;
       };
     }
     {
@@ -121,19 +119,19 @@ in {
       };
     }
     {
+      services.displayManager = {
+        autoLogin = {
+          enable = true;
+          user = config.users.users.me.name;
+        };
+      };
       services.xserver = {
         enable = true;
-        displayManager = {
-          autoLogin = {
-            enable = true;
-            user = config.users.users.me.name;
-          };
-          lightdm = {
+        displayManager.lightdm = {
+          enable = true;
+          greeters.gtk = {
             enable = true;
-            greeters.gtk = {
-              enable = true;
-              indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
-            };
+            indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
           };
         };
       };
@@ -189,6 +187,7 @@ in {
     }
     {
       home-manager.users.me.home.stateVersion = "22.05";
+      home-manager.backupFileExtension = "bak";
     }
     {
       systemd.user.services.udiskie = {

diff --git a/configs/fu-berlin.nix b/configs/fu-berlin.nix
@@ -55,8 +55,7 @@ in {
             };
             himalaya = {
               enable = true;
-              backend = "imap";
-              sender = "smtp";
+              settings.backend = "imap";
             };
           });
     };

diff --git a/configs/hu-berlin.nix b/configs/hu-berlin.nix
@@ -75,8 +75,7 @@ in {
             aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
             himalaya = {
               enable = true;
-              backend = "imap";
-              sender = "smtp";
+              settings.backend = "imap";
             };
             signature = {
               showSignature = "append";
@@ -100,8 +99,7 @@ in {
             address = "[email protected]";
             himalaya = {
               enable = true;
-              backend = "imap";
-              sender = "smtp";
+              settings.backend = "imap";
             };
             aliases = ["${userName}@hu-berlin.de"];
             passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-dslalewa.path}";

diff --git a/configs/i3.nix b/configs/i3.nix
@@ -91,8 +91,8 @@ in {
 
   environment.systemPackages = [dashboard];
 
+  services.displayManager.defaultSession = "none+i3";
   services.xserver = {
-    displayManager.defaultSession = "none+i3";
     windowManager.i3 = {
       enable = true;
       package = pkgs.i3-gaps;

diff --git a/configs/keyboard.nix b/configs/keyboard.nix
@@ -18,16 +18,17 @@
   };
   defaultLanguage = "de";
 in {
+  services.libinput.enable = true;
+
   # man 7 xkeyboard-config
   services.xserver = {
     exportConfiguration = true; # link /usr/share/X11 properly
-    layout = "de";
+    xkb.layout = "de";
     # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
     # buckwalter: http://www.qamus.org/transliteration.htm
-    xkbVariant = "T3";
-    xkbOptions = commaSep xkbOptions;
-    libinput.enable = true;
-    xkbDir = pkgs.symlinkJoin {
+    xkb.variant = "T3";
+    xkb.options = commaSep xkbOptions;
+    xkb.dir = pkgs.symlinkJoin {
       name = "x-keyboard-directory";
       paths = [
         "${pkgs.xkeyboard_config}/etc/X11/xkb"

diff --git a/configs/packages.nix b/configs/packages.nix
@@ -168,7 +168,7 @@ in {
     niveumPackages.menu-calc
     nix-prefetch-git
     niveumPackages.nix-git
-    nixfmt
+    nixfmt-rfc-style
     par
     qrencode
 

diff --git a/configs/printing.nix b/configs/printing.nix
@@ -12,7 +12,7 @@ in {
   ];
 
   # allow connecting to .local printers
-  services.avahi.nssmdns = true;
+  services.avahi.nssmdns4 = true;
 
   hardware.printers.ensurePrinters = [
     {

diff --git a/configs/sound.nix b/configs/sound.nix
@@ -19,14 +19,6 @@
     publish.userServices = true;
   };
 
-  environment.etc."pipewire/pipewire-pulse.conf.d/50-network-party.conf".text = ''
-    context.exec = [
-      { path = "pactl" args = "load-module module-native-protocol-tcp" }
-      { path = "pactl" args = "load-module module-zeroconf-discover" }
-      { path = "pactl" args = "load-module module-zeroconf-publish" }
-    ]
-  '';
-
   environment.systemPackages = [
     pkgs.pavucontrol
     pkgs.ncpamixer