From be1707a65455f06adeaf075f2a9867b257d295fb Mon Sep 17 00:00:00 2001 From: "Agatha V. Lovelace" Date: Wed, 21 May 2025 00:52:13 +0200 Subject: [PATCH] The Macbookening --- common/home_manager/common.nix | 2 +- flake.lock | 160 +++++------------------- flake.nix | 30 ++--- hosts/ritual/configuration.nix | 2 +- hosts/ritual/hardware-configuration.nix | 67 ---------- 5 files changed, 43 insertions(+), 218 deletions(-) delete mode 100644 hosts/ritual/hardware-configuration.nix diff --git a/common/home_manager/common.nix b/common/home_manager/common.nix index 67e1608..950411b 100644 --- a/common/home_manager/common.nix +++ b/common/home_manager/common.nix @@ -12,7 +12,7 @@ home.username = "agatha"; home.homeDirectory = lib.mkDefault "/home/agatha"; # Fallback for nix-darwin - home.stateVersion = if pkgs.stdenv.isLinux then config.system.stateVersion else "24.05"; + home.stateVersion = if pkgs.stdenv.isLinux then config.system.stateVersion else "24.11"; home.packages = with pkgs; [ bat btop diff --git a/flake.lock b/flake.lock index 21f6c97..648a8d7 100644 --- a/flake.lock +++ b/flake.lock @@ -44,21 +44,6 @@ "type": "github" } }, - "crane": { - "locked": { - "lastModified": 1727974419, - "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", - "owner": "ipetkov", - "repo": "crane", - "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -111,11 +96,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -125,24 +110,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -192,29 +159,6 @@ "url": "https://git.xenua.me/xenua/fedi-frq-friend" } }, - "helix": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1734878912, - "narHash": "sha256-M1uvMQUY9yuzlLlDYbP2LjBrolkGiYVKIRRwlxWYyTg=", - "owner": "helix-editor", - "repo": "helix", - "rev": "ea17b9edb708bc5ea26fec95dda66a6f45753545", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -222,11 +166,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -239,20 +183,20 @@ "lix": { "flake": false, "locked": { - "lastModified": 1729298361, - "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", - "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", + "lastModified": 1737234286, + "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", + "rev": "079528098f5998ba13c88821a2eca1005c1695de", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" } }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -260,15 +204,15 @@ ] }, "locked": { - "lastModified": 1732605668, - "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", - "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe", + "lastModified": 1742943028, + "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", + "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" } }, "lowdown-src": { @@ -312,7 +256,7 @@ "mms": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nix": "nix", "nixpkgs": [ "nixpkgs" @@ -419,15 +363,16 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "type": "github" }, "original": { "owner": "LnL7", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } @@ -448,11 +393,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1734761983, - "narHash": "sha256-U1kYa/N53vruy1E/E/n7NxsJDbTkVQmC7TCdTeNieSE=", + "lastModified": 1747514354, + "narHash": "sha256-ohO4Uox8WzonwEtxNvr1SsDbvnZLilxrqco1u0bEWHU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d38b1bc9ef4bf6ca6726e0681895e1c3e8215a49", + "rev": "a3552bafe05e3c2f24e6bc6482135837984f7073", "type": "github" }, "original": { @@ -480,11 +425,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734435836, - "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", + "lastModified": 1747728033, + "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4989a246d7a390a859852baddb1013f825435cee", + "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", "type": "github" }, "original": { @@ -542,11 +487,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734737257, - "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", + "lastModified": 1747676747, + "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", + "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", "type": "github" }, "original": { @@ -577,7 +522,6 @@ "ccase": "ccase", "colmena": "colmena", "frq-friend": "frq-friend", - "helix": "helix", "home-manager": "home-manager", "lix-module": "lix-module", "matrix-ril100": "matrix-ril100", @@ -590,27 +534,6 @@ "vampysite": "vampysite" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728268235, - "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "stable": { "locked": { "lastModified": 1669735802, @@ -717,21 +640,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "url-eater": { "inputs": { "naersk": "naersk_3", @@ -792,7 +700,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1687709756, @@ -810,7 +718,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -828,7 +736,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, diff --git a/flake.nix b/flake.nix index e084747..f9362bb 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -17,7 +17,7 @@ }; nix-darwin = { - url = "github:LnL7/nix-darwin"; + url = "github:LnL7/nix-darwin/nix-darwin-24.11"; inputs.nixpkgs.follows = "nixpkgs-darwin"; }; @@ -44,11 +44,6 @@ frq-friend.url = "git+https://git.xenua.me/xenua/fedi-frq-friend"; - helix = { - url = "github:helix-editor/helix"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - ccase = { url = "github:rutrum/ccase"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -63,7 +58,6 @@ home-manager, nix-darwin, mms, - helix, url-eater, matrix-ril100, frq-friend, @@ -75,24 +69,14 @@ let mkOverlays = system: config: [ (final: prev: { - helix = - let - helix-pkgs = helix.packages.${final.system}; - in - helix-pkgs.helix.passthru.wrapper ( - helix-pkgs.helix-unwrapped.overrideAttrs { - preInstall = '' - substituteInPlace contrib/Helix.desktop \ - --replace "Exec=hx %F" "Exec=kitty hx %F" \ - --replace "Terminal=true" "Terminal=false" - ''; - } - ); frq-friend = frq-friend.packages.${final.system}.default; vampysite = vampysite.packages.${final.system}.default; matrix-ril100 = matrix-ril100.packages.${final.system}.default; ccase = ccase.packages.${final.system}.default; + # TODO: remove once https://github.com/NixOS/nixpkgs/issues/402079 is closed + nodejs = prev.nodejs_22; + # Unstable packages unstable = import nixpkgs-unstable { inherit system config; }; }) @@ -249,9 +233,9 @@ (import "${home-manager}/nix-darwin") ]; }; - darwinConfigurations."ritual" = nix-darwin.lib.darwinSystem { + darwinConfigurations."MacBook-Air" = nix-darwin.lib.darwinSystem { pkgs = import nixpkgs-darwin rec { - system = "x86_64-darwin"; + system = "aarch64-darwin"; config.allowUnfree = true; overlays = mkOverlays system config; }; diff --git a/hosts/ritual/configuration.nix b/hosts/ritual/configuration.nix index 6d3e130..bd818e5 100644 --- a/hosts/ritual/configuration.nix +++ b/hosts/ritual/configuration.nix @@ -1,7 +1,7 @@ { imports = [ ../../common/fragments/graphical/darwin.nix ]; - nixpkgs.hostPlatform = "x86_64-darwin"; + nixpkgs.hostPlatform = "aarch64-darwin"; system.stateVersion = 1; } diff --git a/hosts/ritual/hardware-configuration.nix b/hosts/ritual/hardware-configuration.nix deleted file mode 100644 index 9bbe319..0000000 --- a/hosts/ritual/hardware-configuration.nix +++ /dev/null @@ -1,67 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - modulesPath, - ... -}: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "usb_storage" - "sd_mod" - "sdhci_pci" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ - "kvm-intel" - "wl" - ]; - boot.extraModulePackages = with config.boot.kernelPackages; [ broadcom_sta ]; - - boot.initrd.systemd = { - enable = true; - emergencyAccess = "$2b$05$eOIXFST5/9G6vAFIZDLGfuJV7CV1B26YmRMAFRstyRHwvBNFSN6Im"; - }; - - boot.supportedFilesystems = [ "ntfs" ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/6d51e9df-99f3-4eb3-b2da-a1c9b7e405df"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - - boot.initrd.luks.devices."luks-8807caf4-ae17-4b39-93bd-ddfa1f994a47".device = "/dev/disk/by-uuid/8807caf4-ae17-4b39-93bd-ddfa1f994a47"; - - # Enable swap on luks - boot.initrd.luks.devices."luks-c503653d-47de-4914-9e41-d13d14a6cc22".device = "/dev/disk/by-uuid/c503653d-47de-4914-9e41-d13d14a6cc22"; - boot.initrd.luks.devices."luks-c503653d-47de-4914-9e41-d13d14a6cc22".keyFile = "/crypto_keyfile.bin"; - - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/9A5C-CE17"; - fsType = "vfat"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/e20a4e05-44a6-4895-84ef-e3d176931b25"; } ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; - - # environment.systemPackages = with pkgs; [ b43Firmware_5_1_138 ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -}