From 998b639fb3ec4d86e2578b9e95ba6d4f69d50a95 Mon Sep 17 00:00:00 2001 From: 0xrsydn Date: Fri, 26 Sep 2025 16:10:07 +0700 Subject: [PATCH] chore:fix nix --- modules/darwin/system.nix | 11 +++++------ modules/home/rsydn/base.nix | 2 ++ modules/home/rsydn/programs/neovim.nix | 6 +++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix index 8e8a9ca..60da3f8 100644 --- a/modules/darwin/system.nix +++ b/modules/darwin/system.nix @@ -1,8 +1,6 @@ -{ config, pkgs, lib, ... }: { +{ config, pkgs, lib, user, ... }: { imports = [ ./homebrew.nix ./devtools.nix ]; - services.nix-daemon.enable = true; - nix = { package = pkgs.nix; extraOptions = '' @@ -11,9 +9,9 @@ ''; settings = { experimental-features = [ "nix-command" "flakes" ]; - auto-optimise-store = true; warn-dirty = false; }; + optimise.automatic = true; gc = { automatic = true; interval = { @@ -26,7 +24,8 @@ }; system = { - stateVersion = "24.05"; + primaryUser = user; + stateVersion = 6; defaults = { NSGlobalDomain = { @@ -46,5 +45,5 @@ }; }; - security.pam.enableSudoTouchIdAuth = true; + security.pam.services.sudo_local.touchIdAuth = true; } diff --git a/modules/home/rsydn/base.nix b/modules/home/rsydn/base.nix index 660b970..bbfd0c8 100644 --- a/modules/home/rsydn/base.nix +++ b/modules/home/rsydn/base.nix @@ -1,4 +1,6 @@ { config, pkgs, lib, ... }: { + home.stateVersion = "24.05"; + imports = [ ./programs/helix.nix ./programs/neovim.nix diff --git a/modules/home/rsydn/programs/neovim.nix b/modules/home/rsydn/programs/neovim.nix index a34a620..885a4a7 100644 --- a/modules/home/rsydn/programs/neovim.nix +++ b/modules/home/rsydn/programs/neovim.nix @@ -1,7 +1,11 @@ { inputs, pkgs, ... }: let system = pkgs.stdenv.hostPlatform.system; - lazyvim = inputs."nvim-bundle".packages.${system}.neovim; + lazyvim = let nvimPackages = inputs."nvim-bundle".packages; + in if builtins.hasAttr system nvimPackages then + (builtins.getAttr system nvimPackages).neovim + else + pkgs.neovim; # upstream bundle only exports x86_64-linux for now in { programs.neovim = { enable = true;