Update nixos to 24.05

yshym · Sep 14, 2024 · 1cb770c · 1cb770c
1 parent 93b03f5
commit 1cb770c
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 20 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -40,8 +40,8 @@
       inherit (flake-utils.lib) eachSystem;
 
       supportedSystems = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
-      # NOTE `system` should be replaced with your current host system
-      system = "aarch64-darwin";
+      # NOTE `<system>` should be replaced with your current host system
+      system = "<system>";
       pkgs = import nixpkgs {
         inherit system;
         overlays = [

diff --git a/home/default.nix b/home/default.nix
@@ -5,5 +5,5 @@
     ++ (lib.my.mapModulesRec' ./modules import);
   # HACK https://github.com/nix-community/home-manager/issues/2595
   manual.manpages.enable = false;
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 }
diff --git a/home/modules/editors/emacs/default.nix b/home/modules/editors/emacs/default.nix
@@ -11,7 +11,7 @@ let
     { system = pkgs.stdenv.system; }).emacs29;
   # emacsGit is a legacy package name
   emacs-git = pkgs.emacsGit;
-  emacs = if pkgs.stdenv.isDarwin then emacs29 else pkgs.emacsPgtkGcc;
+  emacs = if pkgs.stdenv.isDarwin then emacs29 else emacsPgtk;
   # emacs =
   #   if pkgs.stdenv.isDarwin then
   #     emacs-git.overrideAttrs
@@ -22,7 +22,7 @@ let
   #         ]);
   #       })
   #   else
-  #     pkgs.emacsPgtkGcc;
+  #     pkgs.emacsPgtk;
 in
 {
   config = mkIf cfg.enable {

diff --git a/home/modules/shell/mimi/default.nix b/home/modules/shell/mimi/default.nix
@@ -1,7 +1,15 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-let cfg = config.programs.mimi; in
+let
+  cfg = config.programs.mimi;
+  xdg-utils = (import
+    (fetchTarball {
+      url = "https://github.com/abathur/nixpkgs/archive/fix_xdg-utils_mimisupport.tar.gz";
+      sha256 = "1agvcfkqpgy3h0cqh76zb643wvv368h3sk4dfahsnmf3g46d8szh";
+    })
+    { system = pkgs.stdenv.system; }).xdg-utils;
+in
 {
   options.programs.mimi = {
     enable = mkEnableOption "Mimi";

diff --git a/hosts/fl/default.nix b/hosts/fl/default.nix
@@ -8,7 +8,7 @@ with lib.my; {
     tmp.cleanOnBoot = true;
     kernelPackages = pkgs.linuxPackages_6_6;
     resumeDevice = "/dev/disk/by-label/swap";
-    kernelParams = [ "mem_sleep_default=deep" "usbcore.autosuspend=-1" "resume_offset=0" ];
+    kernelParams = [ "mem_sleep_default=deep" "usbcore.autosuspend=-1" ];
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
@@ -28,7 +28,16 @@ with lib.my; {
   };
 
   services = {
+    fwupd.enable = true;
     geoclue2.enable = true;
+    logind = {
+      lidSwitch = "suspend-then-hibernate";
+      extraConfig = ''
+        HandlePowerKey=suspend-then-hibernate
+        IdleAction=suspend-then-hibernate
+        IdleActionSec=30m
+      '';
+    };
     pipewire = {
       enable = true;
       alsa = {
@@ -97,6 +106,8 @@ with lib.my; {
     };
   };
 
+  systemd.sleep.extraConfig = "HibernateDelaySec=30s";
+
   security = {
     pam = {
       yubico = {

diff --git a/hosts/fl/hardware.nix b/hosts/fl/hardware.nix
@@ -1,7 +1,7 @@
 { config, inputs, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ inputs.nixos-hardware.nixosModules.framework (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports = [ inputs.nixos-hardware.nixosModules.framework-11th-gen-intel (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
     initrd = {

diff --git a/hosts/fl/home/services/sway/default.nix b/hosts/fl/home/services/sway/default.nix
@@ -12,6 +12,8 @@ in
 {
   config = {
     wayland.windowManager.sway = {
+      # HACK https://github.com/nix-community/home-manager/issues/5311
+      checkConfig = false;
       enable = true;
       systemd.enable = true;
       xwayland = false;

diff --git a/hosts/fl/home/themes.nix b/hosts/fl/home/themes.nix
@@ -19,7 +19,7 @@ with pkgs; {
   };
   qt = {
     enable = true;
-    platformTheme = "gtk";
+    platformTheme.name = "gtk";
   };
 
   home.packages = [ dconf bibata-cursors ];

diff --git a/platforms/nixos/default.nix b/platforms/nixos/default.nix
@@ -17,11 +17,11 @@ with pkgs; {
 
   security = { sudo.wheelNeedsPassword = false; };
 
-  programs = { gnupg.agent.pinentryFlavor = "curses"; zsh.enable = true; };
+  programs = { gnupg.agent.pinentryPackage = pinentry; zsh.enable = true; };
 
   services = { openssh = { enable = true; }; };
 
   i18n.extraLocaleSettings = { LC_TIME = "en_GB.UTF-8"; };
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 }