diff --git a/flake.lock b/flake.lock index ca54264..bdf09de 100644 --- a/flake.lock +++ b/flake.lock @@ -123,11 +123,11 @@ }, "nixos": { "locked": { - "lastModified": 1721548954, - "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", + "lastModified": 1725826545, + "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", "owner": "yshym", "repo": "nixpkgs", - "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", + "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1690704397, - "narHash": "sha256-sgIWjcz0e+x87xlKg324VtHgH55J5rIuFF0ZWRDvQoE=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "96e5a0a0e8568c998135ea05575a9ed2c87f5492", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -170,11 +170,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715220225, - "narHash": "sha256-X0xvboLSjfC5s/M1yuPdSdc6yzKV8536hTTWCSKF5Xc=", + "lastModified": 1725816686, + "narHash": "sha256-0Kq2MkQ/sQX1rhWJ/ySBBQlBJBUK8mPMDcuDhhdBkSU=", "owner": "yshym", "repo": "nixpkgs", - "rev": "ac34158a823c7596e0106c806d0b7df47885fa73", + "rev": "add0443ee587a0c44f22793b8c8649a0dbc3bb00", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 37002c5..28c5aac 100644 --- 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 `` should be replaced with your current host system + system = ""; pkgs = import nixpkgs { inherit system; overlays = [ diff --git a/home/default.nix b/home/default.nix index 4483626..9676b79 100644 --- 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 index cb239b5..1a000ba 100644 --- 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 index 7db97dd..289e2bf 100644 --- 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 index 5eeac8c..0003de3 100644 --- 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 index 7c540ec..2607c44 100644 --- 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 index 2cf63d1..520f25a 100644 --- 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 index fe72c5f..41380b2 100644 --- 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 index ac5fed7..11605b6 100644 --- 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"; }