diff --git a/flake.lock b/flake.lock index 7870d0d..6806899 100644 --- a/flake.lock +++ b/flake.lock @@ -3,14 +3,15 @@ "apple-silicon": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751622568, - "narHash": "sha256-EE3NBsej517VRa1x+ylAghrvngftxf1KgfHlE9OYyXE=", + "lastModified": 1756110286, + "narHash": "sha256-NE0HwcQCQTgM+HuYqmiemPf/5e+3fjwowceAyJj+ikU=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "eba4b40c816e5aff8951ae231ac237e8aab8ec1d", + "rev": "b99bf9bf7445416fe55da09034fc4a6cd733805c", "type": "github" }, "original": { @@ -26,11 +27,11 @@ ] }, "locked": { - "lastModified": 1751313918, - "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", + "lastModified": 1757015938, + "narHash": "sha256-1qBXNK/QxEjCqIoA2DxWn5gqM8rVxt+OxKodXu1GLTY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", + "rev": "eaacfa1101b84225491d2ceae9549366d74dc214", "type": "github" }, "original": { @@ -42,11 +43,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1688025799, - "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "lastModified": 1746162366, + "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", "owner": "nix-community", "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", "type": "github" }, "original": { @@ -80,11 +81,11 @@ ] }, "locked": { - "lastModified": 1751729568, - "narHash": "sha256-ay7O1jjalUxkL23QWLv9C2s8rdVGs3hUOPZClIbUHKs=", + "lastModified": 1757075491, + "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f117b383dd591fd579bce5ee7bac07a3fdc1d050", + "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", "type": "github" }, "original": { @@ -107,11 +108,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -123,11 +124,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751625545, - "narHash": "sha256-4E7wWftF1ExK5ZEDzj41+9mVgxtuRV3wWCId7QAYMAU=", + "lastModified": 1756911493, + "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c860cf0b3a0829f0f6cf344ca8de83a2bbfab428", + "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", "type": "github" }, "original": { @@ -176,6 +177,27 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "apple-silicon", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754847726, + "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "whisper": { "inputs": { "flake-utils": "flake-utils", diff --git a/hardware/capybara.nix b/hardware/capybara.nix index 1439291..bb31fce 100644 --- a/hardware/capybara.nix +++ b/hardware/capybara.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { @@ -23,7 +22,7 @@ }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/9248-31C6"; + device = "/dev/disk/by-uuid/5BCD-7078"; fsType = "vfat"; options = ["fmask=0022" "dmask=0022"]; }; diff --git a/home-manager/capybara-config.nix b/home-manager/capybara-config.nix index f751689..c4c367a 100644 --- a/home-manager/capybara-config.nix +++ b/home-manager/capybara-config.nix @@ -13,6 +13,8 @@ enable32Bit = true; }; + hardware.bluetooth.enable = true; + security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/home-manager/earthworm-config.nix b/home-manager/earthworm-config.nix index 6db7927..0e1a0bb 100644 --- a/home-manager/earthworm-config.nix +++ b/home-manager/earthworm-config.nix @@ -5,10 +5,7 @@ hardware.asahi.peripheralFirmwareDirectory = ./../firmware; hardware.asahi = { - useExperimentalGPUDriver = true; - experimentalGPUInstallMode = "overlay"; setupAsahiSound = true; - withRust = true; }; hardware.graphics.enable = true; hardware.bluetooth.enable = true; @@ -75,7 +72,6 @@ environment.systemPackages = [ pkgs.vim pkgs.wget - pkgs.mesa-asahi-edge ]; environment.loginShellInit = '' diff --git a/home-manager/home.nix b/home-manager/home.nix index 7988a2a..a877042 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -321,7 +321,6 @@ ++ ( if nixpkgs.stdenv.isLinux then [ - nixpkgs.ghostty nixpkgs.kdePackages.xwaylandvideobridge nixpkgs.protonmail-bridge nixpkgs.pinentry diff --git a/home-manager/modules/ghostty.nix b/home-manager/modules/ghostty.nix index b22c613..fe1f2bc 100644 --- a/home-manager/modules/ghostty.nix +++ b/home-manager/modules/ghostty.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { programs.ghostty = { - enable = true; + enable = pkgs.stdenv.isLinux; enableZshIntegration = true; settings = { keybind = [ @@ -9,7 +9,10 @@ }; }; - home.packages = [ - pkgs.ghostty - ]; + home.packages = + if pkgs.stdenv.isLinux + then [ + pkgs.ghostty + ] + else []; }