diff --git a/flake.lock b/flake.lock index 8a8dab2..66f2447 100644 --- a/flake.lock +++ b/flake.lock @@ -231,27 +231,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "zen-browser", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -332,22 +311,6 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -593,8 +556,12 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2" + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1758731146, diff --git a/flake.nix b/flake.nix index 569447c..36eb9e3 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,11 @@ url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; master.url = "github:NixOS/nixpkgs/master"; home-manager.url = "github:nix-community/home-manager"; nixvim = { @@ -40,7 +44,7 @@ home-manager.useUserPackages = true; home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.users.joshuaelm = { - imports = [ ./hosts/desktop/home.nix nixvim.homeManagerModules.nixvim stylix.homeModules.stylix ]; + imports = [ ./hosts/desktop/home.nix nixvim.homeModules.nixvim stylix.homeModules.stylix ]; }; } ]; @@ -60,7 +64,7 @@ home-manager.useUserPackages = true; home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.users.joshuaelm = { - imports = [ ./hosts/mac-laptop/home.nix nixvim.homeManagerModules.nixvim stylix.homeModules.stylix ]; + imports = [ ./hosts/mac-laptop/home.nix nixvim.homeModules.nixvim stylix.homeModules.stylix ]; }; } ]; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 0f99589..c81a212 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -343,7 +343,7 @@ hardware.pulseaudio.extraConfig = '' grub2 vivaldi cargo - inputs.zen-browser.packages."${system}".default + #inputs.zen-browser.packages."${system}".default kdePackages.kdenlive wineWowPackages.wayland blueman diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index ac81454..d3f925e 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -6,7 +6,7 @@ home.username = "joshuaelm"; home.homeDirectory = "/home/joshuaelm"; - imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_desktop.nix ../../modules/ashell/default.nix ../../modules/waybar/waybar.nix ../../modules/ashell ]; + imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_desktop.nix ../../modules/ashell/default.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ]; home.packages = [ diff --git a/hosts/mac-laptop/configuration.nix b/hosts/mac-laptop/configuration.nix index e61eb39..6133137 100644 --- a/hosts/mac-laptop/configuration.nix +++ b/hosts/mac-laptop/configuration.nix @@ -8,7 +8,6 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../modules/openvpn ]; powerManagement.enable = true; hardware.asahi.extractPeripheralFirmware = true; @@ -178,8 +177,8 @@ git bibata-cursors element-desktop + #inputs.zen-browser.packages."${system}".default rofi - inputs.zen-browser.packages.${pkgs.system}.default playerctl cava moonlight-qt diff --git a/hosts/mac-laptop/home.nix b/hosts/mac-laptop/home.nix index 5733478..eb60f86 100644 --- a/hosts/mac-laptop/home.nix +++ b/hosts/mac-laptop/home.nix @@ -6,7 +6,7 @@ home.username = "joshuaelm"; home.homeDirectory = "/home/joshuaelm"; - imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix ../../modules/ashell ]; + imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ]; home.packages = [ diff --git a/modules/stylix.nix b/modules/stylix.nix index 4bfc485..161c189 100644 --- a/modules/stylix.nix +++ b/modules/stylix.nix @@ -5,7 +5,9 @@ #stylix.targets.plymouth.enable = false; stylix.targets.kitty.enable = true; stylix.targets.hyprpaper.enable = true; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + #stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + stylix.targets.zen-browser.profileNames = [ "default" ]; + stylix.targets.zen-browser.enable = true; # blue aura house /* stylix.image = pkgs.fetchurl { url = "https://w.wallhaven.cc/full/1p/wallhaven-1py8lw.jpg"; diff --git a/modules/zen/default.nix b/modules/zen/default.nix new file mode 100644 index 0000000..7393ca4 --- /dev/null +++ b/modules/zen/default.nix @@ -0,0 +1,43 @@ +{ pkgs, inputs,... }: +{ + imports = [ + inputs.zen-browser.homeModules.beta + ]; + programs.zen-browser = { + enable = true; + + profiles = { + default = { + # bookmarks, extensions, search engines... + id = 0; + isDefault = true; + name = "default"; + search = { + force = true; + default = "Kagi"; + engines = { + "Kagi" = { + urls = [{ template = "https://kagi.com/search?q={searchTerms}"; }]; + icon = "https://kagi.com/favicon.ico"; + updateInterval = 24 * 60 * 60 * 1000; # every day + definedAliases = [ "@kagi" ]; + }; + }; + }; + }; + }; + policies = let + mkExtensionSettings = builtins.mapAttrs (_: pluginId: { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/${pluginId}/latest.xpi"; + installation_mode = "force_installed"; + }); + in { + ExtensionSettings = mkExtensionSettings { + "uBlock0@raymondhill.net" = "ublock-origin"; + "search@kagi.com" = "kagi-search-for-firefox"; + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = "bitwarden-password-manager"; + }; + DisableTelemetry = true; + }; + }; +}