diff --git a/apps/firefox/default.nix b/apps/firefox/default.nix index 59a21b2..7ceac5c 100644 --- a/apps/firefox/default.nix +++ b/apps/firefox/default.nix @@ -57,6 +57,7 @@ extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin bitwarden + tridactyl ]; bookmarks = { diff --git a/flake.lock b/flake.lock index 4913493..9837f86 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "apple-silicon": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767637567, + "narHash": "sha256-njwPfL5gM/KRGLJ29CbQ4nLBoEkNPMvEHBAAPOP8BZc=", + "owner": "tpwrules", + "repo": "nixos-apple-silicon", + "rev": "530aa73aa9a21a078ff861b84767ae1d469715fa", + "type": "github" + }, + "original": { + "owner": "tpwrules", + "repo": "nixos-apple-silicon", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -103,6 +124,21 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1746162366, + "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1761588595, @@ -787,7 +823,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -810,6 +846,7 @@ }, "root": { "inputs": { + "apple-silicon": "apple-silicon", "chaotic": "chaotic", "elephant": "elephant", "home-manager": "home-manager_2", diff --git a/home/macbook.nix b/home/macbook.nix new file mode 100644 index 0000000..ee5a050 --- /dev/null +++ b/home/macbook.nix @@ -0,0 +1,25 @@ +{ + pkgs, + inputs, + config, + ... +}: { + imports = [ + ../modules/home/terminal.nix + ../modules/home/apps.nix + ../modules/home/apps-optional.nix + ../modules/home/hyprland.nix + ../modules/home/waybar.nix + ../modules/home/theme.nix + ../modules/home/music.nix + # No gaming.nix for MacBook + inputs.walker.homeManagerModules.default + inputs.sops-nix.homeManagerModules.sops + inputs.vicinae.homeManagerModules.default + ]; + + home.sessionVariables = { + }; + + home.stateVersion = "25.05"; +} diff --git a/modules/nixos/home-manager.nix b/modules/nixos/home-manager.nix index 06e7745..97fc2a8 100644 --- a/modules/nixos/home-manager.nix +++ b/modules/nixos/home-manager.nix @@ -10,7 +10,7 @@ useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = specialArgs; - users.${myConfig.nixos.username} = import ../../home/hakase.nix; + users.${myConfig.nixos.username} = import ../../home/${myConfig.nixos.hostname}.nix; }; imports = [