diff --git a/flake.nix b/flake.nix index d9eee5f..04d74d5 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,8 @@ home-manager.useUserPackages = true; home-manager.users.barrett = import ./home/home.nix; home-manager.extraSpecialArgs = { - inherit zen-browser system; + inherit zen-browser; + hostPlatform = system; }; } ]; @@ -69,7 +70,8 @@ homeConfigurations.barrett = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { - inherit zen-browser system; + inherit zen-browser; + hostPlatform = system; }; modules = [ ./home/home.nix ]; }; diff --git a/fonts b/fonts new file mode 120000 index 0000000..b53964f --- /dev/null +++ b/fonts @@ -0,0 +1 @@ +/nix/store/sp0mz2yc3344ncbnaphfsapx67ankmn8-home-manager-files/.local/share/fonts \ No newline at end of file diff --git a/home/modules/packages.nix b/home/modules/packages.nix index a440548..f740944 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -1,13 +1,13 @@ -{ pkgs, lib, config, zen-browser, system, ... }: +{ pkgs, lib, config, zen-browser, hostPlatform, ... }: let - claude = true; - zen = true; - sioyek = true; - vesktop = true; - neovim = config.programs.neovim.enable; + enableClaude = true; + enableZen = true; + enableSioyek = true; + enableVesktop = true; + enableNeovim = config.programs.neovim.enable; in { - home.sessionVariables = lib.optionalAttrs zen { + home.sessionVariables = lib.optionalAttrs enableZen { BROWSER = "zen-browser"; }; @@ -18,12 +18,12 @@ in { slack bitwarden-desktop ] - ++ lib.optionals claude [ claude-code ] - ++ lib.optionals zen [ zen-browser.packages.${system}.default ] - ++ lib.optionals sioyek [ sioyek ] - ++ lib.optionals vesktop [ vesktop ]; + ++ lib.optionals enableClaude [ claude-code ] + ++ lib.optionals enableZen [ zen-browser.packages.${hostPlatform}.default ] + ++ lib.optionals enableSioyek [ sioyek ] + ++ lib.optionals enableVesktop [ vesktop ]; - xdg.configFile."claude/settings.json" = lib.mkIf claude { + xdg.configFile."claude/settings.json" = lib.mkIf enableClaude { text = builtins.toJSON { permissions.defaultMode = "acceptEdits"; network_access = true; @@ -36,7 +36,7 @@ in { }; }; - home.activation.linkZenProfile = lib.mkIf zen ( + home.activation.linkZenProfile = lib.mkIf enableZen ( lib.hm.dag.entryAfter [ "writeBoundary" ] '' zen_config="$HOME/.zen" repo_zen="${config.home.homeDirectory}/nix-config/config/zen" @@ -87,19 +87,19 @@ in { xdg.mimeApps = { enable = true; defaultApplications = {} - // lib.optionalAttrs zen { + // lib.optionalAttrs enableZen { "x-scheme-handler/http" = "zen.desktop"; "x-scheme-handler/https" = "zen.desktop"; "text/html" = "zen.desktop"; } - // lib.optionalAttrs neovim { + // lib.optionalAttrs enableNeovim { "text/plain" = "nvim.desktop"; } - // lib.optionalAttrs sioyek { + // lib.optionalAttrs enableSioyek { "application/pdf" = "sioyek.desktop"; "application/epub" = "sioyek.desktop"; } - // lib.optionalAttrs vesktop { + // lib.optionalAttrs enableVesktop { "x-scheme-handler/discord" = "vesktop.desktop"; }; };