diff --git a/flake.lock b/flake.lock index f4327fb..42a5e51 100644 --- a/flake.lock +++ b/flake.lock @@ -205,6 +205,24 @@ "type": "github" } }, + "dotfiles": { + "flake": false, + "locked": { + "lastModified": 1769126799, + "narHash": "sha256-v/VwDphmB+pdp51d65feDAXYLxU3juUIOIvVVT43oP4=", + "ref": "refs/heads/main", + "rev": "1b4c439c3e8286809747becfc59461b484345bfa", + "revCount": 5856, + "submodules": true, + "type": "git", + "url": "https://github.com/end-4/dots-hyprland" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/end-4/dots-hyprland" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -319,6 +337,28 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "illogical-flake", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -624,6 +664,29 @@ "type": "github" } }, + "illogical-flake": { + "inputs": { + "dotfiles": "dotfiles", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1769877676, + "narHash": "sha256-EnGvLmdsst9ldckIyNCN68qv8LzZ8ncY/FCo/rARzho=", + "owner": "soymou", + "repo": "illogical-flake", + "rev": "ff37fa16e759ee30e42176611e590d37672f1b5f", + "type": "github" + }, + "original": { + "owner": "soymou", + "repo": "illogical-flake", + "type": "github" + } + }, "impermanence": { "inputs": { "home-manager": "home-manager_2", @@ -1170,6 +1233,28 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "illogical-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769182372, + "narHash": "sha256-I5WJ39YMaV+psYbli6rlUaiJOSoC2OwEXOF338d7zdE=", + "owner": "nix-community", + "repo": "NUR", + "rev": "0e6e5ff852c442598d1ae8ca5f042947f123f798", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "nur_2": { "inputs": { "flake-parts": [ "stylix", @@ -1289,6 +1374,27 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "illogical-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768985439, + "narHash": "sha256-qkU4r+l+UPz4dutMMRZSin64HuVZkEv9iFpu9yMWVY0=", + "ref": "refs/heads/master", + "rev": "191085a8821b35680bba16ce5411fc9dbe912237", + "revCount": 731, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "authentik-nix": "authentik-nix", @@ -1300,6 +1406,7 @@ "home-manager-unstable": "home-manager-unstable", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", + "illogical-flake": "illogical-flake", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "lsfg-vk": "lsfg-vk", @@ -1434,12 +1541,12 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], - "nur": "nur", + "nur": "nur_2", "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", diff --git a/modules/nixos/boot/common/default.nix b/modules/nixos/boot/common/default.nix index cde8ca8..ab6563a 100644 --- a/modules/nixos/boot/common/default.nix +++ b/modules/nixos/boot/common/default.nix @@ -43,16 +43,23 @@ in }; }; - supportedFilesystems = lib.mkOverride 90 [ "bcachefs" ]; + supportedFilesystems = { + bcachefs = lib.mkOverride 90 true; + btrfs = lib.mkOverride 90 true; + }; consoleLogLevel = lib.mkDefault 0; bootspec.enable = (!isArm); initrd = { verbose = lib.mkDefault false; - availableKernelModules = lib.mkOverride 90 [ "bcachefs" ]; + availableKernelModules = { + bcachefs = lib.mkOverride 90 true; + btrfs = lib.mkOverride 90 true; + }; kernelModules = { bcachefs = lib.mkOverride 90 true; + btrfs = lib.mkOverride 90 true; }; systemd.storePaths = with pkgs; [ bcachefs-tools diff --git a/systems/aarch64-linux/macbook-pro-nixos/boot.nix b/systems/aarch64-linux/macbook-pro-nixos/boot.nix index 5748dd7..e40d0cd 100644 --- a/systems/aarch64-linux/macbook-pro-nixos/boot.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/boot.nix @@ -27,6 +27,8 @@ bcachefs = lib.mkForce false; }; }; - supportedFilesystems = lib.mkForce [ "apfs" ]; + supportedFilesystems = { + apfs = lib.mkForce true; + }; }; }