diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index e89881e..f7bb6e6 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -75,11 +75,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1746023382, - "narHash": "sha256-AaT+V44rqEQbXvouwPnU7wJHiLR5Bq8uRvh7f+sOPgQ=", + "lastModified": 1746109800, + "narHash": "sha256-sjDpqdvbQaiA6OAsgLE4niz6hmmCpoUH0cl5zyfu6FI=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "1d54ddac1e8db612bea4f279a0ea48ab35f420be", + "rev": "9fe1aa7b6a1043003b38f36626dd29b52247d720", "type": "github" }, "original": { @@ -110,16 +110,16 @@ ] }, "locked": { - "lastModified": 1743127615, - "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", + "lastModified": 1745816321, + "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", + "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01", "type": "github" }, "original": { "owner": "lnl7", - "ref": "nix-darwin-24.11", + "ref": "master", "repo": "nix-darwin", "type": "github" } @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1745987135, - "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=", + "lastModified": 1746040799, + "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e", + "rev": "5f217e5a319f6c186283b530f8c975e66c028433", "type": "github" }, "original": { @@ -432,7 +432,7 @@ "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" }, "original": { "type": "tarball", @@ -492,11 +492,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745921652, - "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -607,11 +607,11 @@ ] }, "locked": { - "lastModified": 1745980514, - "narHash": "sha256-CITAeiuXGjDvT5iZBXr6vKVWQwsUQLJUMFO91bfJFC4=", + "lastModified": 1746067100, + "narHash": "sha256-6JeEbboDvRjLwB9kzCnmWj+f+ZnMtKOe5c2F1VBpaTs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7fbdae44b0f40ea432e46fd152ad8be0f8f41ad6", + "rev": "026e8fedefd6b167d92ed04b195c658d95ffc7a5", "type": "github" }, "original": { diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index d47019d..7649e93 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -16,7 +16,7 @@ helix.url = "github:helix-editor/helix/25.01.1"; stylix.url = "github:danth/stylix/release-24.11"; darwin = { - url = "github:lnl7/nix-darwin/nix-darwin-24.11"; + url = "github:lnl7/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/dot_config/flake/machines/hinge/darwin.nix b/dot_config/flake/machines/hinge/darwin.nix index 5f71d7b..1801c73 100644 --- a/dot_config/flake/machines/hinge/darwin.nix +++ b/dot_config/flake/machines/hinge/darwin.nix @@ -21,6 +21,7 @@ in { config = { allowUnfree = true; + allowUnsupportedSystem = true; }; hostPlatform = "aarch64-darwin"; @@ -43,7 +44,7 @@ in { shell = pkgs.fish; }; - security.pam.enableSudoTouchIdAuth = true; + security.pam.services.sudo_local.touchIdAuth = true; environment.systemPackages = with pkgs; [ pinentry_mac @@ -61,10 +62,13 @@ in { # android-tools jdk17 + # distrobox + conan deno basedpyright + taplo ]; homebrew = { @@ -96,6 +100,8 @@ in { "unzip" "xz" + "podman" + "llvm@18" "llvm@19" ]; @@ -103,9 +109,15 @@ in { casks = [ "firefox" "gpg-suite" + "cursor" ]; }; + services.jankyborders = { + enable = true; + active_color = "0xFF95bcf9"; + }; + services.aerospace = { enable = true; diff --git a/run_nix-rebuild.sh b/run_nix-rebuild.sh index 7f51762..a906d1c 100755 --- a/run_nix-rebuild.sh +++ b/run_nix-rebuild.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash [[ $(command -v nixos-rebuild) ]] && nh os switch ~/.config/flake -[[ $(command -v darwin-rebuild) ]] && darwin-rebuild switch --flake ~/.config/flake/ -[[ $(command -v home-manager) ]] && home-manager switch --flake ~/.config/flake/ +[[ $(command -v darwin-rebuild) ]] && nh darwin switch ~/.config/flake/ +[[ $(command -v home-manager) ]] && nh home switch ~/.config/flake/