From 97540d460a79f47a9011dba92c6ecf3e14547678 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 6 Feb 2024 09:23:59 -0600 Subject: [PATCH] macOS --- flake.nix | 19 +++++++++++++++++++ modules/home-manager/macos.nix | 1 + nixos/foxtrot.nix | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b9c17f6..b5d5ace 100644 --- a/flake.nix +++ b/flake.nix @@ -118,6 +118,25 @@ linux ]; }; + work = forAllSystems ( + system: + home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; + extraSpecialArgs = { + inherit inputs outputs system; + inherit (outputs) colors font; + }; + modules = with outputs.homeManagerModules; [ + common + { + home.homeDirectory = "/Users/daniel.flanagan"; + home.username = "daniel.flanagan"; + home.stateVersion = "24.05"; + } + macos + ]; + } + ); }; # Disk partition schemes and functions diff --git a/modules/home-manager/macos.nix b/modules/home-manager/macos.nix index 5e0610d..2f92095 100644 --- a/modules/home-manager/macos.nix +++ b/modules/home-manager/macos.nix @@ -2,6 +2,7 @@ imports = with outputs.homeManagerModules; [ common desktop + pass ]; # TODO: pinentry curses? diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index 9f51b32..b6c283a 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -141,9 +141,9 @@ in { services.logind = { lidSwitch = "suspend-then-hibernate"; + # HandleLidSwitchDocked=ignore extraConfig = '' HandlePowerKey=suspend-then-hibernate - HandleLidSwitchDocked=ignore IdleAction=suspend-then-hibernate IdleActionSec=10m '';